Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/input-output-hk/plutus in…
Browse files Browse the repository at this point in the history 
…to effectfully/builtins/both-MajorProtocolVersion-and-multiple-CostModels
  • Loading branch information
@effectfully
effectfully committed Mar 27, 2024
2 parents 0a1af53 + f168bc1 commit 1843823
Show file tree
Hide file tree
Showing 44 changed files with 553 additions and 498 deletions.
14 changes: 7 additions & 7 deletions doc/read-the-docs-site/plutus-doc.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ executable doc-doctests
, containers
, flat ^>=0.6
, lens
, plutus-core ^>=1.23
, plutus-ledger-api ^>=1.23
, plutus-tx ^>=1.23
, plutus-core ^>=1.24
, plutus-ledger-api ^>=1.24
, plutus-tx ^>=1.24
, prettyprinter
, random
, serialise
Expand All @@ -104,10 +104,10 @@ executable quick-start
, base >=4.9 && <5
, base16-bytestring
, bytestring
, plutus-core ^>=1.23
, plutus-ledger-api ^>=1.23
, plutus-tx ^>=1.23
, plutus-tx-plugin ^>=1.23
, plutus-core ^>=1.24
, plutus-ledger-api ^>=1.24
, plutus-tx ^>=1.24
, plutus-tx-plugin ^>=1.24

if !(impl(ghcjs) || os(ghcjs))
build-depends: plutus-tx-plugin
4 changes: 2 additions & 2 deletions plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-10.budget.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
({cpu: 282508764
| mem: 856552})
({cpu: 281818764
| mem: 853552})
4 changes: 2 additions & 2 deletions plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-100.budget.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
({cpu: 23474602554
| mem: 69678832})
({cpu: 23467702554
| mem: 69648832})
4 changes: 2 additions & 2 deletions plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-5.budget.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
({cpu: 85015834
| mem: 263092})
({cpu: 84670834
| mem: 261592})
4 changes: 2 additions & 2 deletions plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-50.budget.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
({cpu: 5996604004
| mem: 17844232})
({cpu: 5993154004
| mem: 17829232})
4 changes: 2 additions & 2 deletions plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-10.budget.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
({cpu: 188350620
| mem: 557080})
({cpu: 187660620
| mem: 554080})
4 changes: 2 additions & 2 deletions plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-100.budget.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
({cpu: 14193534300
| mem: 39720400})
({cpu: 14186634300
| mem: 39690400})
4 changes: 2 additions & 2 deletions plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-5.budget.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
({cpu: 61018710
| mem: 188240})
({cpu: 60673710
| mem: 186740})
4 changes: 2 additions & 2 deletions plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-50.budget.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
({cpu: 3672944700
| mem: 10355000})
({cpu: 3669494700
| mem: 10340000})
4 changes: 2 additions & 2 deletions ...antics/9.6/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad.budget.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
({cpu: 951958685
| mem: 3466381})
({cpu: 951682685
| mem: 3465181})
4 changes: 2 additions & 2 deletions ...antics/9.6/82213dfdb6a812b40446438767c61a388d2c0cfd0cbf7fd4a372b0dc59fa17e1.budget.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
({cpu: 1499682480
| mem: 4967076})
({cpu: 1499268480
| mem: 4965276})
112 changes: 56 additions & 56 deletions plutus-benchmark/plutus-benchmark.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ library plutus-benchmark-common
, directory
, filepath
, flat ^>=0.6
, plutus-core ^>=1.23
, plutus-core ^>=1.24
, plutus-metatheory
, plutus-tx ^>=1.23
, plutus-tx ^>=1.24
, tasty
, tasty-golden
, temporary
Expand Down Expand Up @@ -111,9 +111,9 @@ library nofib-internal
, base >=4.9 && <5
, deepseq
, plutus-benchmark-common
, plutus-core ^>=1.23
, plutus-tx ^>=1.23
, plutus-tx-plugin ^>=1.23
, plutus-core ^>=1.24
, plutus-tx ^>=1.24
, plutus-tx-plugin ^>=1.24

executable nofib-exe
import: lang, ghc-version-support
Expand All @@ -127,8 +127,8 @@ executable nofib-exe
, nofib-internal
, optparse-applicative
, plutus-benchmark-common
, plutus-core ^>=1.23
, plutus-tx ^>=1.23
, plutus-core ^>=1.24
, plutus-tx ^>=1.24
, prettyprinter
, transformers

Expand Down Expand Up @@ -166,8 +166,8 @@ test-suite plutus-benchmark-nofib-tests
, base >=4.9 && <5
, nofib-internal
, plutus-benchmark-common
, plutus-core:{plutus-core, plutus-core-testlib} ^>=1.23
, plutus-tx:{plutus-tx, plutus-tx-testlib} ^>=1.23
, plutus-core:{plutus-core, plutus-core-testlib} ^>=1.24
, plutus-tx:{plutus-tx, plutus-tx-testlib} ^>=1.24
, tasty
, tasty-hunit
, tasty-quickcheck
Expand Down Expand Up @@ -197,9 +197,9 @@ library lists-internal
, base >=4.9 && <5
, mtl
, plutus-benchmark-common
, plutus-core ^>=1.23
, plutus-tx ^>=1.23
, plutus-tx-plugin ^>=1.23
, plutus-core ^>=1.24
, plutus-tx ^>=1.24
, plutus-tx-plugin ^>=1.24

executable list-sort-exe
import: lang, ghc-version-support
Expand All @@ -210,7 +210,7 @@ executable list-sort-exe
, lists-internal
, monoidal-containers
, plutus-benchmark-common
, plutus-core ^>=1.23
, plutus-core ^>=1.24

benchmark lists
import: lang, ghc-version-support
Expand Down Expand Up @@ -238,8 +238,8 @@ test-suite plutus-benchmark-lists-tests
, base >=4.9 && <5
, lists-internal
, plutus-benchmark-common
, plutus-core:plutus-core-testlib ^>=1.23
, plutus-tx:plutus-tx-testlib ^>=1.23
, plutus-core:plutus-core-testlib ^>=1.24
, plutus-tx:plutus-tx-testlib ^>=1.24
, tasty
, tasty-quickcheck

Expand All @@ -261,8 +261,8 @@ benchmark validation
, flat ^>=0.6
, optparse-applicative
, plutus-benchmark-common
, plutus-core ^>=1.23
, plutus-ledger-api ^>=1.23
, plutus-core ^>=1.24
, plutus-ledger-api ^>=1.24

---------------- validation-decode ----------------

Expand All @@ -282,8 +282,8 @@ benchmark validation-decode
, flat ^>=0.6
, optparse-applicative
, plutus-benchmark-common
, plutus-core ^>=1.23
, plutus-ledger-api ^>=1.23
, plutus-core ^>=1.24
, plutus-ledger-api ^>=1.24

---------------- validation-full ----------------

Expand All @@ -303,8 +303,8 @@ benchmark validation-full
, flat ^>=0.6
, optparse-applicative
, plutus-benchmark-common
, plutus-core ^>=1.23
, plutus-ledger-api ^>=1.23
, plutus-core ^>=1.24
, plutus-ledger-api ^>=1.24

---------------- Cek cost model calibration ----------------

Expand All @@ -323,9 +323,9 @@ benchmark cek-calibration
, criterion >=1.5.9.0
, lens
, mtl
, plutus-core ^>=1.23
, plutus-tx ^>=1.23
, plutus-tx-plugin ^>=1.23
, plutus-core ^>=1.24
, plutus-tx ^>=1.24
, plutus-tx-plugin ^>=1.24

---------------- Signature verification throughput ----------------

Expand All @@ -344,9 +344,9 @@ executable ed25519-costs
, cardano-crypto-class
, hedgehog
, plutus-benchmark-common
, plutus-core ^>=1.23
, plutus-tx ^>=1.23
, plutus-tx-plugin ^>=1.23
, plutus-core ^>=1.24
, plutus-tx ^>=1.24
, plutus-tx-plugin ^>=1.24

-- Calculate the predicted costs of sequences of ed25519 signature verification
-- operations and compare them with a golden file.
Expand All @@ -364,9 +364,9 @@ test-suite ed25519-costs-test
, cardano-crypto-class
, hedgehog
, plutus-benchmark-common
, plutus-core:{plutus-core, plutus-core-testlib} ^>=1.23
, plutus-tx ^>=1.23
, plutus-tx-plugin ^>=1.23
, plutus-core:{plutus-core, plutus-core-testlib} ^>=1.24
, plutus-tx ^>=1.24
, plutus-tx-plugin ^>=1.24

---------------- BLS12-381 experiments ----------------

Expand All @@ -391,10 +391,10 @@ library bls12-381lib-internal
, flat ^>=0.6
, hedgehog
, plutus-benchmark-common
, plutus-core ^>=1.23
, plutus-ledger-api ^>=1.23
, plutus-tx ^>=1.23
, plutus-tx-plugin ^>=1.23
, plutus-core ^>=1.24
, plutus-ledger-api ^>=1.24
, plutus-tx ^>=1.24
, plutus-tx-plugin ^>=1.24

-- Print out predicted costs of various scripts involving BLS12-381 operations
executable bls12-381-costs
Expand All @@ -418,7 +418,7 @@ test-suite bls12-381-costs-test
, base >=4.9 && <5
, bls12-381lib-internal
, plutus-benchmark-common
, plutus-core:plutus-core-testlib ^>=1.23
, plutus-core:plutus-core-testlib ^>=1.24

-- Run benchmarks for various scripts involving BLS12-381 operations
benchmark bls12-381-benchmarks
Expand All @@ -432,7 +432,7 @@ benchmark bls12-381-benchmarks
, bytestring
, criterion >=1.5.9.0
, plutus-benchmark-common
, plutus-tx ^>=1.23
, plutus-tx ^>=1.24

---------------- script contexts ----------------

Expand All @@ -446,9 +446,9 @@ library script-contexts-internal
exposed-modules: PlutusBenchmark.ScriptContexts
build-depends:
, base >=4.9 && <5
, plutus-ledger-api ^>=1.23
, plutus-tx ^>=1.23
, plutus-tx-plugin ^>=1.23
, plutus-ledger-api ^>=1.24
, plutus-tx ^>=1.24
, plutus-tx-plugin ^>=1.24

test-suite plutus-benchmark-script-contexts-tests
import: lang, ghc-version-support
Expand All @@ -460,8 +460,8 @@ test-suite plutus-benchmark-script-contexts-tests
build-depends:
, base >=4.9 && <5
, plutus-benchmark-common
, plutus-core:{plutus-core, plutus-core-testlib} ^>=1.23
, plutus-tx:plutus-tx-testlib ^>=1.23
, plutus-core:{plutus-core, plutus-core-testlib} ^>=1.24
, plutus-tx:plutus-tx-testlib ^>=1.24
, script-contexts-internal
, tasty
, tasty-hunit
Expand Down Expand Up @@ -490,10 +490,10 @@ library marlowe-internal
, mtl
, newtype-generics
, plutus-benchmark-common
, plutus-core:{plutus-core, plutus-core-execlib} ^>=1.23
, plutus-ledger-api ^>=1.23
, plutus-tx ^>=1.23
, plutus-tx-plugin ^>=1.23
, plutus-core:{plutus-core, plutus-core-execlib} ^>=1.24
, plutus-ledger-api ^>=1.24
, plutus-tx ^>=1.24
, plutus-tx-plugin ^>=1.24
, serialise

executable marlowe-validators
Expand All @@ -513,8 +513,8 @@ executable marlowe-validators
, cardano-binary
, marlowe-internal
, plutus-benchmark-common
, plutus-ledger-api ^>=1.23
, plutus-tx ^>=1.23
, plutus-ledger-api ^>=1.24
, plutus-tx ^>=1.24
, serialise

benchmark marlowe
Expand All @@ -528,8 +528,8 @@ benchmark marlowe
, criterion
, marlowe-internal
, plutus-benchmark-common
, plutus-ledger-api ^>=1.23
, plutus-tx ^>=1.23
, plutus-ledger-api ^>=1.24
, plutus-tx ^>=1.24

test-suite plutus-benchmark-marlowe-tests
import: lang, ghc-version-support
Expand All @@ -541,9 +541,9 @@ test-suite plutus-benchmark-marlowe-tests
build-depends:
, base >=4.9 && <5
, marlowe-internal
, plutus-core:{plutus-core, plutus-core-testlib} ^>=1.23
, plutus-ledger-api ^>=1.23
, plutus-tx:{plutus-tx, plutus-tx-testlib} ^>=1.23
, plutus-core:{plutus-core, plutus-core-testlib} ^>=1.24
, plutus-ledger-api ^>=1.24
, plutus-tx:{plutus-tx, plutus-tx-testlib} ^>=1.24
, tasty

---------------- agda evaluators ----------------
Expand All @@ -566,8 +566,8 @@ benchmark validation-agda-cek
, flat ^>=0.6
, optparse-applicative
, plutus-benchmark-common
, plutus-core ^>=1.23
, plutus-ledger-api ^>=1.23
, plutus-core ^>=1.24
, plutus-ledger-api ^>=1.24

benchmark nofib-agda-cek
import: lang, ghc-version-support
Expand All @@ -592,5 +592,5 @@ benchmark marlowe-agda-cek
, criterion
, marlowe-internal
, plutus-benchmark-common
, plutus-ledger-api ^>=1.23
, plutus-tx ^>=1.23
, plutus-ledger-api ^>=1.24
, plutus-tx ^>=1.24
Loading

0 comments on commit 1843823

Please sign in to comment.