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

Add PlutusV3 CostModel to UpgradeConwayPParams #4252

Merged
merged 1 commit into from
Apr 16, 2024
Merged

Add PlutusV3 CostModel to UpgradeConwayPParams #4252

merged 1 commit into from
Apr 16, 2024

Conversation

aniketd
Copy link
Contributor

@aniketd aniketd commented Apr 10, 2024 •
edited
Loading

Description

Resolves #4224

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • New tests are added if needed and existing tests are updated
  • When applicable, versions are updated in .cabal and CHANGELOG.md files according to the
    versioning process.
  • The version bounds in .cabal files for all affected packages are updated. If you change the bounds in a cabal file, that package itself must have a version increase. (See RELEASING.md)
  • All visible changes are prepended to the latest section of a CHANGELOG.md for the affected packages. New section is never added with the code changes. (See RELEASING.md)
  • Code is formatted with fourmolu (use scripts/fourmolize.sh)
  • Cabal files are formatted (use scripts/cabal-format.sh)
  • hie.yaml has been updated (use scripts/gen-hie.sh)
  • Self-reviewed the diff

teodanciu
teodanciu reviewed Apr 10, 2024
View reviewed changes
Copy link
Contributor

@teodanciu teodanciu left a comment

Choose a reason for hiding this comment

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

I reckon this requires the conway version to become 1.14.0.0.
And the Changelog for both the updated conway version and core 1.11.1.0 to be updated.

lehins
lehins requested changes Apr 10, 2024
View reviewed changes
Copy link
Collaborator

@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.

Couple of things need adjustment, but otherwise looks good.

eras/conway/impl/src/Cardano/Ledger/Conway/PParams.hs Outdated Show resolved Hide resolved
eras/conway/impl/src/Cardano/Ledger/Conway/PParams.hs Show resolved Hide resolved
libs/cardano-ledger-core/src/Cardano/Ledger/HKD.hs Show resolved Hide resolved
eras/conway/impl/src/Cardano/Ledger/Conway/PParams.hs Show resolved Hide resolved
@aniketd aniketd force-pushed the aniketd/conway-genesis-plutus3-cost-models branch 2 times, most recently from 8f39ad0 to 25219f8 Compare April 12, 2024 14:11
@aniketd aniketd requested review from lehins and teodanciu April 12, 2024 14:11
@aniketd aniketd force-pushed the aniketd/conway-genesis-plutus3-cost-models branch from 25219f8 to 81f11d9 Compare April 12, 2024 14:29
lehins
lehins requested changes Apr 12, 2024
View reviewed changes
Copy link
Collaborator

@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.

You where able to remove the Default instance. That's good.
Few changes are still necessary

eras/conway/impl/src/Cardano/Ledger/Conway/Genesis.hs Show resolved Hide resolved
eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Genesis.hs Outdated Show resolved Hide resolved
libs/cardano-ledger-core/src/Cardano/Ledger/HKD.hs Outdated Show resolved Hide resolved
eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Genesis.hs Outdated Show resolved Hide resolved
eras/conway/test-suite/src/Test/Cardano/Ledger/Conway/Examples/Consensus.hs Show resolved Hide resolved
eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Genesis.hs Outdated Show resolved Hide resolved
@aniketd aniketd force-pushed the aniketd/conway-genesis-plutus3-cost-models branch from 81f11d9 to aaf6707 Compare April 15, 2024 12:13
@aniketd aniketd requested a review from lehins April 15, 2024 12:35
lehins
lehins approved these changes Apr 15, 2024
View reviewed changes
Copy link
Collaborator

@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.

Once you address @teodanciu's comments this PR is ready to go.

@aniketd aniketd force-pushed the aniketd/conway-genesis-plutus3-cost-models branch from aaf6707 to 09b817e Compare April 16, 2024 08:18
@aniketd aniketd enabled auto-merge (squash) April 16, 2024 10:45
@aniketd
Add PlutusV3 CostModel to UpgradeConwayPParams
c236b69 
Use `updateCostModels` to add them to Conway
PParams during tranlation/upgrade from Babbage
@aniketd aniketd force-pushed the aniketd/conway-genesis-plutus3-cost-models branch from 09b817e to c236b69 Compare April 16, 2024 10:45
@aniketd aniketd merged commit 57bb4c1 into master Apr 16, 2024
15 checks passed
@aniketd aniketd deleted the aniketd/conway-genesis-plutus3-cost-models branch April 16, 2024 13:02
Lucsanszky added a commit to IntersectMBO/ouroboros-consensus that referenced this pull request Apr 18, 2024
@Lucsanszky
Use StandardCrypto in protocol info tests
aeb3e43 
`exampleConwayGenesis` was made monomorphic here:
IntersectMBO/cardano-ledger#4252
The `Crypto c` constraint was removed and now it uses `StandardCrypto`.
Lucsanszky added a commit to IntersectMBO/ouroboros-consensus that referenced this pull request Apr 18, 2024
@Lucsanszky
Use StandardCrypto in protocol info tests
2dfb3e9 
`exampleConwayGenesis` was made monomorphic here:
IntersectMBO/cardano-ledger#4252
The `Crypto c` constraint was removed and now it uses `StandardCrypto`.
@Lucsanszky Lucsanszky mentioned this pull request Apr 18, 2024
Merged
Lucsanszky added a commit to IntersectMBO/ouroboros-consensus that referenced this pull request Apr 19, 2024
@Lucsanszky
Use StandardCrypto in protocol info tests
883e1b9 
`exampleConwayGenesis` was made monomorphic here:
IntersectMBO/cardano-ledger#4252
The `Crypto c` constraint was removed and now it uses `StandardCrypto`.
Lucsanszky added a commit to IntersectMBO/ouroboros-consensus that referenced this pull request Apr 19, 2024
@Lucsanszky
Use StandardCrypto in protocol info tests
190609b 
`exampleConwayGenesis` was made monomorphic here:
IntersectMBO/cardano-ledger#4252
The `Crypto c` constraint was removed and now it uses `StandardCrypto`.
Lucsanszky added a commit to IntersectMBO/ouroboros-consensus that referenced this pull request Apr 23, 2024
@Lucsanszky
Use StandardCrypto in protocol info tests
c4a452c 
`exampleConwayGenesis` was made monomorphic here:
IntersectMBO/cardano-ledger#4252
The `Crypto c` constraint was removed and now it uses `StandardCrypto`.
Lucsanszky added a commit to IntersectMBO/ouroboros-consensus that referenced this pull request Apr 24, 2024
@Lucsanszky
Use StandardCrypto in protocol info tests
4d2a152 
`exampleConwayGenesis` was made monomorphic here:
IntersectMBO/cardano-ledger#4252
The `Crypto c` constraint was removed and now it uses `StandardCrypto`.
Lucsanszky added a commit to IntersectMBO/ouroboros-consensus that referenced this pull request Apr 24, 2024
@Lucsanszky
Account for cardano-ledger changes
8fee0d7 
  * Update `index-state` and affected `cardano-ledger` version bounds:
    `cardano-ledger` requires `plutus-ledger-api ^>=1.26.0`,
    hence the `index-state` update

  * Use `StandardCrypto` in protocol info tests:
    `exampleConwayGenesis` was made monomorphic here:
    IntersectMBO/cardano-ledger#4252
    The `Crypto c` constraint was removed and now it uses
    `StandardCrypto`.

  * Add `plutusV3CostModel` to `Conway` genesis file

  * Update `SupportsTwoPhaseValidation` instance for `Conway`:
    `ConwayUtxowFailure` was fixed to get rid of the possibility
    of injecting `UtxoFailure` in two separate ways
    (as seen in the code removed by this commit)
Lucsanszky added a commit to IntersectMBO/ouroboros-consensus that referenced this pull request Apr 24, 2024
@Lucsanszky
Account for cardano-ledger changes
ad3720a 
  * Update `index-state` and affected `cardano-ledger` version bounds:
    `cardano-ledger` requires `plutus-ledger-api ^>=1.26.0`,
    hence the `index-state` update

  * Use `StandardCrypto` in protocol info tests:
    `exampleConwayGenesis` was made monomorphic here:
    IntersectMBO/cardano-ledger#4252
    The `Crypto c` constraint was removed and now it uses
    `StandardCrypto`.

  * Add `plutusV3CostModel` to `Conway` genesis file

  * Update `SupportsTwoPhaseValidation` instance for `Conway`:
    `ConwayUtxowFailure` was fixed to get rid of the possibility
    of injecting `UtxoFailure` in two separate ways
    (as seen in the code removed by this commit)
Lucsanszky added a commit to IntersectMBO/ouroboros-consensus that referenced this pull request Apr 26, 2024
@Lucsanszky
Account for cardano-ledger changes
45e379c 
  * Update `index-state` and affected `cardano-ledger` version bounds:
    `cardano-ledger` requires `plutus-ledger-api ^>=1.26.0`,
    hence the `index-state` update

  * Use `StandardCrypto` in protocol info tests:
    `exampleConwayGenesis` was made monomorphic here:
    IntersectMBO/cardano-ledger#4252
    The `Crypto c` constraint was removed and now it uses
    `StandardCrypto`.

  * Add `plutusV3CostModel` to `Conway` genesis file

  * Update `SupportsTwoPhaseValidation` instance for `Conway`:
    `ConwayUtxowFailure` was fixed to get rid of the possibility
    of injecting `UtxoFailure` in two separate ways
    (as seen in the code removed by this commit)
Lucsanszky added a commit to IntersectMBO/ouroboros-consensus that referenced this pull request Apr 30, 2024
@Lucsanszky
Account for cardano-ledger changes
902aeaf 
  * Update `index-state` and affected `cardano-ledger` version bounds:
    `cardano-ledger` requires `plutus-ledger-api ^>=1.26.0`,
    hence the `index-state` update

  * Use `StandardCrypto` in protocol info tests:
    `exampleConwayGenesis` was made monomorphic here:
    IntersectMBO/cardano-ledger#4252
    The `Crypto c` constraint was removed and now it uses
    `StandardCrypto`.

  * Add `plutusV3CostModel` to `Conway` genesis file

  * Update `SupportsTwoPhaseValidation` instance for `Conway`:
    `ConwayUtxowFailure` was fixed to get rid of the possibility
    of injecting `UtxoFailure` in two separate ways
    (as seen in the code removed by this commit)
Lucsanszky added a commit to IntersectMBO/ouroboros-consensus that referenced this pull request May 9, 2024
@Lucsanszky
Account for cardano-ledger changes
a892393 
  * Update `index-state` and affected `cardano-ledger` version bounds:
    `cardano-ledger` requires `plutus-ledger-api ^>=1.26.0`,
    hence the `index-state` update

  * Use `StandardCrypto` in protocol info tests:
    `exampleConwayGenesis` was made monomorphic here:
    IntersectMBO/cardano-ledger#4252
    The `Crypto c` constraint was removed and now it uses
    `StandardCrypto`.

  * Add `plutusV3CostModel` to `Conway` genesis file

  * Update `SupportsTwoPhaseValidation` instance for `Conway`:
    `ConwayUtxowFailure` was fixed to get rid of the possibility
    of injecting `UtxoFailure` in two separate ways
    (as seen in the code removed by this commit)

  * Utilize new PParams prediction functionality for HFC

  * Accept new cbor format for golden tests
Lucsanszky added a commit to IntersectMBO/ouroboros-consensus that referenced this pull request May 9, 2024
@Lucsanszky
Account for cardano-ledger changes
a2e0047 
  * Update `index-state` and affected `cardano-ledger` version bounds:
    `cardano-ledger` requires `plutus-ledger-api ^>=1.26.0`,
    hence the `index-state` update

  * Use `StandardCrypto` in protocol info tests:
    `exampleConwayGenesis` was made monomorphic here:
    IntersectMBO/cardano-ledger#4252
    The `Crypto c` constraint was removed and now it uses
    `StandardCrypto`.

  * Add `plutusV3CostModel` to `Conway` genesis file

  * Update `SupportsTwoPhaseValidation` instance for `Conway`:
    `ConwayUtxowFailure` was fixed to get rid of the possibility
    of injecting `UtxoFailure` in two separate ways
    (as seen in the code removed by this commit)
amesgen pushed a commit to IntersectMBO/ouroboros-consensus that referenced this pull request May 13, 2024
@Lucsanszky @amesgen
Account for cardano-ledger changes
dad7c23 
  * Update `index-state` and affected `cardano-ledger` version bounds:
    `cardano-ledger` requires `plutus-ledger-api ^>=1.26.0`,
    hence the `index-state` update

  * Use `StandardCrypto` in protocol info tests:
    `exampleConwayGenesis` was made monomorphic here:
    IntersectMBO/cardano-ledger#4252
    The `Crypto c` constraint was removed and now it uses
    `StandardCrypto`.

  * Add `plutusV3CostModel` to `Conway` genesis file

  * Update `SupportsTwoPhaseValidation` instance for `Conway`:
    `ConwayUtxowFailure` was fixed to get rid of the possibility
    of injecting `UtxoFailure` in two separate ways
    (as seen in the code removed by this commit)
disassembler pushed a commit to IntersectMBO/ouroboros-consensus that referenced this pull request May 13, 2024
@Lucsanszky @disassembler
Account for cardano-ledger changes
2353df1 
  * Update `index-state` and affected `cardano-ledger` version bounds:
    `cardano-ledger` requires `plutus-ledger-api ^>=1.26.0`,
    hence the `index-state` update

  * Use `StandardCrypto` in protocol info tests:
    `exampleConwayGenesis` was made monomorphic here:
    IntersectMBO/cardano-ledger#4252
    The `Crypto c` constraint was removed and now it uses
    `StandardCrypto`.

  * Add `plutusV3CostModel` to `Conway` genesis file

  * Update `SupportsTwoPhaseValidation` instance for `Conway`:
    `ConwayUtxowFailure` was fixed to get rid of the possibility
    of injecting `UtxoFailure` in two separate ways
    (as seen in the code removed by this commit)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@teodanciu teodanciu teodanciu left review comments

@lehins lehins lehins approved these changes

@Soupstraw Soupstraw Awaiting requested review from Soupstraw

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

Successfully merging this pull request may close these issues.

Add PlutusV3 CostModel to the Conway genesis
3 participants
@aniketd @teodanciu @lehins