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.

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

PLT-8148 Upgrade to Plutus 1.15.0.0 #7

Merged
merged 18 commits into from Nov 24, 2023
Merged

PLT-8148 Upgrade to Plutus 1.15.0.0 #7

merged 18 commits into from Nov 24, 2023

Conversation

bwbush
Copy link
Contributor

@bwbush bwbush commented Nov 16, 2023

This upgrades Plutus to version 1.15.0.0 so that Marlowe can take advantage of the new compiler optimizations.

The Marlowe-Cardano test suite was run with --qc-max-success 100000 with no failures.

@bwbush bwbush self-assigned this Nov 16, 2023
@bwbush bwbush requested review from palas and paluh November 16, 2023 22:22
@paluh
Copy link

paluh commented Nov 17, 2023

@bwbush it is a bit hard to review the changes because this PR contains also rearrangement of the code and there are no diffs over these pieces. Should I assume that validators and semantics where not really changed?


marloweValidatorCompiled
:: PlutusTx.CompiledCode (ValidatorHash -> PlutusTx.BuiltinData -> PlutusTx.BuiltinData -> PlutusTx.BuiltinData -> ())
marloweValidatorCompiled = Haskell.undefined
Copy link
Contributor Author

Choose a reason for hiding this comment

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

PLT-7587

bwbush and others added 2 commits November 21, 2023 08:18
* PLT-7584 Measurement of Plutus costs when suppressing parts of validation.

* PLT-7585 Disabled `fourmolu` because it chokes on the C preprocessor.

* PLT-7584 Fixed output file name.

* Add options to fourmolu

* Fix fourmolu2

---------

Co-authored-by: zeme <lorenzo.calegari@iohk.io>
@bwbush
Copy link
Contributor Author

bwbush commented Nov 21, 2023

@paluh and @palas, here is an efficient way to segment the history for review:

  1. Upgrade to plutus 1.15.0.0: git difftool 8f461076818ad0914c8d92e531b3051bf4398470 8cd5cd643f777070e1e013e4f6fb1520a24ad4f2.
  2. Splitting the validators into separate modules: git difftool 8cd5cd643f777070e1e013e4f6fb1520a24ad4f2 e6c6754dcb5e7a70599290f060f5a0c2a038b529
  3. Migration of Charli3 oracle and miscellaneous cleanup git difftool e6c6754dcb5e7a70599290f060f5a0c2a038b529 4c5ce1d6d254cec95d197174a2c44f3460bd5121
  4. Compiler flags and PlutusTx.AsData: git difftool 4c5ce1d6d254cec95d197174a2c44f3460bd5121 de48dde0b45b6a80ec78d93106904a184aa216d2

Copy link
Contributor

@palas palas left a comment

Choose a reason for hiding this comment

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

Thanks, it looks good to me 👍


PlutusTx.makeLift ''SubScriptContext
PlutusTx.makeIsDataIndexed ''SubScriptContext [('SubScriptContext, 0)]

Copy link

Choose a reason for hiding this comment

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

We have to probably just drop this comment - it doesn't make sens any more.

Copy link

@paluh paluh left a comment

Choose a reason for hiding this comment

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

I really appreciate that you made this AsData based implementation optional Brian. I really like that you preserved clean Haskell implementation of data types :-)
Of course this rises the question about maintenance cost and if we will use AsData based implementation at all ;-)

@bwbush bwbush merged commit 45e1da0 into main Nov 24, 2023
3 checks passed
@bwbush bwbush deleted the PLT-8148 branch December 5, 2023 12:32
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.

None yet

3 participants