Skip to content

Conversation

@carbolymer
Copy link
Contributor

@carbolymer carbolymer commented Sep 11, 2025

Changelog

- description: |
    Upgrade ledger: cardano-protocol-tpraos-1.4.1.0, cardano-ledger-shelley-test-1.7.0.0, cardano-ledger-shelley-1.17.0.0, cardano-ledger-mary-1.9.0.0, cardano-ledger-dijkstra-0.1.0.0, cardano-ledger-core-1.18.0.0, cardano-ledger-conway-1.20.0.0, cardano-ledger-byron-1.2.0.0, cardano-ledger-binary-1.7.0.0, cardano-ledger-babbage-1.12.0.0, cardano-ledger-api-1.12.0.0, cardano-ledger-alonzo-1.14.0.0, cardano-data-1.2.4.1, cardano-crypto-wrapper-1.6.1.0
    Upgrade consensus: ouroboros-consensus-protocol-0.13.0.0, ouroboros-consensus-diffusion-0.24.0.0, ouroboros-consensus-0.28.0.0, ouroboros-consensus-cardano-0.26.0.0
    Upgrade network: ouroboros-network-protocols-0.12.0.0, ouroboros-network-framework-0.14.0.0, ouroboros-network-api-0.11.0.0, ouroboros-network-0.18.0.0
    Upgrade plutus-core-1.53, plutus-ledger-api-1.53
# 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...
# uncomment at least one main project this PR is associated with
  projects:
   - cardano-api
   - cardano-api-gen
  # - cardano-rpc
  # - cardano-wasm

Context

Dependencies upgrade in preparation for node 10.6 release

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

@carbolymer carbolymer changed the title Jordan/10.6 node release [DRAFT] Jordan/10.6 node release Sep 11, 2025
@carbolymer carbolymer marked this pull request as ready for review September 11, 2025 07:41
@carbolymer carbolymer force-pushed the jordan/10.6-node-release branch 5 times, most recently from 9796d54 to f83f795 Compare September 11, 2025 14:03
@Jimbo4350 Jimbo4350 force-pushed the jordan/10.6-node-release branch from ffca5b1 to 4741b1d Compare September 11, 2025 21:47
@carbolymer carbolymer force-pushed the jordan/10.6-node-release branch 2 times, most recently from cf3825b to 833aa4e Compare September 19, 2025 15:58
@palas palas force-pushed the jordan/10.6-node-release branch from 6cfae60 to aa2acde Compare September 24, 2025 16:15
@carbolymer carbolymer force-pushed the jordan/10.6-node-release branch from 82d12a6 to 7b990ba Compare October 16, 2025 12:05
Copy link
Contributor Author

@carbolymer carbolymer left a comment

Choose a reason for hiding this comment

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

LGTM

@carbolymer carbolymer changed the title [DRAFT] Jordan/10.6 node release Upgrade ledger, consensus, network, plutus for cardano-node 10.6 Oct 22, 2025
Copy link
Contributor

@Jimbo4350 Jimbo4350 left a comment

Choose a reason for hiding this comment

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

LGTM, few minor comments

Map.toList $
fromJust $
extractCostModelParamsLedgerOrder mCostModel
-- all geneses should contain only the number of cost model params equal to the initial number
Copy link
Contributor

Choose a reason for hiding this comment

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

What does this mean?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

rephrased

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

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

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

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

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.


prop_text_envelope_roundtrip_tx_CBOR :: Property
prop_text_envelope_roundtrip_tx_CBOR = H.property $ do
_prop_text_envelope_roundtrip_tx_CBOR :: Property
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we still want this disabled?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

reenabled

stakeCred <- forAll genStakeCredential
-- that's the same stake credential as in UTXO
lStakeCred@(L.KeyHashObj kh) <-
pure $ mkCredential "keyHash-ebe9de78a37f84cc819c0669791aa0474d4f0a764e54b9f90cfe2137"
Copy link
Contributor

Choose a reason for hiding this comment

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

Given that (as I understand it) the fee increase is deterministic can we go back to using genStakeCredential?

@carbolymer carbolymer enabled auto-merge October 22, 2025 17:25
@carbolymer carbolymer added this pull request to the merge queue Oct 23, 2025
Merged via the queue into master with commit 73427d0 Oct 23, 2025
26 of 41 checks passed
@carbolymer carbolymer deleted the jordan/10.6-node-release branch October 23, 2025 11:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants