Skip to content

Commit

Permalink
PLT-8148 Upgrade to Plutus 1.15.0.0 (#7)
Browse files Browse the repository at this point in the history
* PLT-8148 Upgraded haskell dependencies to plutus 1.15.0.0.

* PLT-8148 Updated Plutus and Cardano API usage.

* PLT_8148 Aligned marlowe benchmarking with plutus benchmarking.

* PLT_8148 Cleaned up placeholder functions.

* PLT-8148 Fixed `UnsafeFromData` instance for `SubScriptContext`.

* PLT-8148 Split validators into separate modules.

* PLT-8148 Migrate Charli3 oracle bridge.

* WIP

* PLT-8148 Cleaned up formatting.

* PLT-8148 Refactored suppression of validator tracing.

* PLT-8148 Reorganized outptu folders.

* PLT-8148 Fixed illegal constructor for arbitrary `Data`.

* PLT-8148 Updated script size and hash tests.

* PLT_8148 Fixed nix outputs for validators.

* PLT-8148 Pinned UPLC version of role-token validator.

* PLT-8148 Fixed missing trace logs under `--flags=trace-plutus`.

* PLT-7584 Flags for validator checks (#9)

* 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>

* PLT-7586 [DO NOT MERGE] Marlowe semantics validator with `PlutusTx.AsData` (#10)

PLT-7585 Ported `PlutusTx.AsData` validator from IntersectMBO/plutus@107c9a6.

---------

Co-authored-by: zeme <lorenzo.calegari@iohk.io>
  • Loading branch information
bwbush and zeme-wana committed Nov 24, 2023
1 parent 574270e commit 45e1da0
Show file tree
Hide file tree
Showing 33 changed files with 3,376 additions and 1,384 deletions.
38 changes: 30 additions & 8 deletions cabal.project
Expand Up @@ -14,12 +14,10 @@ repository cardano-haskell-packages
-- We duplicate the hackage index-state first for haskell.nix, even though cabal ignores it.
-- This must always match the hackage index-state on the next line.
-- See https://github.com/input-output-hk/haskell.nix/issues/1869#issuecomment-1449272480
index-state: 2023-08-15T00:00:00Z
index-state: 2023-11-14T00:00:00Z
index-state:
, hackage.haskell.org 2023-08-15T00:00:00Z
, cardano-haskell-packages 2023-08-15T00:00:00Z

-- with-compiler: ghc-8.10.7
, hackage.haskell.org 2023-11-14T00:00:00Z
, cardano-haskell-packages 2023-11-14T00:00:00Z

packages:
marlowe-plutus
Expand All @@ -35,8 +33,32 @@ package marlowe-plutus
ghc-options: -Werror


--Plutus 1.15.0 fork of https://github.com/Charli3-Official/oracle-datum-lib
source-repository-package
type: git
location: https://github.com/bwbush/oracle-datum-lib
tag: 6a714c1319ddcd0443e108fc55988a781b940ea5
--sha256: 13rvagplrar30vzkhkixxf8bwkrkndcgj6cmm02wr54ab8rnvaz1

-- Required for the Plutus 1.15.0.0 packages.
constraints:
nothunks ==0.1.4

-- Required until PLT-8148 is merged to the main branch.
source-repository-package
type: git
location: https://github.com/input-output-hk/marlowe
tag: 2ecc4c79a23275ae083b40c6bf28f5127d2e5390
--sha256: 0q6zasi052m2yxndpxx8lnb52wfqbf5ypi6nali1zjjgihz1nrqd
subdir: isabelle
haskell
marlowe-spec-test
source-repository-package
type: git
location: https://github.com/Charli3-Official/oracle-datum-lib
tag: 49279ab1b07efa8a6d67aa5498133ec7eca830ac
--sha256: 1dk050p7pml3qasljk7cfrbdvl1kp8zxgms7xh272nvvcfr54i1v
location: https://github.com/input-output-hk/marlowe-cardano
tag: 5bec67bbecefc109ea7b47d0504f3bb7b9fba3aa
--sha256: 1cdwmi4c7x9fh2w4b6bxryy3h8fjfsyjhbk2vh4bfarq4yij4cyc
subdir:
marlowe
marlowe-test
libs/base16-aeson
3 changes: 3 additions & 0 deletions changelog.d/20231116_113942_brian.bush_PLT_8148.md
@@ -0,0 +1,3 @@
### Changed

- Upgraded validators to using Plutus v1.15.0.0.
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions marlowe-plutus/.gitignore
@@ -1 +1,2 @@
*.plutus
out/

0 comments on commit 45e1da0

Please sign in to comment.