Skip to content
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

For release 10.3 #1376

Merged
merged 69 commits into from
Mar 25, 2025
Merged

For release 10.3 #1376

merged 69 commits into from
Mar 25, 2025

Conversation

aniketd
Copy link
Contributor

@aniketd aniketd commented Jan 31, 2025 •
edited by jasagredo
Loading

Description

Integrate cardano-ledger and ouroboros-network for node 10.3.

@aniketd aniketd force-pushed the aniketd/release-10-3 branch 2 times, most recently from 0279690 to 2b0f104 Compare February 4, 2025 15:44
@lehins lehins mentioned this pull request Feb 4, 2025
Closed
lehins
lehins reviewed Feb 5, 2025
View reviewed changes
Copy link
Contributor

@lehins lehins left a comment

Choose a reason for hiding this comment

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

Some really good progress.
Hopefully my comments unblock you and you can continue progressing further

@aniketd aniketd force-pushed the aniketd/release-10-3 branch 2 times, most recently from 1e5ae5a to 58b5304 Compare February 7, 2025 14:24
@jasagredo
Copy link
Contributor

CI is failing because it checks-out the merge commit. On main we updated the index-state so now you get all the latest versions of plutus. Plutus 1.40 is incompatible with cardano-crypto-class 2.2. Plutus 1.38 was compatible at one point but it was reverted, I asked why in the Slack channel for plutus.

I'd suggest rebasing this PR on top of master, otherwise CI won't pass due to this specific problem. And I would discuss with the plutus folks whether they want to revision 1.40 to allow for cardano-crypto-class 2.2 or not.

@jasagredo jasagredo linked an issue Feb 18, 2025 that may be closed by this pull request
Consensus changes that should go into 10.3 #1396
Closed
@lehins lehins mentioned this pull request Mar 4, 2025
Closed
@aniketd aniketd force-pushed the aniketd/release-10-3 branch from c97a657 to 1e2c0fe Compare March 5, 2025 12:22
@jasagredo jasagredo marked this pull request as ready for review March 19, 2025 10:51
@jasagredo jasagredo force-pushed the aniketd/release-10-3 branch from a68908a to 8d292bc Compare March 19, 2025 12:54
jasagredo
jasagredo requested changes Mar 19, 2025
View reviewed changes
Copy link
Contributor

@jasagredo jasagredo left a comment

Choose a reason for hiding this comment

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

Actually I wanted to request changes

@jasagredo jasagredo force-pushed the aniketd/release-10-3 branch 5 times, most recently from eb3c189 to b76e170 Compare March 20, 2025 10:32
jasagredo and others added 24 commits March 25, 2025 13:17
@jasagredo
Formatting and cleanup
8c8933e
@jasagredo
Regenerate golden files
5e95321
@jasagredo
Enforce the right size on Shelley Ledger Config cbor instance
d9f7e81
@fraser-iohk @jasagredo
snapshotTxs / snapshotTxsAfter return TxMeasures instead of ByteSize
b1cd9e5 
{Semigroup, Monoid} instances for {AlonzoMeasure, ConwayMeasure}

add TxMeasureMetrics class and instances

respond with TxMeasureMetrics info inside a map of measures

add patterns for MeasureName constructors that are no longer provided in network
@fraser-iohk @jasagredo
add changelogs
51fe847
@jasagredo
Remove AllowAmbiguousTypes in Ouroboros.Consensus.Cardano.CanHardFork
335cd8b
@jasagredo
Remove redundant constraint
5eee479
@jasagredo
Remove useless comments
dc046e7
@jasagredo
Rename and relocate LedgerDbPrune
24508ae
@jasagredo
Bring back the GetProposedPParamsUpdates query as deprecated
5178b87
@jasagredo @tdammers
Improve forgetSignKeyKES TODO
1f3ecdf 
Co-authored-by: Tobias Dammers <[email protected]>
@jasagredo
Register NTC breaking changes in changelog
edb72bb
@jasagredo
Allow newer base for ouroboros-network packages
fa7abb0
@jasagredo
Make HLint happy
676af6a
@aniketd @jasagredo
Bump ledger SRP and get building
4a93fb1
@jasagredo
Change unicode character in changelogs
9211d64
@jasagredo
Change list character in md fragments
d7d0d8d
@jasagredo
Mention deprecated query in haddock
f6c9b2d
@jasagredo
Change LedgerState Conway golden file
c3cb48f
@fraser-iohk @jasagredo
remove TODO comment about overflow in no-longer-overflowing LocalTxMo…
ebc4860 
…nitor Server code
@jasagredo
Use chap releases instead of SRPs
7d12bd7
@jasagredo
Remove ledgerstate serialization changelog fragment
e3ce315
@amesgen @jasagredo
Update CHaP flake input
312d146
@jasagredo @amesgen
Code review suggestions
695c107 
Co-authored-by: Alexander Esgen <[email protected]>
@jasagredo jasagredo force-pushed the aniketd/release-10-3 branch from e8675fc to 695c107 Compare March 25, 2025 12:18
@jasagredo jasagredo enabled auto-merge March 25, 2025 12:22
@jasagredo jasagredo added this pull request to the merge queue Mar 25, 2025
Merged via the queue into main with commit 5664a55 Mar 25, 2025
19 checks passed
@jasagredo jasagredo deleted the aniketd/release-10-3 branch March 25, 2025 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dnadales dnadales dnadales left review comments

@jasagredo jasagredo jasagredo approved these changes

@amesgen amesgen amesgen approved these changes

@nfrisby nfrisby Awaiting requested review from nfrisby nfrisby is a code owner

@fraser-iohk fraser-iohk Awaiting requested review from fraser-iohk fraser-iohk is a code owner

@geo2a geo2a Awaiting requested review from geo2a geo2a is a code owner

@lehins lehins Awaiting requested review from lehins

@tdammers tdammers Awaiting requested review from tdammers

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

Successfully merging this pull request may close these issues.

Consensus changes that should go into 10.3
10 participants
@aniketd @jasagredo @lehins @dnadales @tdammers @amesgen @fraser-iohk @bolt12 @coot @DavidEichmann