Skip to content

Commit c1d86b7

Browse files
ana-pantiliezliu41Unisaybasetunneldependabot[bot]
authored
Merge master into 1.57 (#7541)
* Add `QuadraticInX` to metatheory (#7531) * Add valueData and unValueData conformance tests (#7521) * Plinth guide: more details on versions (#7523) * chore(deps): bump rossjrw/pr-preview-action from 1.6.3 to 1.8.1 (#7533) Bumps [rossjrw/pr-preview-action](https://github.com/rossjrw/pr-preview-action) from 1.6.3 to 1.8.1. - [Release notes](https://github.com/rossjrw/pr-preview-action/releases) - [Commits](rossjrw/pr-preview-action@v1.6.3...v1.8.1) --- updated-dependencies: - dependency-name: rossjrw/pr-preview-action dependency-version: 1.8.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Improve error messages for stuck Unroll type family (#7535) * Let uplc support .hex files in addition to flat files (#7528) * update unValueData to reject non-canonical input (#7534) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Ziyang Liu <unsafeFixIO@gmail.com> Co-authored-by: Yura <1009751+Unisay@users.noreply.github.com> Co-authored-by: Jacco <4022046+basetunnel@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: zeme-wana <15709674+zeme-wana@users.noreply.github.com>
1 parent 8ab7a76 commit c1d86b7

116 files changed

Lines changed: 601 additions & 43 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/cost-models-site.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
- name: Deploy Preview Site
4747
if: github.event_name == 'pull_request'
48-
uses: rossjrw/pr-preview-action@v1.6.3
48+
uses: rossjrw/pr-preview-action@v1.8.1
4949
with:
5050
source-dir: doc/cost-models
5151
umbrella-dir: pr-preview/cost-models

.github/workflows/docusaurus-site.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
5858
- name: Deploy Preview Site
5959
if: github.event_name == 'pull_request'
60-
uses: rossjrw/pr-preview-action@v1.6.3
60+
uses: rossjrw/pr-preview-action@v1.8.1
6161
with:
6262
source-dir: doc/docusaurus/build
6363
umbrella-dir: pr-preview/docs

.github/workflows/papers-and-specs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858

5959
- name: Publish Preview Papers
6060
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
61-
uses: rossjrw/pr-preview-action@v1.6.3
61+
uses: rossjrw/pr-preview-action@v1.8.1
6262
with:
6363
source-dir: _resources
6464
umbrella-dir: pr-preview/resources

doc/docusaurus/docs/essential-concepts/versions.md

Lines changed: 16 additions & 0 deletions

plutus-conformance/agda/Spec.hs

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,41 @@ failingEvaluationTests =
218218
, "test-cases/uplc/evaluation/builtin/semantics/scaleValue/underflow"
219219
, "test-cases/uplc/evaluation/builtin/semantics/scaleValue/no-overflow"
220220
, "test-cases/uplc/evaluation/builtin/semantics/scaleValue/no-underflow"
221+
, -- valueData and unValueData builtins
222+
"test-cases/uplc/evaluation/builtin/semantics/valueData/empty"
223+
, "test-cases/uplc/evaluation/builtin/semantics/valueData/single-entry"
224+
, "test-cases/uplc/evaluation/builtin/semantics/valueData/multi-token"
225+
, "test-cases/uplc/evaluation/builtin/semantics/valueData/multi-currency"
226+
, "test-cases/uplc/evaluation/builtin/semantics/valueData/negative-quantity"
227+
, "test-cases/uplc/evaluation/builtin/semantics/valueData/roundtrip-from-value"
228+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/empty"
229+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/single-entry"
230+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/multi-token"
231+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/multi-currency"
232+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/negative-quantity"
233+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/max-key-len"
234+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/roundtrip-from-data"
235+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-duplicate-tokens"
236+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-duplicate-currencies"
237+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-duplicate-currencies-cancel"
238+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-duplicate-currencies-merge"
239+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-zero-quantity"
240+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-zero-sum"
241+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-empty-tokens"
242+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-unordered-currencies"
243+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-unordered-tokens"
244+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/non-map-integer"
245+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/non-map-constr"
246+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/non-map-list"
247+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/non-map-bytes"
248+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/currency-key-too-long"
249+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/token-key-too-long"
250+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/quantity-overflow"
251+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/quantity-underflow"
252+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/non-bytestring-currency"
253+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/non-bytestring-token"
254+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/non-integer-quantity"
255+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/non-map-tokens"
221256
]
222257

223258
{-| A list of budget tests which are currently expected to fail. Once a fix for
@@ -336,6 +371,41 @@ failingBudgetTests =
336371
, "test-cases/uplc/evaluation/builtin/semantics/scaleValue/underflow"
337372
, "test-cases/uplc/evaluation/builtin/semantics/scaleValue/no-overflow"
338373
, "test-cases/uplc/evaluation/builtin/semantics/scaleValue/no-underflow"
374+
, -- valueData and unValueData builtins
375+
"test-cases/uplc/evaluation/builtin/semantics/valueData/empty"
376+
, "test-cases/uplc/evaluation/builtin/semantics/valueData/single-entry"
377+
, "test-cases/uplc/evaluation/builtin/semantics/valueData/multi-token"
378+
, "test-cases/uplc/evaluation/builtin/semantics/valueData/multi-currency"
379+
, "test-cases/uplc/evaluation/builtin/semantics/valueData/negative-quantity"
380+
, "test-cases/uplc/evaluation/builtin/semantics/valueData/roundtrip-from-value"
381+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/empty"
382+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/single-entry"
383+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/multi-token"
384+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/multi-currency"
385+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/negative-quantity"
386+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/max-key-len"
387+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/roundtrip-from-data"
388+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-duplicate-tokens"
389+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-duplicate-currencies"
390+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-duplicate-currencies-cancel"
391+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-duplicate-currencies-merge"
392+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-zero-quantity"
393+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-zero-sum"
394+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-empty-tokens"
395+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-unordered-currencies"
396+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/data-unordered-tokens"
397+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/non-map-integer"
398+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/non-map-constr"
399+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/non-map-list"
400+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/non-map-bytes"
401+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/currency-key-too-long"
402+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/token-key-too-long"
403+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/quantity-overflow"
404+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/quantity-underflow"
405+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/non-bytestring-currency"
406+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/non-bytestring-token"
407+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/non-integer-quantity"
408+
, "test-cases/uplc/evaluation/builtin/semantics/unValueData/non-map-tokens"
339409
]
340410

341411
-- Run the tests: see Note [Evaluation with and without costing] above.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
-- Currency symbol with 33 bytes (> maxKeyLen)
2+
(program 1.0.0
3+
[
4+
(builtin unValueData)
5+
(con data
6+
(Map
7+
[ ( B #000000000000000000000000000000000000000000000000000000000000000000
8+
, Map [(B #, I 1)]
9+
)
10+
]
11+
)
12+
)
13+
]
14+
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
evaluation failure
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
evaluation failure
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
(program 1.0.0
2+
[ (builtin unValueData)
3+
(con data
4+
( Map
5+
[ (B #aa, Map [(B #aa, I 123)])
6+
, (B #bb, Map [(B #bb, I 2)])
7+
, (B #aa, Map [(B #aa, I -80)])
8+
, (B #cc, Map [(B #cc, I 2)])
9+
, (B #aa, Map [(B #aa, I -43)])
10+
]
11+
)
12+
)
13+
]
14+
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
evaluation failure

0 commit comments

Comments
 (0)