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

Node 10.0 integration #643

Merged
merged 5 commits into from
Oct 16, 2024
Merged

Node 10.0 integration #643

merged 5 commits into from
Oct 16, 2024

Conversation

lehins
Copy link
Contributor

@lehins lehins commented Sep 24, 2024 •
edited by smelc
Loading

Changelog

- description: |
    Bump ouroboros-consensus to 0.21, ouroboros-consensus-cardano to 0.20, ouroboros-consensus-protocol to 0.9.0.2, ouroboros-consensus-diffusion to 0.18, ouroboros-network-api to 0.10, plutus-ledger-api to 1.36, plutus-core to 1.36, and cardano-ledger-binary to 1.3.
# 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

  • Bump plutus, ledger, o-network and consensus bounds for node 10.0 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

@crocodile-dentist crocodile-dentist force-pushed the lehins/use-new-ledger-and-consensus branch 4 times, most recently from c90f142 to 7807ae4 Compare October 10, 2024 13:51
@crocodile-dentist crocodile-dentist changed the title Use new ledger and consensus Node 10.0 integration Oct 10, 2024
@crocodile-dentist crocodile-dentist force-pushed the lehins/use-new-ledger-and-consensus branch from 7807ae4 to 9145bdd Compare October 10, 2024 14:05
carbolymer
carbolymer reviewed Oct 10, 2024
View reviewed changes
cabal.project Outdated
@@ -13,8 +13,8 @@ repository cardano-haskell-packages
-- See CONTRIBUTING for information about these, including some Nix commands
-- you need to run if you change them
index-state:
, hackage.haskell.org 2024-08-15T08:53:32Z
, cardano-haskell-packages 2024-09-03T00:18:11Z
, hackage.haskell.org 2024-08-26T10:41:44Z
Copy link
Contributor

@carbolymer carbolymer Oct 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Small thing, maybe we should bump hackage to a much more recent version?

@carbolymer
Copy link
Contributor

carbolymer commented Oct 10, 2024 •
edited
Loading

Can you list bumped dependencies in the changelog template, in the PR description?

Can you tidy up commit history?

@crocodile-dentist crocodile-dentist force-pushed the lehins/use-new-ledger-and-consensus branch from 9145bdd to 4d82b4c Compare October 11, 2024 10:56
@lehins @crocodile-dentist
Stop supplying protocol version to Globals
eea40e3
@lehins @crocodile-dentist
Update bounds in the cabal file
97b4216 
bump plutus version

integrate ledger

integrate o-network

integrate consensus
@crocodile-dentist crocodile-dentist force-pushed the lehins/use-new-ledger-and-consensus branch 2 times, most recently from a079575 to 9508e8e Compare October 15, 2024 09:25
@crocodile-dentist crocodile-dentist force-pushed the lehins/use-new-ledger-and-consensus branch from 9508e8e to c0e142c Compare October 15, 2024 11:35
@crocodile-dentist crocodile-dentist marked this pull request as ready for review October 15, 2024 11:36
@crocodile-dentist crocodile-dentist force-pushed the lehins/use-new-ledger-and-consensus branch 2 times, most recently from d675546 to 71e56aa Compare October 15, 2024 15:05
@disassembler disassembler force-pushed the lehins/use-new-ledger-and-consensus branch from 71e56aa to 5a67e56 Compare October 15, 2024 15:16
@crocodile-dentist crocodile-dentist force-pushed the lehins/use-new-ledger-and-consensus branch from ac7e622 to 0d1f3e3 Compare October 15, 2024 15:43
@crocodile-dentist
Update Hackage and CHaP index and nix flakes
6caa859 
- get `fs-sim-0.3.0.0`
- plutus 1.36
- o-network 0.17.1.2
- consensus 0.21
- ledger 1.15

Update haskell.nix - use exact version from consensus

update chap index state
@crocodile-dentist crocodile-dentist force-pushed the lehins/use-new-ledger-and-consensus branch 2 times, most recently from 0c9324b to 53f4222 Compare October 15, 2024 15:56
@crocodile-dentist
Fix nix build: Cabal < 3.14 bound
e8da976 
Also pin cardano-ledger-shelley
@crocodile-dentist crocodile-dentist force-pushed the lehins/use-new-ledger-and-consensus branch from 53f4222 to e8da976 Compare October 16, 2024 06:28
@smelc smelc force-pushed the lehins/use-new-ledger-and-consensus branch from 3dacbfd to 59cc089 Compare October 16, 2024 08:39
@smelc smelc enabled auto-merge October 16, 2024 08:40
@smelc smelc added this pull request to the merge queue Oct 16, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Oct 16, 2024
@smelc smelc added this pull request to the merge queue Oct 16, 2024
Merged via the queue into main with commit 26fb32d Oct 16, 2024
25 checks passed
@smelc smelc deleted the lehins/use-new-ledger-and-consensus branch October 16, 2024 11:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carbolymer carbolymer carbolymer approved these changes

@Jimbo4350 Jimbo4350 Jimbo4350 approved these changes

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

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

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

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

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

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

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

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

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
@lehins @carbolymer @Jimbo4350 @smelc @crocodile-dentist