diff --git a/plutus-benchmark/bitwise/test/9.6/8 queens.budget.golden b/plutus-benchmark/bitwise/test/9.6/8 queens.budget.golden index 8fb82387dd0..f48bdb53fca 100644 --- a/plutus-benchmark/bitwise/test/9.6/8 queens.budget.golden +++ b/plutus-benchmark/bitwise/test/9.6/8 queens.budget.golden @@ -1,2 +1,2 @@ -({cpu: 409142294016 -| mem: 1575213647}) \ No newline at end of file +({cpu: 410655782016 +| mem: 1584672947}) \ No newline at end of file diff --git a/plutus-benchmark/bitwise/test/9.6/8 queens.size.golden b/plutus-benchmark/bitwise/test/9.6/8 queens.size.golden index c0220a2ad40..903dc0f537a 100644 --- a/plutus-benchmark/bitwise/test/9.6/8 queens.size.golden +++ b/plutus-benchmark/bitwise/test/9.6/8 queens.size.golden @@ -1 +1 @@ -397 \ No newline at end of file +390 \ No newline at end of file diff --git a/plutus-benchmark/bitwise/test/9.6/Ed25519.budget.golden b/plutus-benchmark/bitwise/test/9.6/Ed25519.budget.golden index 10693c22015..e57fa1f37b2 100644 --- a/plutus-benchmark/bitwise/test/9.6/Ed25519.budget.golden +++ b/plutus-benchmark/bitwise/test/9.6/Ed25519.budget.golden @@ -1,2 +1,2 @@ -({cpu: 2137054479882 -| mem: 7088444574}) \ No newline at end of file +({cpu: 2095692303882 +| mem: 6829930974}) \ No newline at end of file diff --git a/plutus-benchmark/bitwise/test/9.6/Ed25519.size.golden b/plutus-benchmark/bitwise/test/9.6/Ed25519.size.golden index 8da753ea595..bd7b9b63713 100644 --- a/plutus-benchmark/bitwise/test/9.6/Ed25519.size.golden +++ b/plutus-benchmark/bitwise/test/9.6/Ed25519.size.golden @@ -1 +1 @@ -3417 \ No newline at end of file +3410 \ No newline at end of file diff --git a/plutus-benchmark/bls12-381-costs/test/9.6/bls12-381-costs.golden b/plutus-benchmark/bls12-381-costs/test/9.6/bls12-381-costs.golden index 036ed8c1c48..bea5f0bb883 100644 --- a/plutus-benchmark/bls12-381-costs/test/9.6/bls12-381-costs.golden +++ b/plutus-benchmark/bls12-381-costs/test/9.6/bls12-381-costs.golden @@ -2,88 +2,88 @@ Hash n bytestrings onto G1 and add points n Script size CPU usage Memory usage ---------------------------------------------------------------------- - 0 115 (0.7%) 53556222 (0.5%) 3918 (0.0%) - 10 224 (1.4%) 593877682 (5.9%) 37278 (0.3%) - 20 334 (2.0%) 1134199142 (11.3%) 70638 (0.5%) - 30 444 (2.7%) 1674520602 (16.7%) 103998 (0.7%) - 40 554 (3.4%) 2214842062 (22.1%) 137358 (1.0%) - 50 664 (4.1%) 2755163522 (27.6%) 170718 (1.2%) - 60 774 (4.7%) 3295484982 (33.0%) 204078 (1.5%) - 70 884 (5.4%) 3835806442 (38.4%) 237438 (1.7%) - 80 994 (6.1%) 4376127902 (43.8%) 270798 (1.9%) - 90 1104 (6.7%) 4916449362 (49.2%) 304158 (2.2%) - 100 1214 (7.4%) 5456770822 (54.6%) 337518 (2.4%) - 110 1324 (8.1%) 5997092282 (60.0%) 370878 (2.6%) - 120 1434 (8.8%) 6537413742 (65.4%) 404238 (2.9%) - 130 1544 (9.4%) 7077735202 (70.8%) 437598 (3.1%) - 140 1654 (10.1%) 7618056662 (76.2%) 470958 (3.4%) - 150 1764 (10.8%) 8158378122 (81.6%) 504318 (3.6%) + 0 109 (0.7%) 53460222 (0.5%) 3318 (0.0%) + 10 218 (1.3%) 593301682 (5.9%) 33678 (0.2%) + 20 328 (2.0%) 1133143142 (11.3%) 64038 (0.5%) + 30 438 (2.7%) 1672984602 (16.7%) 94398 (0.7%) + 40 548 (3.3%) 2212826062 (22.1%) 124758 (0.9%) + 50 658 (4.0%) 2752667522 (27.5%) 155118 (1.1%) + 60 768 (4.7%) 3292508982 (32.9%) 185478 (1.3%) + 70 878 (5.4%) 3832350442 (38.3%) 215838 (1.5%) + 80 988 (6.0%) 4372191902 (43.7%) 246198 (1.8%) + 90 1098 (6.7%) 4912033362 (49.1%) 276558 (2.0%) + 100 1208 (7.4%) 5451874822 (54.5%) 306918 (2.2%) + 110 1318 (8.0%) 5991716282 (59.9%) 337278 (2.4%) + 120 1428 (8.7%) 6531557742 (65.3%) 367638 (2.6%) + 130 1538 (9.4%) 7071399202 (70.7%) 397998 (2.8%) + 140 1648 (10.1%) 7611240662 (76.1%) 428358 (3.1%) + 150 1758 (10.7%) 8151082122 (81.5%) 458718 (3.3%) Hash n bytestrings onto G2 and add points n Script size CPU usage Memory usage ---------------------------------------------------------------------- - 0 163 (1.0%) 75306572 (0.8%) 3936 (0.0%) - 10 272 (1.7%) 1769766432 (17.7%) 37656 (0.3%) - 20 382 (2.3%) 3464226292 (34.6%) 71376 (0.5%) - 30 492 (3.0%) 5158686152 (51.6%) 105096 (0.8%) - 40 602 (3.7%) 6853146012 (68.5%) 138816 (1.0%) - 50 712 (4.3%) 8547605872 (85.5%) 172536 (1.2%) - 60 822 (5.0%) 10242065732 (102.4%) 206256 (1.5%) - 70 932 (5.7%) 11936525592 (119.4%) 239976 (1.7%) - 80 1042 (6.4%) 13630985452 (136.3%) 273696 (2.0%) - 90 1152 (7.0%) 15325445312 (153.3%) 307416 (2.2%) - 100 1262 (7.7%) 17019905172 (170.2%) 341136 (2.4%) - 110 1372 (8.4%) 18714365032 (187.1%) 374856 (2.7%) - 120 1482 (9.0%) 20408824892 (204.1%) 408576 (2.9%) - 130 1592 (9.7%) 22103284752 (221.0%) 442296 (3.2%) - 140 1702 (10.4%) 23797744612 (238.0%) 476016 (3.4%) - 150 1812 (11.1%) 25492204472 (254.9%) 509736 (3.6%) + 0 157 (1.0%) 75210572 (0.8%) 3336 (0.0%) + 10 266 (1.6%) 1769190432 (17.7%) 34056 (0.2%) + 20 376 (2.3%) 3463170292 (34.6%) 64776 (0.5%) + 30 486 (3.0%) 5157150152 (51.6%) 95496 (0.7%) + 40 596 (3.6%) 6851130012 (68.5%) 126216 (0.9%) + 50 706 (4.3%) 8545109872 (85.5%) 156936 (1.1%) + 60 816 (5.0%) 10239089732 (102.4%) 187656 (1.3%) + 70 926 (5.7%) 11933069592 (119.3%) 218376 (1.6%) + 80 1036 (6.3%) 13627049452 (136.3%) 249096 (1.8%) + 90 1146 (7.0%) 15321029312 (153.2%) 279816 (2.0%) + 100 1256 (7.7%) 17015009172 (170.2%) 310536 (2.2%) + 110 1366 (8.3%) 18708989032 (187.1%) 341256 (2.4%) + 120 1476 (9.0%) 20402968892 (204.0%) 371976 (2.7%) + 130 1586 (9.7%) 22096948752 (221.0%) 402696 (2.9%) + 140 1696 (10.4%) 23790928612 (237.9%) 433416 (3.1%) + 150 1806 (11.0%) 25484908472 (254.8%) 464136 (3.3%) Uncompress n G1 points and add the results n Script size CPU usage Memory usage ---------------------------------------------------------------------- - 0 112 (0.7%) 53556222 (0.5%) 3918 (0.0%) - 10 661 (4.0%) 597620792 (6.0%) 35278 (0.3%) - 20 1211 (7.4%) 1141685362 (11.4%) 66638 (0.5%) - 30 1761 (10.7%) 1685749932 (16.9%) 97998 (0.7%) - 40 2311 (14.1%) 2229814502 (22.3%) 129358 (0.9%) - 50 2861 (17.5%) 2773879072 (27.7%) 160718 (1.1%) - 60 3411 (20.8%) 3317943642 (33.2%) 192078 (1.4%) - 70 3961 (24.2%) 3862008212 (38.6%) 223438 (1.6%) - 80 4511 (27.5%) 4406072782 (44.1%) 254798 (1.8%) - 90 5061 (30.9%) 4950137352 (49.5%) 286158 (2.0%) - 100 5611 (34.2%) 5494201922 (54.9%) 317518 (2.3%) - 110 6161 (37.6%) 6038266492 (60.4%) 348878 (2.5%) - 120 6711 (41.0%) 6582331062 (65.8%) 380238 (2.7%) - 130 7261 (44.3%) 7126395632 (71.3%) 411598 (2.9%) - 140 7811 (47.7%) 7670460202 (76.7%) 442958 (3.2%) - 150 8361 (51.0%) 8214524772 (82.1%) 474318 (3.4%) + 0 105 (0.6%) 53460222 (0.5%) 3318 (0.0%) + 10 655 (4.0%) 597044792 (6.0%) 31678 (0.2%) + 20 1205 (7.4%) 1140629362 (11.4%) 60038 (0.4%) + 30 1755 (10.7%) 1684213932 (16.8%) 88398 (0.6%) + 40 2305 (14.1%) 2227798502 (22.3%) 116758 (0.8%) + 50 2855 (17.4%) 2771383072 (27.7%) 145118 (1.0%) + 60 3405 (20.8%) 3314967642 (33.1%) 173478 (1.2%) + 70 3955 (24.1%) 3858552212 (38.6%) 201838 (1.4%) + 80 4505 (27.5%) 4402136782 (44.0%) 230198 (1.6%) + 90 5055 (30.9%) 4945721352 (49.5%) 258558 (1.8%) + 100 5605 (34.2%) 5489305922 (54.9%) 286918 (2.0%) + 110 6155 (37.6%) 6032890492 (60.3%) 315278 (2.3%) + 120 6705 (40.9%) 6576475062 (65.8%) 343638 (2.5%) + 130 7255 (44.3%) 7120059632 (71.2%) 371998 (2.7%) + 140 7805 (47.6%) 7663644202 (76.6%) 400358 (2.9%) + 150 8355 (51.0%) 8207228772 (82.1%) 428718 (3.1%) Uncompress n G2 points and add the results n Script size CPU usage Memory usage ---------------------------------------------------------------------- - 0 160 (1.0%) 75306572 (0.8%) 3936 (0.0%) - 10 1189 (7.3%) 847209652 (8.5%) 35656 (0.3%) - 20 2219 (13.5%) 1619112732 (16.2%) 67376 (0.5%) - 30 3249 (19.8%) 2391015812 (23.9%) 99096 (0.7%) - 40 4279 (26.1%) 3162918892 (31.6%) 130816 (0.9%) - 50 5309 (32.4%) 3934821972 (39.3%) 162536 (1.2%) - 60 6339 (38.7%) 4706725052 (47.1%) 194256 (1.4%) - 70 7369 (45.0%) 5478628132 (54.8%) 225976 (1.6%) - 80 8399 (51.3%) 6250531212 (62.5%) 257696 (1.8%) - 90 9429 (57.6%) 7022434292 (70.2%) 289416 (2.1%) - 100 10459 (63.8%) 7794337372 (77.9%) 321136 (2.3%) - 110 11489 (70.1%) 8566240452 (85.7%) 352856 (2.5%) - 120 12519 (76.4%) 9338143532 (93.4%) 384576 (2.7%) - 130 13549 (82.7%) 10110046612 (101.1%) 416296 (3.0%) - 140 14579 (89.0%) 10881949692 (108.8%) 448016 (3.2%) - 150 15609 (95.3%) 11653852772 (116.5%) 479736 (3.4%) + 0 153 (0.9%) 75210572 (0.8%) 3336 (0.0%) + 10 1183 (7.2%) 846633652 (8.5%) 32056 (0.2%) + 20 2213 (13.5%) 1618056732 (16.2%) 60776 (0.4%) + 30 3243 (19.8%) 2389479812 (23.9%) 89496 (0.6%) + 40 4273 (26.1%) 3160902892 (31.6%) 118216 (0.8%) + 50 5303 (32.4%) 3932325972 (39.3%) 146936 (1.0%) + 60 6333 (38.7%) 4703749052 (47.0%) 175656 (1.3%) + 70 7363 (44.9%) 5475172132 (54.8%) 204376 (1.5%) + 80 8393 (51.2%) 6246595212 (62.5%) 233096 (1.7%) + 90 9423 (57.5%) 7018018292 (70.2%) 261816 (1.9%) + 100 10453 (63.8%) 7789441372 (77.9%) 290536 (2.1%) + 110 11483 (70.1%) 8560864452 (85.6%) 319256 (2.3%) + 120 12513 (76.4%) 9332287532 (93.3%) 347976 (2.5%) + 130 13543 (82.7%) 10103710612 (101.0%) 376696 (2.7%) + 140 14573 (88.9%) 10875133692 (108.8%) 405416 (2.9%) + 150 15603 (95.2%) 11646556772 (116.5%) 434136 (3.1%) Apply pairing to two pairs of points in G1 x G2 and run finalVerify on the results @@ -103,7 +103,7 @@ VRF example n Script size CPU usage Memory usage ---------------------------------------------------------------------- - - 714 (4.4%) 1220805236 (12.2%) 48149 (0.3%) + - 708 (4.3%) 1220133236 (12.2%) 43949 (0.3%) G1 Verify @@ -121,13 +121,13 @@ Aggregate Single Key n Script size CPU usage Memory usage ---------------------------------------------------------------------- - - 777 (4.7%) 2720886359 (27.2%) 70002 (0.5%) + - 771 (4.7%) 2719878359 (27.2%) 63702 (0.5%) Aggregate Multi Key n Script size CPU usage Memory usage ---------------------------------------------------------------------- - - 1705 (10.4%) 3446371236 (34.5%) 422386 (3.0%) + - 1698 (10.4%) 3439411236 (34.4%) 378886 (2.7%) Schnorr Signature G1 diff --git a/plutus-benchmark/ed25519-costs/test/9.6/ed25519-costs.golden b/plutus-benchmark/ed25519-costs/test/9.6/ed25519-costs.golden index 46ced7b8bce..5d98dbdf3b8 100644 --- a/plutus-benchmark/ed25519-costs/test/9.6/ed25519-costs.golden +++ b/plutus-benchmark/ed25519-costs/test/9.6/ed25519-costs.golden @@ -1,20 +1,20 @@ n Script size CPU usage Memory usage ---------------------------------------------------------------------- - 0 458 (2.8%) 5130441 (0.1%) 25722 (0.2%) - 10 2185 (13.3%) 646555741 (6.5%) 514552 (3.7%) - 20 3912 (23.9%) 1287981041 (12.9%) 1003382 (7.2%) - 30 5639 (34.4%) 1929406341 (19.3%) 1492212 (10.7%) - 40 7366 (45.0%) 2570831641 (25.7%) 1981042 (14.2%) - 50 9092 (55.5%) 3212256941 (32.1%) 2469872 (17.6%) - 60 10819 (66.0%) 3853682241 (38.5%) 2958702 (21.1%) - 70 12546 (76.6%) 4495107541 (45.0%) 3447532 (24.6%) - 80 14272 (87.1%) 5136532841 (51.4%) 3936362 (28.1%) - 90 15999 (97.7%) 5777958141 (57.8%) 4425192 (31.6%) - 100 17726 (108.2%) 6419383441 (64.2%) 4914022 (35.1%) - 110 19453 (118.7%) 7060808741 (70.6%) 5402852 (38.6%) - 120 21179 (129.3%) 7702234041 (77.0%) 5891682 (42.1%) - 130 22906 (139.8%) 8343659341 (83.4%) 6380512 (45.6%) - 140 24633 (150.3%) 8985084641 (89.9%) 6869342 (49.1%) - 150 26360 (160.9%) 9626509941 (96.3%) 7358172 (52.6%) + 0 451 (2.8%) 5034441 (0.1%) 25122 (0.2%) + 10 2178 (13.3%) 645499741 (6.5%) 507952 (3.6%) + 20 3905 (23.8%) 1285965041 (12.9%) 990782 (7.1%) + 30 5632 (34.4%) 1926430341 (19.3%) 1473612 (10.5%) + 40 7359 (44.9%) 2566895641 (25.7%) 1956442 (14.0%) + 50 9085 (55.5%) 3207360941 (32.1%) 2439272 (17.4%) + 60 10812 (66.0%) 3847826241 (38.5%) 2922102 (20.9%) + 70 12539 (76.5%) 4488291541 (44.9%) 3404932 (24.3%) + 80 14265 (87.1%) 5128756841 (51.3%) 3887762 (27.8%) + 90 15992 (97.6%) 5769222141 (57.7%) 4370592 (31.2%) + 100 17719 (108.1%) 6409687441 (64.1%) 4853422 (34.7%) + 110 19446 (118.7%) 7050152741 (70.5%) 5336252 (38.1%) + 120 21172 (129.2%) 7690618041 (76.9%) 5819082 (41.6%) + 130 22899 (139.8%) 8331083341 (83.3%) 6301912 (45.0%) + 140 24626 (150.3%) 8971548641 (89.7%) 6784742 (48.5%) + 150 26353 (160.8%) 9612013941 (96.1%) 7267572 (51.9%) Off-chain version succeeded on 100 inputs diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-10.budget.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-10.budget.golden index 322a64a8aed..dd5be226f82 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-10.budget.golden +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-10.budget.golden @@ -1,2 +1,2 @@ -({cpu: 197510904 -| mem: 846852}) \ No newline at end of file +({cpu: 193142904 +| mem: 819552}) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-100.budget.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-100.budget.golden index 300bcb13093..a00fde86f80 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-100.budget.golden +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-100.budget.golden @@ -1,2 +1,2 @@ -({cpu: 16499812194 -| mem: 70488132}) \ No newline at end of file +({cpu: 16024564194 +| mem: 67517832}) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-5.budget.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-5.budget.golden index 3b27b238bd6..23bc33c3be1 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-5.budget.golden +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-5.budget.golden @@ -1,2 +1,2 @@ -({cpu: 59141074 -| mem: 255392}) \ No newline at end of file +({cpu: 58133074 +| mem: 249092}) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-50.budget.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-50.budget.golden index 8a98d3ad4b5..2badc1a60c5 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-50.budget.golden +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-50.budget.golden @@ -1,2 +1,2 @@ -({cpu: 4212184144 -| mem: 17998532}) \ No newline at end of file +({cpu: 4094536144 +| mem: 17263232}) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-10.budget.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-10.budget.golden index 08eaa7f9827..b3f10503248 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-10.budget.golden +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-10.budget.golden @@ -1,2 +1,2 @@ -({cpu: 117905780 -| mem: 564480}) \ No newline at end of file +({cpu: 113537780 +| mem: 537180}) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-100.budget.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-100.budget.golden index fcb362d0499..dc02b0ec512 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-100.budget.golden +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-100.budget.golden @@ -1,2 +1,2 @@ -({cpu: 8992550900 -| mem: 41599800}) \ No newline at end of file +({cpu: 8517302900 +| mem: 38629500}) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-5.budget.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-5.budget.golden index d878e7d59b7..f16ca74f7f5 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-5.budget.golden +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-5.budget.golden @@ -1,2 +1,2 @@ -({cpu: 37925190 -| mem: 186640}) \ No newline at end of file +({cpu: 36917190 +| mem: 180340}) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-50.budget.golden b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-50.budget.golden index 0b298b61fac..b3e5f4eb0f8 100644 --- a/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-50.budget.golden +++ b/plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-50.budget.golden @@ -1,2 +1,2 @@ -({cpu: 2323012500 -| mem: 10794400}) \ No newline at end of file +({cpu: 2205364500 +| mem: 10059100}) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/left-fold-built-in.budget.golden b/plutus-benchmark/lists/test/Sum/9.6/left-fold-built-in.budget.golden index 2d6ce75ed80..7c3185906ba 100644 --- a/plutus-benchmark/lists/test/Sum/9.6/left-fold-built-in.budget.golden +++ b/plutus-benchmark/lists/test/Sum/9.6/left-fold-built-in.budget.golden @@ -1,2 +1,2 @@ -({cpu: 122258594 -| mem: 523832}) \ No newline at end of file +({cpu: 117362594 +| mem: 493232}) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/left-fold-data.budget.golden b/plutus-benchmark/lists/test/Sum/9.6/left-fold-data.budget.golden index a84f88757da..91dd5bfa955 100644 --- a/plutus-benchmark/lists/test/Sum/9.6/left-fold-data.budget.golden +++ b/plutus-benchmark/lists/test/Sum/9.6/left-fold-data.budget.golden @@ -1,2 +1,2 @@ -({cpu: 316399632 -| mem: 1277230}) \ No newline at end of file +({cpu: 311503632 +| mem: 1246630}) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/left-fold-scott.budget.golden b/plutus-benchmark/lists/test/Sum/9.6/left-fold-scott.budget.golden index 118f7f4fbbd..c782a2c8498 100644 --- a/plutus-benchmark/lists/test/Sum/9.6/left-fold-scott.budget.golden +++ b/plutus-benchmark/lists/test/Sum/9.6/left-fold-scott.budget.golden @@ -1,2 +1,2 @@ -({cpu: 82856900 -| mem: 454900}) \ No newline at end of file +({cpu: 77960900 +| mem: 424300}) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/right-fold-built-in.budget.golden b/plutus-benchmark/lists/test/Sum/9.6/right-fold-built-in.budget.golden index ca23dc21c88..25c45dd1ec4 100644 --- a/plutus-benchmark/lists/test/Sum/9.6/right-fold-built-in.budget.golden +++ b/plutus-benchmark/lists/test/Sum/9.6/right-fold-built-in.budget.golden @@ -1,2 +1,2 @@ -({cpu: 127058594 -| mem: 553832}) \ No newline at end of file +({cpu: 122162594 +| mem: 523232}) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/right-fold-data.budget.golden b/plutus-benchmark/lists/test/Sum/9.6/right-fold-data.budget.golden index 57dceffe19f..c5d5b701730 100644 --- a/plutus-benchmark/lists/test/Sum/9.6/right-fold-data.budget.golden +++ b/plutus-benchmark/lists/test/Sum/9.6/right-fold-data.budget.golden @@ -1,2 +1,2 @@ -({cpu: 321199632 -| mem: 1307230}) \ No newline at end of file +({cpu: 316303632 +| mem: 1276630}) \ No newline at end of file diff --git a/plutus-benchmark/lists/test/Sum/9.6/right-fold-scott.budget.golden b/plutus-benchmark/lists/test/Sum/9.6/right-fold-scott.budget.golden index 98ba89dd8b9..bbe41ebb07d 100644 --- a/plutus-benchmark/lists/test/Sum/9.6/right-fold-scott.budget.golden +++ b/plutus-benchmark/lists/test/Sum/9.6/right-fold-scott.budget.golden @@ -1,2 +1,2 @@ -({cpu: 87656900 -| mem: 484900}) \ No newline at end of file +({cpu: 82760900 +| mem: 454300}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/0004000402010401030101030100040000010104020201030001000204020401.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/0004000402010401030101030100040000010104020201030001000204020401.budget.golden index 2c219669a67..faf2ab8c44e 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/0004000402010401030101030100040000010104020201030001000204020401.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/0004000402010401030101030100040000010104020201030001000204020401.budget.golden @@ -1,2 +1,2 @@ -({cpu: 203554074 -| mem: 988490}) \ No newline at end of file +({cpu: 198178074 +| mem: 954890}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/0100000100010000000001000100010101000101000001000000010000010000.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/0100000100010000000001000100010101000101000001000000010000010000.budget.golden index 037faaa6a09..b237071ca28 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/0100000100010000000001000100010101000101000001000000010000010000.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/0100000100010000000001000100010101000101000001000000010000010000.budget.golden @@ -1,2 +1,2 @@ -({cpu: 296248136 -| mem: 1507304}) \ No newline at end of file +({cpu: 287224136 +| mem: 1450904}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/0101000100000101010000010101000100010101000001000001000000010101.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/0101000100000101010000010101000100010101000001000001000000010101.budget.golden index 731adcb6f1d..9e5f70afa95 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/0101000100000101010000010101000100010101000001000001000000010101.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/0101000100000101010000010101000100010101000001000001000000010101.budget.golden @@ -1,2 +1,2 @@ -({cpu: 218828188 -| mem: 1072854}) \ No newline at end of file +({cpu: 212492188 +| mem: 1033254}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/01dcc372ea619cb9f23c45b17b9a0a8a16b7ca0e04093ef8ecce291667a99a4c.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/01dcc372ea619cb9f23c45b17b9a0a8a16b7ca0e04093ef8ecce291667a99a4c.budget.golden index 3e6ef04a204..d306de23b87 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/01dcc372ea619cb9f23c45b17b9a0a8a16b7ca0e04093ef8ecce291667a99a4c.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/01dcc372ea619cb9f23c45b17b9a0a8a16b7ca0e04093ef8ecce291667a99a4c.budget.golden @@ -1,2 +1,2 @@ -({cpu: 177375938 -| mem: 850422}) \ No newline at end of file +({cpu: 172383938 +| mem: 819222}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/0201020201020000020000010201020001020200000002010200000101010100.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/0201020201020000020000010201020001020200000002010200000101010100.budget.golden index f864d776657..ebe960006dd 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/0201020201020000020000010201020001020200000002010200000101010100.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/0201020201020000020000010201020001020200000002010200000101010100.budget.golden @@ -1,2 +1,2 @@ -({cpu: 199201946 -| mem: 960932}) \ No newline at end of file +({cpu: 193537946 +| mem: 925532}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/0202010002010100020102020102020001010101020102010001010101000100.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/0202010002010100020102020102020001010101020102010001010101000100.budget.golden index 3acad6678ec..fc8bb6e990e 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/0202010002010100020102020102020001010101020102010001010101000100.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/0202010002010100020102020102020001010101020102010001010101000100.budget.golden @@ -1,2 +1,2 @@ -({cpu: 185596754 -| mem: 887072}) \ No newline at end of file +({cpu: 180892754 +| mem: 857672}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/0303020000020001010201060303040208070100050401080304020801030001.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/0303020000020001010201060303040208070100050401080304020801030001.budget.golden index 2ca2e05199f..58df54e3900 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/0303020000020001010201060303040208070100050401080304020801030001.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/0303020000020001010201060303040208070100050401080304020801030001.budget.golden @@ -1,2 +1,2 @@ -({cpu: 184435055 -| mem: 880470}) \ No newline at end of file +({cpu: 179779055 +| mem: 851370}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/031d56d71454e2c4216ffaa275c4a8b3eb631109559d0e56f44ea8489f57ba97.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/031d56d71454e2c4216ffaa275c4a8b3eb631109559d0e56f44ea8489f57ba97.budget.golden index 15a9334ea48..87391ab1d11 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/031d56d71454e2c4216ffaa275c4a8b3eb631109559d0e56f44ea8489f57ba97.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/031d56d71454e2c4216ffaa275c4a8b3eb631109559d0e56f44ea8489f57ba97.budget.golden @@ -1,2 +1,2 @@ -({cpu: 231014344 -| mem: 1131576}) \ No newline at end of file +({cpu: 224198344 +| mem: 1088976}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/03d730a62332c51c7b70c16c64da72dd1c3ea36c26b41cd1a1e00d39fda3d6cc.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/03d730a62332c51c7b70c16c64da72dd1c3ea36c26b41cd1a1e00d39fda3d6cc.budget.golden index 2051bce4bd3..9db421768a0 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/03d730a62332c51c7b70c16c64da72dd1c3ea36c26b41cd1a1e00d39fda3d6cc.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/03d730a62332c51c7b70c16c64da72dd1c3ea36c26b41cd1a1e00d39fda3d6cc.budget.golden @@ -1,2 +1,2 @@ -({cpu: 214343877 -| mem: 1046444}) \ No newline at end of file +({cpu: 208247877 +| mem: 1008344}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/0403020000030204010000030001000202010101000304030001040404030100.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/0403020000030204010000030001000202010101000304030001040404030100.budget.golden index 8e17bd5a247..c564e28a985 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/0403020000030204010000030001000202010101000304030001040404030100.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/0403020000030204010000030001000202010101000304030001040404030100.budget.golden @@ -1,2 +1,2 @@ -({cpu: 198142226 -| mem: 955410}) \ No newline at end of file +({cpu: 192670226 +| mem: 921210}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/0405010105020401010304080005050800040301010800080207080704020206.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/0405010105020401010304080005050800040301010800080207080704020206.budget.golden index 0e0f84428ac..2497dc45578 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/0405010105020401010304080005050800040301010800080207080704020206.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/0405010105020401010304080005050800040301010800080207080704020206.budget.golden @@ -1,2 +1,2 @@ -({cpu: 219510582 -| mem: 1070794}) \ No newline at end of file +({cpu: 213558582 +| mem: 1033594}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/041a2c3b111139201a3a2c173c392b170e16370d300f2d28342d0f2f0e182e01.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/041a2c3b111139201a3a2c173c392b170e16370d300f2d28342d0f2f0e182e01.budget.golden index bbd285e75b8..2aa1c3df423 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/041a2c3b111139201a3a2c173c392b170e16370d300f2d28342d0f2f0e182e01.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/041a2c3b111139201a3a2c173c392b170e16370d300f2d28342d0f2f0e182e01.budget.golden @@ -1,2 +1,2 @@ -({cpu: 220655269 -| mem: 1084970}) \ No newline at end of file +({cpu: 214175269 +| mem: 1044470}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/04f592afc6e57c633b9c55246e7c82e87258f04e2fb910c37d8e2417e9db46e5.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/04f592afc6e57c633b9c55246e7c82e87258f04e2fb910c37d8e2417e9db46e5.budget.golden index 078629b6923..58bbb1d5781 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/04f592afc6e57c633b9c55246e7c82e87258f04e2fb910c37d8e2417e9db46e5.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/04f592afc6e57c633b9c55246e7c82e87258f04e2fb910c37d8e2417e9db46e5.budget.golden @@ -1,2 +1,2 @@ -({cpu: 261001580 -| mem: 1305298}) \ No newline at end of file +({cpu: 253225580 +| mem: 1256698}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/057ebc80922f16a5f4bf13e985bf586b8cff37a2f6fe0f3ce842178c16981027.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/057ebc80922f16a5f4bf13e985bf586b8cff37a2f6fe0f3ce842178c16981027.budget.golden index ad41ece9728..7632c0fc20d 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/057ebc80922f16a5f4bf13e985bf586b8cff37a2f6fe0f3ce842178c16981027.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/057ebc80922f16a5f4bf13e985bf586b8cff37a2f6fe0f3ce842178c16981027.budget.golden @@ -1,2 +1,2 @@ -({cpu: 181828760 -| mem: 871944}) \ No newline at end of file +({cpu: 177124760 +| mem: 842544}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/06317060a8e488b1219c9dae427f9ce27918a9e09ee8ac424afa33ca923f7954.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/06317060a8e488b1219c9dae427f9ce27918a9e09ee8ac424afa33ca923f7954.budget.golden index a59f86ad124..63256c9d9fd 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/06317060a8e488b1219c9dae427f9ce27918a9e09ee8ac424afa33ca923f7954.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/06317060a8e488b1219c9dae427f9ce27918a9e09ee8ac424afa33ca923f7954.budget.golden @@ -1,2 +1,2 @@ -({cpu: 195736220 -| mem: 946208}) \ No newline at end of file +({cpu: 190072220 +| mem: 910808}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/07658a6c898ad6d624c37df1e49e909c2e9349ba7f4c0a6be5f166fe239bfcae.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/07658a6c898ad6d624c37df1e49e909c2e9349ba7f4c0a6be5f166fe239bfcae.budget.golden index f10ea4cce59..3c5645c3bc2 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/07658a6c898ad6d624c37df1e49e909c2e9349ba7f4c0a6be5f166fe239bfcae.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/07658a6c898ad6d624c37df1e49e909c2e9349ba7f4c0a6be5f166fe239bfcae.budget.golden @@ -1,2 +1,2 @@ -({cpu: 174959050 -| mem: 822766}) \ No newline at end of file +({cpu: 170447050 +| mem: 794566}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/0bdca1cb8fa7e38e09062557b82490714052e84e2054e913092cd84ac071b961.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/0bdca1cb8fa7e38e09062557b82490714052e84e2054e913092cd84ac071b961.budget.golden index fba655871a3..bdd67de3339 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/0bdca1cb8fa7e38e09062557b82490714052e84e2054e913092cd84ac071b961.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/0bdca1cb8fa7e38e09062557b82490714052e84e2054e913092cd84ac071b961.budget.golden @@ -1,2 +1,2 @@ -({cpu: 219662300 -| mem: 1087042}) \ No newline at end of file +({cpu: 213422300 +| mem: 1048042}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/0c9d3634aeae7038f839a1262d1a8bc724dc77af9426459417a56ec73240f0e0.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/0c9d3634aeae7038f839a1262d1a8bc724dc77af9426459417a56ec73240f0e0.budget.golden index 6e77175627e..1cefb733fee 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/0c9d3634aeae7038f839a1262d1a8bc724dc77af9426459417a56ec73240f0e0.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/0c9d3634aeae7038f839a1262d1a8bc724dc77af9426459417a56ec73240f0e0.budget.golden @@ -1,2 +1,2 @@ -({cpu: 192428232 -| mem: 928182}) \ No newline at end of file +({cpu: 187052232 +| mem: 894582}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/0d0f01050a0a0a0b0b050d0404090e0d0506000d0a041003040e0f100e0a0408.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/0d0f01050a0a0a0b0b050d0404090e0d0506000d0a041003040e0f100e0a0408.budget.golden index 9f545d2df6a..ce2f2c7f767 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/0d0f01050a0a0a0b0b050d0404090e0d0506000d0a041003040e0f100e0a0408.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/0d0f01050a0a0a0b0b050d0404090e0d0506000d0a041003040e0f100e0a0408.budget.golden @@ -1,2 +1,2 @@ -({cpu: 193888969 -| mem: 951610}) \ No newline at end of file +({cpu: 188176969 +| mem: 915910}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/0dbb692d2bf22d25eeceac461cfebf616f54003077a8473abc0457f18e025960.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/0dbb692d2bf22d25eeceac461cfebf616f54003077a8473abc0457f18e025960.budget.golden index 9b317d174f2..063a7742519 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/0dbb692d2bf22d25eeceac461cfebf616f54003077a8473abc0457f18e025960.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/0dbb692d2bf22d25eeceac461cfebf616f54003077a8473abc0457f18e025960.budget.golden @@ -1,2 +1,2 @@ -({cpu: 224624840 -| mem: 1108814}) \ No newline at end of file +({cpu: 218096840 +| mem: 1068014}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/0e00171d0f1e1f14070d0a00091f07101808021d081e1b120219081312081e15.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/0e00171d0f1e1f14070d0a00091f07101808021d081e1b120219081312081e15.budget.golden index 8c509ecdecf..c2530c79fd7 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/0e00171d0f1e1f14070d0a00091f07101808021d081e1b120219081312081e15.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/0e00171d0f1e1f14070d0a00091f07101808021d081e1b120219081312081e15.budget.golden @@ -1,2 +1,2 @@ -({cpu: 186503250 -| mem: 900070}) \ No newline at end of file +({cpu: 181511250 +| mem: 868870}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/0e72f62b0f922e31a2340baccc768104025400cf7fdd7dae62fbba5fc770936d.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/0e72f62b0f922e31a2340baccc768104025400cf7fdd7dae62fbba5fc770936d.budget.golden index 509532eed5d..ba1dd26b3e1 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/0e72f62b0f922e31a2340baccc768104025400cf7fdd7dae62fbba5fc770936d.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/0e72f62b0f922e31a2340baccc768104025400cf7fdd7dae62fbba5fc770936d.budget.golden @@ -1,2 +1,2 @@ -({cpu: 207079582 -| mem: 1008120}) \ No newline at end of file +({cpu: 201127582 +| mem: 970920}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/0e97c9d9417354d9460f2eb35018d3904b7b035af16ab299258adab93be0911a.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/0e97c9d9417354d9460f2eb35018d3904b7b035af16ab299258adab93be0911a.budget.golden index 2c219669a67..faf2ab8c44e 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/0e97c9d9417354d9460f2eb35018d3904b7b035af16ab299258adab93be0911a.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/0e97c9d9417354d9460f2eb35018d3904b7b035af16ab299258adab93be0911a.budget.golden @@ -1,2 +1,2 @@ -({cpu: 203554074 -| mem: 988490}) \ No newline at end of file +({cpu: 198178074 +| mem: 954890}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/0f010d040810040b10020e040f0e030b0a0d100f0c080c0c05000d04100c100f.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/0f010d040810040b10020e040f0e030b0a0d100f0c080c0c05000d04100c100f.budget.golden index 57ac57ee6f7..fed01207894 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/0f010d040810040b10020e040f0e030b0a0d100f0c080c0c05000d04100c100f.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/0f010d040810040b10020e040f0e030b0a0d100f0c080c0c05000d04100c100f.budget.golden @@ -1,2 +1,2 @@ -({cpu: 216190138 -| mem: 1059440}) \ No newline at end of file +({cpu: 210334138 +| mem: 1022840}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/1138a04a83edc0579053f9ffa9394b41df38230121fbecebee8c039776a88c0c.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/1138a04a83edc0579053f9ffa9394b41df38230121fbecebee8c039776a88c0c.budget.golden index 3a66ea5eeb9..9bb145a7518 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/1138a04a83edc0579053f9ffa9394b41df38230121fbecebee8c039776a88c0c.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/1138a04a83edc0579053f9ffa9394b41df38230121fbecebee8c039776a88c0c.budget.golden @@ -1,2 +1,2 @@ -({cpu: 183983314 -| mem: 876474}) \ No newline at end of file +({cpu: 178991314 +| mem: 845274}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/121a0a1b12030616111f02121a0e070716090a0e031c071419121f141409031d.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/121a0a1b12030616111f02121a0e070716090a0e031c071419121f141409031d.budget.golden index fe08621af2d..5a79229909b 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/121a0a1b12030616111f02121a0e070716090a0e031c071419121f141409031d.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/121a0a1b12030616111f02121a0e070716090a0e031c071419121f141409031d.budget.golden @@ -1,2 +1,2 @@ -({cpu: 181144008 -| mem: 865550}) \ No newline at end of file +({cpu: 176152008 +| mem: 834350}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/159e5a1bf16fe984b5569be7011b61b5e98f5d2839ca7e1b34c7f2afc7ffb58e.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/159e5a1bf16fe984b5569be7011b61b5e98f5d2839ca7e1b34c7f2afc7ffb58e.budget.golden index 0eb440e7f33..6429c044ef6 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/159e5a1bf16fe984b5569be7011b61b5e98f5d2839ca7e1b34c7f2afc7ffb58e.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/159e5a1bf16fe984b5569be7011b61b5e98f5d2839ca7e1b34c7f2afc7ffb58e.budget.golden @@ -1,2 +1,2 @@ -({cpu: 185132372 -| mem: 884970}) \ No newline at end of file +({cpu: 180428372 +| mem: 855570}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/195f522b596360690d04586a2563470f2214163435331a6622311f7323433f1c.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/195f522b596360690d04586a2563470f2214163435331a6622311f7323433f1c.budget.golden index 5844451f0f5..003039319d5 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/195f522b596360690d04586a2563470f2214163435331a6622311f7323433f1c.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/195f522b596360690d04586a2563470f2214163435331a6622311f7323433f1c.budget.golden @@ -1,2 +1,2 @@ -({cpu: 180666985 -| mem: 865342}) \ No newline at end of file +({cpu: 176010985 +| mem: 836242}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/1a20b465d48a585ffd622bd8dc26a498a3c12f930ab4feab3a5064cfb3bc536a.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/1a20b465d48a585ffd622bd8dc26a498a3c12f930ab4feab3a5064cfb3bc536a.budget.golden index f945f3fd0dd..f71951424df 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/1a20b465d48a585ffd622bd8dc26a498a3c12f930ab4feab3a5064cfb3bc536a.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/1a20b465d48a585ffd622bd8dc26a498a3c12f930ab4feab3a5064cfb3bc536a.budget.golden @@ -1,2 +1,2 @@ -({cpu: 203304930 -| mem: 979538}) \ No newline at end of file +({cpu: 197736930 +| mem: 944738}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/211e1b6c10260c4620074d2e372c260d38643a3d605f63772524034f0a4a7632.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/211e1b6c10260c4620074d2e372c260d38643a3d605f63772524034f0a4a7632.budget.golden index 6496923adfb..a9ea552ed83 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/211e1b6c10260c4620074d2e372c260d38643a3d605f63772524034f0a4a7632.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/211e1b6c10260c4620074d2e372c260d38643a3d605f63772524034f0a4a7632.budget.golden @@ -1,2 +1,2 @@ -({cpu: 194050135 -| mem: 932022}) \ No newline at end of file +({cpu: 189010135 +| mem: 900522}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/21a1426fb3fb3019d5dc93f210152e90b0a6e740ef509b1cdd423395f010e0ca.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/21a1426fb3fb3019d5dc93f210152e90b0a6e740ef509b1cdd423395f010e0ca.budget.golden index 2baad76e3fa..662bbdf519d 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/21a1426fb3fb3019d5dc93f210152e90b0a6e740ef509b1cdd423395f010e0ca.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/21a1426fb3fb3019d5dc93f210152e90b0a6e740ef509b1cdd423395f010e0ca.budget.golden @@ -1,2 +1,2 @@ -({cpu: 205436751 -| mem: 1000512}) \ No newline at end of file +({cpu: 199628751 +| mem: 964212}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/224ce46046fab9a17be4197622825f45cc0c59a6bd1604405148e43768c487ef.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/224ce46046fab9a17be4197622825f45cc0c59a6bd1604405148e43768c487ef.budget.golden index 3a66ea5eeb9..9bb145a7518 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/224ce46046fab9a17be4197622825f45cc0c59a6bd1604405148e43768c487ef.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/224ce46046fab9a17be4197622825f45cc0c59a6bd1604405148e43768c487ef.budget.golden @@ -1,2 +1,2 @@ -({cpu: 183983314 -| mem: 876474}) \ No newline at end of file +({cpu: 178991314 +| mem: 845274}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/332c2b1c11383d1b373e1315201f1128010e0e1518332f273f141b23243f2a07.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/332c2b1c11383d1b373e1315201f1128010e0e1518332f273f141b23243f2a07.budget.golden index 2ceea7737dd..81d7eb51d67 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/332c2b1c11383d1b373e1315201f1128010e0e1518332f273f141b23243f2a07.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/332c2b1c11383d1b373e1315201f1128010e0e1518332f273f141b23243f2a07.budget.golden @@ -1,2 +1,2 @@ -({cpu: 177363297 -| mem: 852316}) \ No newline at end of file +({cpu: 172707297 +| mem: 823216}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/3565ee025317e065e8555eef288080276716366769aad89e03389f5ec4ce26d7.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/3565ee025317e065e8555eef288080276716366769aad89e03389f5ec4ce26d7.budget.golden index 330187de928..a22f35d6356 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/3565ee025317e065e8555eef288080276716366769aad89e03389f5ec4ce26d7.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/3565ee025317e065e8555eef288080276716366769aad89e03389f5ec4ce26d7.budget.golden @@ -1,2 +1,2 @@ -({cpu: 195898258 -| mem: 947906}) \ No newline at end of file +({cpu: 190234258 +| mem: 912506}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/3569299fc986f5354d02e627a9eaa48ab46d5af52722307a0af72bae87e256dc.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/3569299fc986f5354d02e627a9eaa48ab46d5af52722307a0af72bae87e256dc.budget.golden index b84a76e9570..523ab961468 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/3569299fc986f5354d02e627a9eaa48ab46d5af52722307a0af72bae87e256dc.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/3569299fc986f5354d02e627a9eaa48ab46d5af52722307a0af72bae87e256dc.budget.golden @@ -1,2 +1,2 @@ -({cpu: 181828684 -| mem: 871944}) \ No newline at end of file +({cpu: 177124684 +| mem: 842544}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/36866914aa07cf62ef36cf2cd64c7f240e3371e27bb9fff5464301678e809c40.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/36866914aa07cf62ef36cf2cd64c7f240e3371e27bb9fff5464301678e809c40.budget.golden index b84a76e9570..523ab961468 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/36866914aa07cf62ef36cf2cd64c7f240e3371e27bb9fff5464301678e809c40.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/36866914aa07cf62ef36cf2cd64c7f240e3371e27bb9fff5464301678e809c40.budget.golden @@ -1,2 +1,2 @@ -({cpu: 181828684 -| mem: 871944}) \ No newline at end of file +({cpu: 177124684 +| mem: 842544}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/371c10d2526fc0f09dbe9ed59e44dcd949270b27dc42035addd7ff9f7e0d05e7.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/371c10d2526fc0f09dbe9ed59e44dcd949270b27dc42035addd7ff9f7e0d05e7.budget.golden index 8a99d63460c..258e5279368 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/371c10d2526fc0f09dbe9ed59e44dcd949270b27dc42035addd7ff9f7e0d05e7.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/371c10d2526fc0f09dbe9ed59e44dcd949270b27dc42035addd7ff9f7e0d05e7.budget.golden @@ -1,2 +1,2 @@ -({cpu: 222440158 -| mem: 1094112}) \ No newline at end of file +({cpu: 216392158 +| mem: 1056312}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/3897ef714bba3e6821495b706c75f8d64264c3fdaa58a3826c808b5a768c303d.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/3897ef714bba3e6821495b706c75f8d64264c3fdaa58a3826c808b5a768c303d.budget.golden index 5c97e4e41bf..2734b006fac 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/3897ef714bba3e6821495b706c75f8d64264c3fdaa58a3826c808b5a768c303d.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/3897ef714bba3e6821495b706c75f8d64264c3fdaa58a3826c808b5a768c303d.budget.golden @@ -1,2 +1,2 @@ -({cpu: 189699590 -| mem: 912156}) \ No newline at end of file +({cpu: 184515590 +| mem: 879756}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/4121d88f14387d33ac5e1329618068e3848445cdd66b29e5ba382be2e02a174a.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/4121d88f14387d33ac5e1329618068e3848445cdd66b29e5ba382be2e02a174a.budget.golden index 72aa08052eb..a29bd95498e 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/4121d88f14387d33ac5e1329618068e3848445cdd66b29e5ba382be2e02a174a.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/4121d88f14387d33ac5e1329618068e3848445cdd66b29e5ba382be2e02a174a.budget.golden @@ -1,2 +1,2 @@ -({cpu: 220915908 -| mem: 1092966}) \ No newline at end of file +({cpu: 214483908 +| mem: 1052766}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/4299c7fcf093a5dbfe114c188e32ca199b571a7c25cb7f766bf49f12dab308be.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/4299c7fcf093a5dbfe114c188e32ca199b571a7c25cb7f766bf49f12dab308be.budget.golden index 2c219669a67..faf2ab8c44e 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/4299c7fcf093a5dbfe114c188e32ca199b571a7c25cb7f766bf49f12dab308be.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/4299c7fcf093a5dbfe114c188e32ca199b571a7c25cb7f766bf49f12dab308be.budget.golden @@ -1,2 +1,2 @@ -({cpu: 203554074 -| mem: 988490}) \ No newline at end of file +({cpu: 198178074 +| mem: 954890}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/452e17d16222a427707fa83f63ffb79f606cc25c755a18b1e3274c964ed5ec99.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/452e17d16222a427707fa83f63ffb79f606cc25c755a18b1e3274c964ed5ec99.budget.golden index 283e9fa3d5a..7a578711a99 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/452e17d16222a427707fa83f63ffb79f606cc25c755a18b1e3274c964ed5ec99.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/452e17d16222a427707fa83f63ffb79f606cc25c755a18b1e3274c964ed5ec99.budget.golden @@ -1,2 +1,2 @@ -({cpu: 226825854 -| mem: 1106550}) \ No newline at end of file +({cpu: 220201854 +| mem: 1065150}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/46f8d00030436e4da490a86b331fa6c3251425fb8c19556080e124d75bad7bd6.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/46f8d00030436e4da490a86b331fa6c3251425fb8c19556080e124d75bad7bd6.budget.golden index 8b142c45798..0595e2b7136 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/46f8d00030436e4da490a86b331fa6c3251425fb8c19556080e124d75bad7bd6.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/46f8d00030436e4da490a86b331fa6c3251425fb8c19556080e124d75bad7bd6.budget.golden @@ -1,2 +1,2 @@ -({cpu: 183970673 -| mem: 878368}) \ No newline at end of file +({cpu: 179314673 +| mem: 849268}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/47364cfaf2c00f7d633283dce6cf84e4fd4e8228c0a0aa50e7c55f35c3ecaa1c.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/47364cfaf2c00f7d633283dce6cf84e4fd4e8228c0a0aa50e7c55f35c3ecaa1c.budget.golden index 8b142c45798..0595e2b7136 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/47364cfaf2c00f7d633283dce6cf84e4fd4e8228c0a0aa50e7c55f35c3ecaa1c.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/47364cfaf2c00f7d633283dce6cf84e4fd4e8228c0a0aa50e7c55f35c3ecaa1c.budget.golden @@ -1,2 +1,2 @@ -({cpu: 183970673 -| mem: 878368}) \ No newline at end of file +({cpu: 179314673 +| mem: 849268}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/49b8275d0cb817be40865694ab05e3cfe5fc35fb43b78e7de68c1f3519b536bd.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/49b8275d0cb817be40865694ab05e3cfe5fc35fb43b78e7de68c1f3519b536bd.budget.golden index 2681737b010..41551b02f96 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/49b8275d0cb817be40865694ab05e3cfe5fc35fb43b78e7de68c1f3519b536bd.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/49b8275d0cb817be40865694ab05e3cfe5fc35fb43b78e7de68c1f3519b536bd.budget.golden @@ -1,2 +1,2 @@ -({cpu: 192594570 -| mem: 934880}) \ No newline at end of file +({cpu: 186930570 +| mem: 899480}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/4dd7755b6ca1f0c9747c1fc0ee4da799f6f1c07108e980bd9f820911ad711ff2.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/4dd7755b6ca1f0c9747c1fc0ee4da799f6f1c07108e980bd9f820911ad711ff2.budget.golden index 9090e204b1b..3a2d2e72010 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/4dd7755b6ca1f0c9747c1fc0ee4da799f6f1c07108e980bd9f820911ad711ff2.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/4dd7755b6ca1f0c9747c1fc0ee4da799f6f1c07108e980bd9f820911ad711ff2.budget.golden @@ -1,2 +1,2 @@ -({cpu: 252970720 -| mem: 1265586}) \ No newline at end of file +({cpu: 245386720 +| mem: 1218186}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/4fbcfdb577a56b842d6f6938187a783f71d9da7519353e3da3ef0c564e1eb344.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/4fbcfdb577a56b842d6f6938187a783f71d9da7519353e3da3ef0c564e1eb344.budget.golden index 00825d60be6..a0d2ddb9b96 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/4fbcfdb577a56b842d6f6938187a783f71d9da7519353e3da3ef0c564e1eb344.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/4fbcfdb577a56b842d6f6938187a783f71d9da7519353e3da3ef0c564e1eb344.budget.golden @@ -1,2 +1,2 @@ -({cpu: 234513438 -| mem: 1154872}) \ No newline at end of file +({cpu: 227601438 +| mem: 1111672}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/5a0725d49c733130eda8bc6ed5234f7f6ff8c9dd2d201e8806125e5fbcc081f9.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/5a0725d49c733130eda8bc6ed5234f7f6ff8c9dd2d201e8806125e5fbcc081f9.budget.golden index 871c034364d..7886b100307 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/5a0725d49c733130eda8bc6ed5234f7f6ff8c9dd2d201e8806125e5fbcc081f9.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/5a0725d49c733130eda8bc6ed5234f7f6ff8c9dd2d201e8806125e5fbcc081f9.budget.golden @@ -1,2 +1,2 @@ -({cpu: 196946698 -| mem: 962438}) \ No newline at end of file +({cpu: 191570698 +| mem: 928838}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/5a2aae344e569a2c644dd9fa8c7b1f129850937eb562b7748c275f9e40bed596.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/5a2aae344e569a2c644dd9fa8c7b1f129850937eb562b7748c275f9e40bed596.budget.golden index 8b142c45798..0595e2b7136 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/5a2aae344e569a2c644dd9fa8c7b1f129850937eb562b7748c275f9e40bed596.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/5a2aae344e569a2c644dd9fa8c7b1f129850937eb562b7748c275f9e40bed596.budget.golden @@ -1,2 +1,2 @@ -({cpu: 183970673 -| mem: 878368}) \ No newline at end of file +({cpu: 179314673 +| mem: 849268}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/5ade103e9530dd0d572fe1b053ea65ad925c6ebbe321e873ace8b804363fa82c.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/5ade103e9530dd0d572fe1b053ea65ad925c6ebbe321e873ace8b804363fa82c.budget.golden index 2a56f4c8203..d12bda902b1 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/5ade103e9530dd0d572fe1b053ea65ad925c6ebbe321e873ace8b804363fa82c.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/5ade103e9530dd0d572fe1b053ea65ad925c6ebbe321e873ace8b804363fa82c.budget.golden @@ -1,2 +1,2 @@ -({cpu: 266561356 -| mem: 1348510}) \ No newline at end of file +({cpu: 258401356 +| mem: 1297510}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/5d4c62a0671c65a14f6a15093e3efc4f1816d95a5a58fd92486bedaae8d9526b.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/5d4c62a0671c65a14f6a15093e3efc4f1816d95a5a58fd92486bedaae8d9526b.budget.golden index fba655871a3..bdd67de3339 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/5d4c62a0671c65a14f6a15093e3efc4f1816d95a5a58fd92486bedaae8d9526b.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/5d4c62a0671c65a14f6a15093e3efc4f1816d95a5a58fd92486bedaae8d9526b.budget.golden @@ -1,2 +1,2 @@ -({cpu: 219662300 -| mem: 1087042}) \ No newline at end of file +({cpu: 213422300 +| mem: 1048042}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/5efe992e306e31cc857c64a62436ad2f9325acc5b4a74a8cebccdfd853ce63d2.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/5efe992e306e31cc857c64a62436ad2f9325acc5b4a74a8cebccdfd853ce63d2.budget.golden index 2681737b010..41551b02f96 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/5efe992e306e31cc857c64a62436ad2f9325acc5b4a74a8cebccdfd853ce63d2.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/5efe992e306e31cc857c64a62436ad2f9325acc5b4a74a8cebccdfd853ce63d2.budget.golden @@ -1,2 +1,2 @@ -({cpu: 192594570 -| mem: 934880}) \ No newline at end of file +({cpu: 186930570 +| mem: 899480}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/622a7f3bc611b5149253c9189da022a9ff296f60a5b7c172a6dc286faa7284fa.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/622a7f3bc611b5149253c9189da022a9ff296f60a5b7c172a6dc286faa7284fa.budget.golden index 1d302b94216..a38c80cd5f6 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/622a7f3bc611b5149253c9189da022a9ff296f60a5b7c172a6dc286faa7284fa.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/622a7f3bc611b5149253c9189da022a9ff296f60a5b7c172a6dc286faa7284fa.budget.golden @@ -1,2 +1,2 @@ -({cpu: 226542994 -| mem: 1119196}) \ No newline at end of file +({cpu: 220014994 +| mem: 1078396}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/6621a69217f09d91f42876a9c0cecf79de0e29bdd5b16c82c6c52cf959092ec4.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/6621a69217f09d91f42876a9c0cecf79de0e29bdd5b16c82c6c52cf959092ec4.budget.golden index 989dfde856b..d5f9d105818 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/6621a69217f09d91f42876a9c0cecf79de0e29bdd5b16c82c6c52cf959092ec4.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/6621a69217f09d91f42876a9c0cecf79de0e29bdd5b16c82c6c52cf959092ec4.budget.golden @@ -1,2 +1,2 @@ -({cpu: 206110676 -| mem: 1005786}) \ No newline at end of file +({cpu: 200638676 +| mem: 971586}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/674b0577409957172ad85223c765d17e94c27714276c49c38dfae0a47a561a1e.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/674b0577409957172ad85223c765d17e94c27714276c49c38dfae0a47a561a1e.budget.golden index 5844451f0f5..003039319d5 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/674b0577409957172ad85223c765d17e94c27714276c49c38dfae0a47a561a1e.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/674b0577409957172ad85223c765d17e94c27714276c49c38dfae0a47a561a1e.budget.golden @@ -1,2 +1,2 @@ -({cpu: 180666985 -| mem: 865342}) \ No newline at end of file +({cpu: 176010985 +| mem: 836242}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/6b7bc2b9002a71b33cfd535d43f26334a283d0b9ad189b7cd74baac232c3b9fc.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/6b7bc2b9002a71b33cfd535d43f26334a283d0b9ad189b7cd74baac232c3b9fc.budget.golden index f10ea4cce59..3c5645c3bc2 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/6b7bc2b9002a71b33cfd535d43f26334a283d0b9ad189b7cd74baac232c3b9fc.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/6b7bc2b9002a71b33cfd535d43f26334a283d0b9ad189b7cd74baac232c3b9fc.budget.golden @@ -1,2 +1,2 @@ -({cpu: 174959050 -| mem: 822766}) \ No newline at end of file +({cpu: 170447050 +| mem: 794566}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/6c364699767a84059ffd99cf718562a8c09d96e343f23dc481e8ffda13af424f.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/6c364699767a84059ffd99cf718562a8c09d96e343f23dc481e8ffda13af424f.budget.golden index 8b142c45798..0595e2b7136 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/6c364699767a84059ffd99cf718562a8c09d96e343f23dc481e8ffda13af424f.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/6c364699767a84059ffd99cf718562a8c09d96e343f23dc481e8ffda13af424f.budget.golden @@ -1,2 +1,2 @@ -({cpu: 183970673 -| mem: 878368}) \ No newline at end of file +({cpu: 179314673 +| mem: 849268}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/6d66bddb4269bdf77392d3894da5341cf019d39787522af4f83f01285991e93c.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/6d66bddb4269bdf77392d3894da5341cf019d39787522af4f83f01285991e93c.budget.golden index 0eb440e7f33..6429c044ef6 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/6d66bddb4269bdf77392d3894da5341cf019d39787522af4f83f01285991e93c.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/6d66bddb4269bdf77392d3894da5341cf019d39787522af4f83f01285991e93c.budget.golden @@ -1,2 +1,2 @@ -({cpu: 185132372 -| mem: 884970}) \ No newline at end of file +({cpu: 180428372 +| mem: 855570}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/73f044f34a30f26639c58bafe952047f74c7bf1eafebab5aadf5b73cfb9024ed.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/73f044f34a30f26639c58bafe952047f74c7bf1eafebab5aadf5b73cfb9024ed.budget.golden index 8b142c45798..0595e2b7136 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/73f044f34a30f26639c58bafe952047f74c7bf1eafebab5aadf5b73cfb9024ed.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/73f044f34a30f26639c58bafe952047f74c7bf1eafebab5aadf5b73cfb9024ed.budget.golden @@ -1,2 +1,2 @@ -({cpu: 183970673 -| mem: 878368}) \ No newline at end of file +({cpu: 179314673 +| mem: 849268}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/7b1dd76edc27f00eb382bf996378155baf74d6a7c6f3d5ec837c39d29784aade.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/7b1dd76edc27f00eb382bf996378155baf74d6a7c6f3d5ec837c39d29784aade.budget.golden index 0eb440e7f33..6429c044ef6 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/7b1dd76edc27f00eb382bf996378155baf74d6a7c6f3d5ec837c39d29784aade.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/7b1dd76edc27f00eb382bf996378155baf74d6a7c6f3d5ec837c39d29784aade.budget.golden @@ -1,2 +1,2 @@ -({cpu: 185132372 -| mem: 884970}) \ No newline at end of file +({cpu: 180428372 +| mem: 855570}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/803eae94d62e2afc0e835c204af8362170301bc329e2d849d5f5a47dddf479ec.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/803eae94d62e2afc0e835c204af8362170301bc329e2d849d5f5a47dddf479ec.budget.golden index 4529324e4e2..44b563c2d1e 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/803eae94d62e2afc0e835c204af8362170301bc329e2d849d5f5a47dddf479ec.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/803eae94d62e2afc0e835c204af8362170301bc329e2d849d5f5a47dddf479ec.budget.golden @@ -1,2 +1,2 @@ -({cpu: 212631680 -| mem: 1051550}) \ No newline at end of file +({cpu: 206487680 +| mem: 1013150}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/87167fc5469adac97c1be749326fa79a6b7862ce68aa4abcb438e3c034bd0899.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/87167fc5469adac97c1be749326fa79a6b7862ce68aa4abcb438e3c034bd0899.budget.golden index 0af845d1f8a..53145e442bd 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/87167fc5469adac97c1be749326fa79a6b7862ce68aa4abcb438e3c034bd0899.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/87167fc5469adac97c1be749326fa79a6b7862ce68aa4abcb438e3c034bd0899.budget.golden @@ -1,2 +1,2 @@ -({cpu: 223346654 -| mem: 1107110}) \ No newline at end of file +({cpu: 217010654 +| mem: 1067510}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/8c0fa5d9d6724c5c72c67e055d4bfc36a385ded7c3c81c08cdbd8705829af6e6.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/8c0fa5d9d6724c5c72c67e055d4bfc36a385ded7c3c81c08cdbd8705829af6e6.budget.golden index dc8b9a4da46..97b0da656da 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/8c0fa5d9d6724c5c72c67e055d4bfc36a385ded7c3c81c08cdbd8705829af6e6.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/8c0fa5d9d6724c5c72c67e055d4bfc36a385ded7c3c81c08cdbd8705829af6e6.budget.golden @@ -1,2 +1,2 @@ -({cpu: 224273066 -| mem: 1114904}) \ No newline at end of file +({cpu: 217649066 +| mem: 1073504}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/962c2c658b19904372984a56409707401e64e9b03c1986647134cfd329ec5139.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/962c2c658b19904372984a56409707401e64e9b03c1986647134cfd329ec5139.budget.golden index bae9898b7da..19529b2fafa 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/962c2c658b19904372984a56409707401e64e9b03c1986647134cfd329ec5139.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/962c2c658b19904372984a56409707401e64e9b03c1986647134cfd329ec5139.budget.golden @@ -1,2 +1,2 @@ -({cpu: 202806988 -| mem: 992760}) \ No newline at end of file +({cpu: 197334988 +| mem: 958560}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/996804e90f2c75fe68886fc8511304b8ab9b36785f8858f5cb098e91c159dde9.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/996804e90f2c75fe68886fc8511304b8ab9b36785f8858f5cb098e91c159dde9.budget.golden index 3c39f47a64c..0fde00ef15e 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/996804e90f2c75fe68886fc8511304b8ab9b36785f8858f5cb098e91c159dde9.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/996804e90f2c75fe68886fc8511304b8ab9b36785f8858f5cb098e91c159dde9.budget.golden @@ -1,2 +1,2 @@ -({cpu: 190746447 -| mem: 918996}) \ No newline at end of file +({cpu: 185706447 +| mem: 887496}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/a004a989c005d59043f996500e110fa756ad1b85800b889d5815a0106388e1d7.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/a004a989c005d59043f996500e110fa756ad1b85800b889d5815a0106388e1d7.budget.golden index 90176ab4a9b..00fd5b5d2a6 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/a004a989c005d59043f996500e110fa756ad1b85800b889d5815a0106388e1d7.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/a004a989c005d59043f996500e110fa756ad1b85800b889d5815a0106388e1d7.budget.golden @@ -1,2 +1,2 @@ -({cpu: 197099053 -| mem: 950184}) \ No newline at end of file +({cpu: 191771053 +| mem: 916884}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/a0fba5740174b5cd24036c8b008cb1efde73f1edae097b9325c6117a0ff40d3b.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/a0fba5740174b5cd24036c8b008cb1efde73f1edae097b9325c6117a0ff40d3b.budget.golden index 6b1b2bbf7b3..5c4869536d9 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/a0fba5740174b5cd24036c8b008cb1efde73f1edae097b9325c6117a0ff40d3b.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/a0fba5740174b5cd24036c8b008cb1efde73f1edae097b9325c6117a0ff40d3b.budget.golden @@ -1,2 +1,2 @@ -({cpu: 207155658 -| mem: 1003398}) \ No newline at end of file +({cpu: 201491658 +| mem: 967998}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/a1b25347409c3993feca1a60b6fcaf93d1d4bbaae19ab06fdf50cedc26cee68d.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/a1b25347409c3993feca1a60b6fcaf93d1d4bbaae19ab06fdf50cedc26cee68d.budget.golden index fc2e13d953f..84e5786eb0e 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/a1b25347409c3993feca1a60b6fcaf93d1d4bbaae19ab06fdf50cedc26cee68d.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/a1b25347409c3993feca1a60b6fcaf93d1d4bbaae19ab06fdf50cedc26cee68d.budget.golden @@ -1,2 +1,2 @@ -({cpu: 176214353 -| mem: 843820}) \ No newline at end of file +({cpu: 171270353 +| mem: 812920}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/a27524cfad019df45e4e8316f927346d4cc39da6bdd294fb2c33c3f58e6a8994.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/a27524cfad019df45e4e8316f927346d4cc39da6bdd294fb2c33c3f58e6a8994.budget.golden index 8b142c45798..0595e2b7136 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/a27524cfad019df45e4e8316f927346d4cc39da6bdd294fb2c33c3f58e6a8994.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/a27524cfad019df45e4e8316f927346d4cc39da6bdd294fb2c33c3f58e6a8994.budget.golden @@ -1,2 +1,2 @@ -({cpu: 183970673 -| mem: 878368}) \ No newline at end of file +({cpu: 179314673 +| mem: 849268}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/a6664a2d2a82f370a34a36a45234f6b33120a39372331678a3b3690312560ce9.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/a6664a2d2a82f370a34a36a45234f6b33120a39372331678a3b3690312560ce9.budget.golden index 9626c940e26..b98a3a6ab80 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/a6664a2d2a82f370a34a36a45234f6b33120a39372331678a3b3690312560ce9.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/a6664a2d2a82f370a34a36a45234f6b33120a39372331678a3b3690312560ce9.budget.golden @@ -1,2 +1,2 @@ -({cpu: 231722765 -| mem: 1160806}) \ No newline at end of file +({cpu: 225050765 +| mem: 1119106}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/a6f064b83b31032ea7f25921364727224707268e472a569f584cc6b1d8c017e8.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/a6f064b83b31032ea7f25921364727224707268e472a569f584cc6b1d8c017e8.budget.golden index 0eb440e7f33..6429c044ef6 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/a6f064b83b31032ea7f25921364727224707268e472a569f584cc6b1d8c017e8.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/a6f064b83b31032ea7f25921364727224707268e472a569f584cc6b1d8c017e8.budget.golden @@ -1,2 +1,2 @@ -({cpu: 185132372 -| mem: 884970}) \ No newline at end of file +({cpu: 180428372 +| mem: 855570}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/a7cb09f417c3f089619fe25b7624392026382b458486129efcff18f8912bf302.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/a7cb09f417c3f089619fe25b7624392026382b458486129efcff18f8912bf302.budget.golden index 8b142c45798..0595e2b7136 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/a7cb09f417c3f089619fe25b7624392026382b458486129efcff18f8912bf302.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/a7cb09f417c3f089619fe25b7624392026382b458486129efcff18f8912bf302.budget.golden @@ -1,2 +1,2 @@ -({cpu: 183970673 -| mem: 878368}) \ No newline at end of file +({cpu: 179314673 +| mem: 849268}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/a92b4072cb8601fa697e1150c08463b14ffced54eb963df08d322216e27373cb.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/a92b4072cb8601fa697e1150c08463b14ffced54eb963df08d322216e27373cb.budget.golden index 0eb440e7f33..6429c044ef6 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/a92b4072cb8601fa697e1150c08463b14ffced54eb963df08d322216e27373cb.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/a92b4072cb8601fa697e1150c08463b14ffced54eb963df08d322216e27373cb.budget.golden @@ -1,2 +1,2 @@ -({cpu: 185132372 -| mem: 884970}) \ No newline at end of file +({cpu: 180428372 +| mem: 855570}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/af2e072b5adfaa7211e0b341e1f7319c4f4e7364a4247c9247132a927e914753.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/af2e072b5adfaa7211e0b341e1f7319c4f4e7364a4247c9247132a927e914753.budget.golden index 4d4480a2a99..c61e3830af7 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/af2e072b5adfaa7211e0b341e1f7319c4f4e7364a4247c9247132a927e914753.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/af2e072b5adfaa7211e0b341e1f7319c4f4e7364a4247c9247132a927e914753.budget.golden @@ -1,2 +1,2 @@ -({cpu: 221975776 -| mem: 1092010}) \ No newline at end of file +({cpu: 215927776 +| mem: 1054210}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/b43564af5f13cc5208b92b1ad6d45369446f378d3891e5cb3e353b30d4f3fb10.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/b43564af5f13cc5208b92b1ad6d45369446f378d3891e5cb3e353b30d4f3fb10.budget.golden index 0eb440e7f33..6429c044ef6 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/b43564af5f13cc5208b92b1ad6d45369446f378d3891e5cb3e353b30d4f3fb10.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/b43564af5f13cc5208b92b1ad6d45369446f378d3891e5cb3e353b30d4f3fb10.budget.golden @@ -1,2 +1,2 @@ -({cpu: 185132372 -| mem: 884970}) \ No newline at end of file +({cpu: 180428372 +| mem: 855570}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/b6243a5b4c353ce4852aa41705111d57867d2783eeef76f6d59beb2360da6e90.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/b6243a5b4c353ce4852aa41705111d57867d2783eeef76f6d59beb2360da6e90.budget.golden index 83712c29809..f02c0207bf9 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/b6243a5b4c353ce4852aa41705111d57867d2783eeef76f6d59beb2360da6e90.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/b6243a5b4c353ce4852aa41705111d57867d2783eeef76f6d59beb2360da6e90.budget.golden @@ -1,2 +1,2 @@ -({cpu: 256104842 -| mem: 1268882}) \ No newline at end of file +({cpu: 248616842 +| mem: 1222082}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/b869f3928200061abb1c3060425b9354b0e08cbf4400b340b8707c14b34317cd.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/b869f3928200061abb1c3060425b9354b0e08cbf4400b340b8707c14b34317cd.budget.golden index e1f4eb1809f..0a9a923d6ba 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/b869f3928200061abb1c3060425b9354b0e08cbf4400b340b8707c14b34317cd.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/b869f3928200061abb1c3060425b9354b0e08cbf4400b340b8707c14b34317cd.budget.golden @@ -1,2 +1,2 @@ -({cpu: 285423763 -| mem: 1442102}) \ No newline at end of file +({cpu: 276831763 +| mem: 1388402}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/bcdbc576d63b0454100ad06893812edafc2e7e4934fec1b44e2d06eb34f36eb8.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/bcdbc576d63b0454100ad06893812edafc2e7e4934fec1b44e2d06eb34f36eb8.budget.golden index 0eb440e7f33..6429c044ef6 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/bcdbc576d63b0454100ad06893812edafc2e7e4934fec1b44e2d06eb34f36eb8.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/bcdbc576d63b0454100ad06893812edafc2e7e4934fec1b44e2d06eb34f36eb8.budget.golden @@ -1,2 +1,2 @@ -({cpu: 185132372 -| mem: 884970}) \ No newline at end of file +({cpu: 180428372 +| mem: 855570}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/bd460b7549b70c52e37b312a4242041eac18fe4a266f018bcea0c78a9085a271.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/bd460b7549b70c52e37b312a4242041eac18fe4a266f018bcea0c78a9085a271.budget.golden index ba2e8ad982b..a04cc22fd72 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/bd460b7549b70c52e37b312a4242041eac18fe4a266f018bcea0c78a9085a271.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/bd460b7549b70c52e37b312a4242041eac18fe4a266f018bcea0c78a9085a271.budget.golden @@ -1,2 +1,2 @@ -({cpu: 215368400 -| mem: 1065958}) \ No newline at end of file +({cpu: 209320400 +| mem: 1028158}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/bd79f4a84db23b7c4cd219d498bd581e085cbc3437957e74a8862281a700700b.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/bd79f4a84db23b7c4cd219d498bd581e085cbc3437957e74a8862281a700700b.budget.golden index 57ac57ee6f7..fed01207894 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/bd79f4a84db23b7c4cd219d498bd581e085cbc3437957e74a8862281a700700b.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/bd79f4a84db23b7c4cd219d498bd581e085cbc3437957e74a8862281a700700b.budget.golden @@ -1,2 +1,2 @@ -({cpu: 216190138 -| mem: 1059440}) \ No newline at end of file +({cpu: 210334138 +| mem: 1022840}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/c11490431db3a92efdda70933ba411a0423935e73a75c856e326dbcf6672f3bf.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/c11490431db3a92efdda70933ba411a0423935e73a75c856e326dbcf6672f3bf.budget.golden index 3acad6678ec..fc8bb6e990e 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/c11490431db3a92efdda70933ba411a0423935e73a75c856e326dbcf6672f3bf.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/c11490431db3a92efdda70933ba411a0423935e73a75c856e326dbcf6672f3bf.budget.golden @@ -1,2 +1,2 @@ -({cpu: 185596754 -| mem: 887072}) \ No newline at end of file +({cpu: 180892754 +| mem: 857672}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/c4d4c88c5fe378a25a034025994a0d0b1642f10c8e6e513f872327fa895bfc7e.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/c4d4c88c5fe378a25a034025994a0d0b1642f10c8e6e513f872327fa895bfc7e.budget.golden index 76d7e94137b..740f66c7151 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/c4d4c88c5fe378a25a034025994a0d0b1642f10c8e6e513f872327fa895bfc7e.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/c4d4c88c5fe378a25a034025994a0d0b1642f10c8e6e513f872327fa895bfc7e.budget.golden @@ -1,2 +1,2 @@ -({cpu: 199503300 -| mem: 979734}) \ No newline at end of file +({cpu: 194031300 +| mem: 945534}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/c78eeba7681d2ab51b4758efa4c812cc041928837c6e7563d8283cce67ce2e02.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/c78eeba7681d2ab51b4758efa4c812cc041928837c6e7563d8283cce67ce2e02.budget.golden index 81c9f57db12..9399a385d63 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/c78eeba7681d2ab51b4758efa4c812cc041928837c6e7563d8283cce67ce2e02.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/c78eeba7681d2ab51b4758efa4c812cc041928837c6e7563d8283cce67ce2e02.budget.golden @@ -1,2 +1,2 @@ -({cpu: 199101328 -| mem: 966968}) \ No newline at end of file +({cpu: 193437328 +| mem: 931568}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/c99ecc2146ce2066ba6dffc734923264f8794815acbc2ec74c2c2c42ba272e4d.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/c99ecc2146ce2066ba6dffc734923264f8794815acbc2ec74c2c2c42ba272e4d.budget.golden index a9aaec3a9e6..682aa7104aa 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/c99ecc2146ce2066ba6dffc734923264f8794815acbc2ec74c2c2c42ba272e4d.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/c99ecc2146ce2066ba6dffc734923264f8794815acbc2ec74c2c2c42ba272e4d.budget.golden @@ -1,2 +1,2 @@ -({cpu: 232715810 -| mem: 1158734}) \ No newline at end of file +({cpu: 225803810 +| mem: 1115534}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/caa409c40e39aed9b0f59214b4baa178c375526dea6026b4552b88d2cc729716.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/caa409c40e39aed9b0f59214b4baa178c375526dea6026b4552b88d2cc729716.budget.golden index f10ea4cce59..3c5645c3bc2 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/caa409c40e39aed9b0f59214b4baa178c375526dea6026b4552b88d2cc729716.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/caa409c40e39aed9b0f59214b4baa178c375526dea6026b4552b88d2cc729716.budget.golden @@ -1,2 +1,2 @@ -({cpu: 174959050 -| mem: 822766}) \ No newline at end of file +({cpu: 170447050 +| mem: 794566}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/cb2ab8e22d1f64e8d204dece092e90e9bf1fa8b2a6e9cba5012dbe4978065832.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/cb2ab8e22d1f64e8d204dece092e90e9bf1fa8b2a6e9cba5012dbe4978065832.budget.golden index 3acad6678ec..fc8bb6e990e 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/cb2ab8e22d1f64e8d204dece092e90e9bf1fa8b2a6e9cba5012dbe4978065832.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/cb2ab8e22d1f64e8d204dece092e90e9bf1fa8b2a6e9cba5012dbe4978065832.budget.golden @@ -1,2 +1,2 @@ -({cpu: 185596754 -| mem: 887072}) \ No newline at end of file +({cpu: 180892754 +| mem: 857672}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/cc1e82927f6c65b3e912200ae30588793d2066e1d4a6627c21955944ac9bd528.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/cc1e82927f6c65b3e912200ae30588793d2066e1d4a6627c21955944ac9bd528.budget.golden index 658af2d9dbe..e753967744e 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/cc1e82927f6c65b3e912200ae30588793d2066e1d4a6627c21955944ac9bd528.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/cc1e82927f6c65b3e912200ae30588793d2066e1d4a6627c21955944ac9bd528.budget.golden @@ -1,2 +1,2 @@ -({cpu: 211747566 -| mem: 1022792}) \ No newline at end of file +({cpu: 205891566 +| mem: 986192}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/d5cda74eb0947e025e02fb8ed365df39d0a43e4b42cd3573ac2d8fcb29115997.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/d5cda74eb0947e025e02fb8ed365df39d0a43e4b42cd3573ac2d8fcb29115997.budget.golden index 3fcc2f2c4f3..8e4c4f2fbe8 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/d5cda74eb0947e025e02fb8ed365df39d0a43e4b42cd3573ac2d8fcb29115997.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/d5cda74eb0947e025e02fb8ed365df39d0a43e4b42cd3573ac2d8fcb29115997.budget.golden @@ -1,2 +1,2 @@ -({cpu: 206016816 -| mem: 997236}) \ No newline at end of file +({cpu: 200352816 +| mem: 961836}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/d6bc8ac4155e22300085784148bbc9d9bbfea896e1009dd396610a90e3943032.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/d6bc8ac4155e22300085784148bbc9d9bbfea896e1009dd396610a90e3943032.budget.golden index ba2e8ad982b..a04cc22fd72 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/d6bc8ac4155e22300085784148bbc9d9bbfea896e1009dd396610a90e3943032.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/d6bc8ac4155e22300085784148bbc9d9bbfea896e1009dd396610a90e3943032.budget.golden @@ -1,2 +1,2 @@ -({cpu: 215368400 -| mem: 1065958}) \ No newline at end of file +({cpu: 209320400 +| mem: 1028158}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/da353bf9219801fa1bf703fc161497570954e9af7e10ffe95c911a9ef97e77bd.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/da353bf9219801fa1bf703fc161497570954e9af7e10ffe95c911a9ef97e77bd.budget.golden index 1e1ab0fc75a..260651fd876 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/da353bf9219801fa1bf703fc161497570954e9af7e10ffe95c911a9ef97e77bd.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/da353bf9219801fa1bf703fc161497570954e9af7e10ffe95c911a9ef97e77bd.budget.golden @@ -1,2 +1,2 @@ -({cpu: 192392704 -| mem: 933182}) \ No newline at end of file +({cpu: 186728704 +| mem: 897782}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/dc45c5f1b700b1334db99f50823321daaef0e6925b9b2fabbc9df7cde65af62e.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/dc45c5f1b700b1334db99f50823321daaef0e6925b9b2fabbc9df7cde65af62e.budget.golden index c3b45d905e3..193280df507 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/dc45c5f1b700b1334db99f50823321daaef0e6925b9b2fabbc9df7cde65af62e.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/dc45c5f1b700b1334db99f50823321daaef0e6925b9b2fabbc9df7cde65af62e.budget.golden @@ -1,2 +1,2 @@ -({cpu: 193110626 -| mem: 926122}) \ No newline at end of file +({cpu: 188118626 +| mem: 894922}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/df487b2fd5c1583fa33644423849bc1ab5f02f37edc0c235f34ef01cb12604f6.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/df487b2fd5c1583fa33644423849bc1ab5f02f37edc0c235f34ef01cb12604f6.budget.golden index c65caa0a315..6765a874683 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/df487b2fd5c1583fa33644423849bc1ab5f02f37edc0c235f34ef01cb12604f6.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/df487b2fd5c1583fa33644423849bc1ab5f02f37edc0c235f34ef01cb12604f6.budget.golden @@ -1,2 +1,2 @@ -({cpu: 193575008 -| mem: 928224}) \ No newline at end of file +({cpu: 188583008 +| mem: 897024}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/eabeeae18131af89fa57936c0e9eb8d2c7adba534f7e1a517d75410028fa0d6c.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/eabeeae18131af89fa57936c0e9eb8d2c7adba534f7e1a517d75410028fa0d6c.budget.golden index 0eb440e7f33..6429c044ef6 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/eabeeae18131af89fa57936c0e9eb8d2c7adba534f7e1a517d75410028fa0d6c.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/eabeeae18131af89fa57936c0e9eb8d2c7adba534f7e1a517d75410028fa0d6c.budget.golden @@ -1,2 +1,2 @@ -({cpu: 185132372 -| mem: 884970}) \ No newline at end of file +({cpu: 180428372 +| mem: 855570}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/ec4712ee820eb959a43ebedfab6735f2325fa52994747526ffd2a4f4f84dd58e.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/ec4712ee820eb959a43ebedfab6735f2325fa52994747526ffd2a4f4f84dd58e.budget.golden index fe801200cce..2101d647a84 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/ec4712ee820eb959a43ebedfab6735f2325fa52994747526ffd2a4f4f84dd58e.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/ec4712ee820eb959a43ebedfab6735f2325fa52994747526ffd2a4f4f84dd58e.budget.golden @@ -1,2 +1,2 @@ -({cpu: 214209059 -| mem: 1039330}) \ No newline at end of file +({cpu: 208401059 +| mem: 1003030}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/ee3962fbd7373360f46decef3c9bda536a0b1daf6cda3b8a4bcfd6deeb5b4c53.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/ee3962fbd7373360f46decef3c9bda536a0b1daf6cda3b8a4bcfd6deeb5b4c53.budget.golden index 57ac57ee6f7..fed01207894 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/ee3962fbd7373360f46decef3c9bda536a0b1daf6cda3b8a4bcfd6deeb5b4c53.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/ee3962fbd7373360f46decef3c9bda536a0b1daf6cda3b8a4bcfd6deeb5b4c53.budget.golden @@ -1,2 +1,2 @@ -({cpu: 216190138 -| mem: 1059440}) \ No newline at end of file +({cpu: 210334138 +| mem: 1022840}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/f1a1e6a487f91feca5606f72bbb1e948c71abf043c6a0ea83bfea9ec6a0f08d8.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/f1a1e6a487f91feca5606f72bbb1e948c71abf043c6a0ea83bfea9ec6a0f08d8.budget.golden index 8b142c45798..0595e2b7136 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/f1a1e6a487f91feca5606f72bbb1e948c71abf043c6a0ea83bfea9ec6a0f08d8.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/f1a1e6a487f91feca5606f72bbb1e948c71abf043c6a0ea83bfea9ec6a0f08d8.budget.golden @@ -1,2 +1,2 @@ -({cpu: 183970673 -| mem: 878368}) \ No newline at end of file +({cpu: 179314673 +| mem: 849268}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/f2932e4ca4bbb94b0a9ffbe95fcb7bd5639d9751d75d56d5e14efa5bbed981df.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/f2932e4ca4bbb94b0a9ffbe95fcb7bd5639d9751d75d56d5e14efa5bbed981df.budget.golden index b84a76e9570..523ab961468 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/f2932e4ca4bbb94b0a9ffbe95fcb7bd5639d9751d75d56d5e14efa5bbed981df.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/f2932e4ca4bbb94b0a9ffbe95fcb7bd5639d9751d75d56d5e14efa5bbed981df.budget.golden @@ -1,2 +1,2 @@ -({cpu: 181828684 -| mem: 871944}) \ No newline at end of file +({cpu: 177124684 +| mem: 842544}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/f53e8cafe26647ccce51e4c31db13608aea1f39034c0f52dee2e5634ef66e747.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/f53e8cafe26647ccce51e4c31db13608aea1f39034c0f52dee2e5634ef66e747.budget.golden index b2575c7c0fe..9f006b80312 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/f53e8cafe26647ccce51e4c31db13608aea1f39034c0f52dee2e5634ef66e747.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/f53e8cafe26647ccce51e4c31db13608aea1f39034c0f52dee2e5634ef66e747.budget.golden @@ -1,2 +1,2 @@ -({cpu: 202405016 -| mem: 979994}) \ No newline at end of file +({cpu: 196741016 +| mem: 944594}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/f7275afb60e33a550df13a132102e7e925dd28965a4efbe510a89b077ff9417f.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/f7275afb60e33a550df13a132102e7e925dd28965a4efbe510a89b077ff9417f.budget.golden index 0eb440e7f33..6429c044ef6 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/f7275afb60e33a550df13a132102e7e925dd28965a4efbe510a89b077ff9417f.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/f7275afb60e33a550df13a132102e7e925dd28965a4efbe510a89b077ff9417f.budget.golden @@ -1,2 +1,2 @@ -({cpu: 185132372 -| mem: 884970}) \ No newline at end of file +({cpu: 180428372 +| mem: 855570}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/fc8c5f45ffcdb024c21e0f34b22c23de8045a94d5e1a5bda1555c45ddb059f82.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/fc8c5f45ffcdb024c21e0f34b22c23de8045a94d5e1a5bda1555c45ddb059f82.budget.golden index 6496923adfb..a9ea552ed83 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/fc8c5f45ffcdb024c21e0f34b22c23de8045a94d5e1a5bda1555c45ddb059f82.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/fc8c5f45ffcdb024c21e0f34b22c23de8045a94d5e1a5bda1555c45ddb059f82.budget.golden @@ -1,2 +1,2 @@ -({cpu: 194050135 -| mem: 932022}) \ No newline at end of file +({cpu: 189010135 +| mem: 900522}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/ff38b1ec89952d0247630f107a90cbbeb92ecbfcd19b284f60255718e4ec7548.budget.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/ff38b1ec89952d0247630f107a90cbbeb92ecbfcd19b284f60255718e4ec7548.budget.golden index 89ca1f0640f..091da19446d 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/ff38b1ec89952d0247630f107a90cbbeb92ecbfcd19b284f60255718e4ec7548.budget.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/ff38b1ec89952d0247630f107a90cbbeb92ecbfcd19b284f60255718e4ec7548.budget.golden @@ -1,2 +1,2 @@ -({cpu: 225120656 -| mem: 1104598}) \ No newline at end of file +({cpu: 218592656 +| mem: 1063798}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/role-payout/9.6/role-payout.size.golden b/plutus-benchmark/marlowe/test/role-payout/9.6/role-payout.size.golden index bf3b63f2e21..d19cda53341 100644 --- a/plutus-benchmark/marlowe/test/role-payout/9.6/role-payout.size.golden +++ b/plutus-benchmark/marlowe/test/role-payout/9.6/role-payout.size.golden @@ -1 +1 @@ -3069 \ No newline at end of file +3062 \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0000020002010200020101020201000100010001020101020201010000020102.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0000020002010200020101020201000100010001020101020201010000020102.budget.golden index 3e9da0441c2..3e885e0c076 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/0000020002010200020101020201000100010001020101020201010000020102.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/0000020002010200020101020201000100010001020101020201010000020102.budget.golden @@ -1,2 +1,2 @@ -({cpu: 296480915 -| mem: 1475965}) \ No newline at end of file +({cpu: 287840915 +| mem: 1421965}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0001000101000000010101000001000001010101010100000001000001010000.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0001000101000000010101000001000001010101010100000001000001010000.budget.golden index 3717160eb9e..a3b86d29b36 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/0001000101000000010101000001000001010101010100000001000001010000.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/0001000101000000010101000001000001010101010100000001000001010000.budget.golden @@ -1,2 +1,2 @@ -({cpu: 416680478 -| mem: 1808528}) \ No newline at end of file +({cpu: 404968478 +| mem: 1735328}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0003040402030103010203030303000200000104030002040304020400000102.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0003040402030103010203030303000200000104030002040304020400000102.budget.golden index 739cb39a7ab..3c88904ca16 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/0003040402030103010203030303000200000104030002040304020400000102.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/0003040402030103010203030303000200000104030002040304020400000102.budget.golden @@ -1,2 +1,2 @@ -({cpu: 992009702 -| mem: 5142818}) \ No newline at end of file +({cpu: 964217702 +| mem: 4969118}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/004025fd712d6c325ffa12c16d157064192992faf62e0b991d7310a2f91666b8.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/004025fd712d6c325ffa12c16d157064192992faf62e0b991d7310a2f91666b8.budget.golden index bce583a3fd6..64329c13094 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/004025fd712d6c325ffa12c16d157064192992faf62e0b991d7310a2f91666b8.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/004025fd712d6c325ffa12c16d157064192992faf62e0b991d7310a2f91666b8.budget.golden @@ -1,2 +1,2 @@ -({cpu: 755538042 -| mem: 3552893}) \ No newline at end of file +({cpu: 737346042 +| mem: 3439193}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0101010001010101010101000100010100000001010000010001000001000101.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0101010001010101010101000100010100000001010000010001000001000101.budget.golden index c0748244fbf..24c9fa3a1e3 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/0101010001010101010101000100010100000001010000010001000001000101.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/0101010001010101010101000100010100000001010000010001000001000101.budget.golden @@ -1,2 +1,2 @@ -({cpu: 855609402 -| mem: 2547332}) \ No newline at end of file +({cpu: 842649402 +| mem: 2466332}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0101020201010201010200010102000201000201010102000102010201010000.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0101020201010201010200010102000201000201010102000102010201010000.budget.golden index a043a4a6578..e58e4ed4ee4 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/0101020201010201010200010102000201000201010102000102010201010000.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/0101020201010201010200010102000201000201010102000102010201010000.budget.golden @@ -1,2 +1,2 @@ -({cpu: 276827370 -| mem: 1385523}) \ No newline at end of file +({cpu: 268427370 +| mem: 1333023}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0101080808040600020306010000000302050807010208060100070207080202.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0101080808040600020306010000000302050807010208060100070207080202.budget.golden index 70d3845cc60..8e709b5c06f 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/0101080808040600020306010000000302050807010208060100070207080202.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/0101080808040600020306010000000302050807010208060100070207080202.budget.golden @@ -1,2 +1,2 @@ -({cpu: 744705759 -| mem: 3635170}) \ No newline at end of file +({cpu: 723009759 +| mem: 3499570}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0104010200020000040103020102020004040300030304040400010301040303.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0104010200020000040103020102020004040300030304040400010301040303.budget.golden index 7e778dd29c0..2341271c20e 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/0104010200020000040103020102020004040300030304040400010301040303.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/0104010200020000040103020102020004040300030304040400010301040303.budget.golden @@ -1,2 +1,2 @@ -({cpu: 730421036 -| mem: 3661329}) \ No newline at end of file +({cpu: 711461036 +| mem: 3542829}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/04000f0b04051006000e060f09080d0b090d0104050a0b0f0506070f0a070008.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/04000f0b04051006000e060f09080d0b090d0104050a0b0f0506070f0a070008.budget.golden index 9008570cdd2..862c9f42dcf 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/04000f0b04051006000e060f09080d0b090d0104050a0b0f0506070f0a070008.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/04000f0b04051006000e060f09080d0b090d0104050a0b0f0506070f0a070008.budget.golden @@ -1,2 +1,2 @@ -({cpu: 697293323 -| mem: 3345463}) \ No newline at end of file +({cpu: 678621323 +| mem: 3228763}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63.budget.golden index 78fe68a9033..4cee1e6d938 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1036569658 -| mem: 4815093}) \ No newline at end of file +({cpu: 1010409658 +| mem: 4651593}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0705030002040601010206030604080208020207000101060706050502040301.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0705030002040601010206030604080208020207000101060706050502040301.budget.golden index 13eb5e538e2..60b419c04a7 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/0705030002040601010206030604080208020207000101060706050502040301.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/0705030002040601010206030604080208020207000101060706050502040301.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1011269329 -| mem: 4433346}) \ No newline at end of file +({cpu: 986597329 +| mem: 4279146}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607.budget.golden index 69334724ba9..78621c90e3f 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607.budget.golden @@ -1,2 +1,2 @@ -({cpu: 979623047 -| mem: 4889359}) \ No newline at end of file +({cpu: 953991047 +| mem: 4729159}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4.budget.golden index 78893da55fc..cad4a0e695a 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1089261394 -| mem: 5395461}) \ No newline at end of file +({cpu: 1060653394 +| mem: 5216661}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8.budget.golden index 72badefe7d0..faece28408a 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1324502269 -| mem: 6452210}) \ No newline at end of file +({cpu: 1289654269 +| mem: 6234410}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/0f1d0110001b121d051e15140c0c05141d151c1f1d201c040f10091b020a0e1a.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/0f1d0110001b121d051e15140c0c05141d151c1f1d201c040f10091b020a0e1a.budget.golden index 047a23b1b2a..7cdd7d62447 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/0f1d0110001b121d051e15140c0c05141d151c1f1d201c040f10091b020a0e1a.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/0f1d0110001b121d051e15140c0c05141d151c1f1d201c040f10091b020a0e1a.budget.golden @@ -1,2 +1,2 @@ -({cpu: 445661686 -| mem: 2248383}) \ No newline at end of file +({cpu: 432509686 +| mem: 2166183}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/119fbea4164e2bf21d2b53aa6c2c4e79414fe55e4096f5ce2e804735a7fbaf91.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/119fbea4164e2bf21d2b53aa6c2c4e79414fe55e4096f5ce2e804735a7fbaf91.budget.golden index cc19f95389c..28cb24c45c9 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/119fbea4164e2bf21d2b53aa6c2c4e79414fe55e4096f5ce2e804735a7fbaf91.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/119fbea4164e2bf21d2b53aa6c2c4e79414fe55e4096f5ce2e804735a7fbaf91.budget.golden @@ -1,2 +1,2 @@ -({cpu: 706030441 -| mem: 3475611}) \ No newline at end of file +({cpu: 687982441 +| mem: 3362811}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/12910f24d994d451ff379b12c9d1ecdb9239c9b87e5d7bea570087ec506935d5.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/12910f24d994d451ff379b12c9d1ecdb9239c9b87e5d7bea570087ec506935d5.budget.golden index 21df5b8bbea..0953ad61ed3 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/12910f24d994d451ff379b12c9d1ecdb9239c9b87e5d7bea570087ec506935d5.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/12910f24d994d451ff379b12c9d1ecdb9239c9b87e5d7bea570087ec506935d5.budget.golden @@ -1,2 +1,2 @@ -({cpu: 465452894 -| mem: 2340575}) \ No newline at end of file +({cpu: 452060894 +| mem: 2256875}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad.budget.golden index a1354af2837..7c28fb34f88 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad.budget.golden @@ -1,2 +1,2 @@ -({cpu: 706062636 -| mem: 3519083}) \ No newline at end of file +({cpu: 687582636 +| mem: 3403583}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/1a2f2540121f09321216090b2b1f211e3f020c2c133a1a3c3f3c232a26153a04.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/1a2f2540121f09321216090b2b1f211e3f020c2c133a1a3c3f3c232a26153a04.budget.golden index 1e611402712..20a32716b95 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/1a2f2540121f09321216090b2b1f211e3f020c2c133a1a3c3f3c232a26153a04.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/1a2f2540121f09321216090b2b1f211e3f020c2c133a1a3c3f3c232a26153a04.budget.golden @@ -1,2 +1,2 @@ -({cpu: 279273310 -| mem: 1391825}) \ No newline at end of file +({cpu: 270825310 +| mem: 1339025}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/1a573aed5c46d637919ccb5548dfc22a55c9fc38298d567d15ee9f2eea69d89e.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/1a573aed5c46d637919ccb5548dfc22a55c9fc38298d567d15ee9f2eea69d89e.budget.golden index 90087aa6ed5..53fb0237316 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/1a573aed5c46d637919ccb5548dfc22a55c9fc38298d567d15ee9f2eea69d89e.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/1a573aed5c46d637919ccb5548dfc22a55c9fc38298d567d15ee9f2eea69d89e.budget.golden @@ -1,2 +1,2 @@ -({cpu: 875298084 -| mem: 4227252}) \ No newline at end of file +({cpu: 850962084 +| mem: 4075152}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/1d56060c3b271226064c672a282663643b1b0823471c67737f0b076870331260.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/1d56060c3b271226064c672a282663643b1b0823471c67737f0b076870331260.budget.golden index 279e0dc4e2b..a1aa5cc0607 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/1d56060c3b271226064c672a282663643b1b0823471c67737f0b076870331260.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/1d56060c3b271226064c672a282663643b1b0823471c67737f0b076870331260.budget.golden @@ -1,2 +1,2 @@ -({cpu: 728212042 -| mem: 3343409}) \ No newline at end of file +({cpu: 709684042 +| mem: 3227609}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/1d6e3c137149a440f35e0efc685b16bfb8052ebcf66ec4ad77e51c11501381c7.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/1d6e3c137149a440f35e0efc685b16bfb8052ebcf66ec4ad77e51c11501381c7.budget.golden index a50c83cbab2..b891442eaef 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/1d6e3c137149a440f35e0efc685b16bfb8052ebcf66ec4ad77e51c11501381c7.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/1d6e3c137149a440f35e0efc685b16bfb8052ebcf66ec4ad77e51c11501381c7.budget.golden @@ -1,2 +1,2 @@ -({cpu: 279327868 -| mem: 1391825}) \ No newline at end of file +({cpu: 270879868 +| mem: 1339025}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/1f0f02191604101e1f201016171604060d010d1d1c150e110a110e1006160a0d.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/1f0f02191604101e1f201016171604060d010d1d1c150e110a110e1006160a0d.budget.golden index 24ad691e697..dbe0f9c3442 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/1f0f02191604101e1f201016171604060d010d1d1c150e110a110e1006160a0d.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/1f0f02191604101e1f201016171604060d010d1d1c150e110a110e1006160a0d.budget.golden @@ -1,2 +1,2 @@ -({cpu: 964932104 -| mem: 1330754}) \ No newline at end of file +({cpu: 956244104 +| mem: 1276454}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/202d273721330b31193405101e0637202e2a0f1140211c3e3f171e26312b0220.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/202d273721330b31193405101e0637202e2a0f1140211c3e3f171e26312b0220.budget.golden index 1e8bdbfc667..4dd5050cf1e 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/202d273721330b31193405101e0637202e2a0f1140211c3e3f171e26312b0220.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/202d273721330b31193405101e0637202e2a0f1140211c3e3f171e26312b0220.budget.golden @@ -1,2 +1,2 @@ -({cpu: 3877242919 -| mem: 1750286}) \ No newline at end of file +({cpu: 3868218919 +| mem: 1693886}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/21953bf8798b28df60cb459db24843fb46782b19ba72dc4951941fb4c20d2263.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/21953bf8798b28df60cb459db24843fb46782b19ba72dc4951941fb4c20d2263.budget.golden index 7d752eb24d9..1962e69f89a 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/21953bf8798b28df60cb459db24843fb46782b19ba72dc4951941fb4c20d2263.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/21953bf8798b28df60cb459db24843fb46782b19ba72dc4951941fb4c20d2263.budget.golden @@ -1,2 +1,2 @@ -({cpu: 335540681 -| mem: 1656650}) \ No newline at end of file +({cpu: 325028681 +| mem: 1590950}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/238b21364ab5bdae3ddb514d7001c8feba128b4ddcf426852b441f9a9d02c882.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/238b21364ab5bdae3ddb514d7001c8feba128b4ddcf426852b441f9a9d02c882.budget.golden index a043a4a6578..e58e4ed4ee4 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/238b21364ab5bdae3ddb514d7001c8feba128b4ddcf426852b441f9a9d02c882.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/238b21364ab5bdae3ddb514d7001c8feba128b4ddcf426852b441f9a9d02c882.budget.golden @@ -1,2 +1,2 @@ -({cpu: 276827370 -| mem: 1385523}) \ No newline at end of file +({cpu: 268427370 +| mem: 1333023}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/26e24ee631a6d927ea4fb4fac530cfd82ff7636986014de2d2aaa460ddde0bc3.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/26e24ee631a6d927ea4fb4fac530cfd82ff7636986014de2d2aaa460ddde0bc3.budget.golden index 38ba86c72b1..e3a24644bc2 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/26e24ee631a6d927ea4fb4fac530cfd82ff7636986014de2d2aaa460ddde0bc3.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/26e24ee631a6d927ea4fb4fac530cfd82ff7636986014de2d2aaa460ddde0bc3.budget.golden @@ -1,2 +1,2 @@ -({cpu: 516550002 -| mem: 2635502}) \ No newline at end of file +({cpu: 502006002 +| mem: 2544602}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/2797d7ac77c1b6aff8e42cf9a47fa86b1e60f22719a996871ad412cbe4de78b5.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/2797d7ac77c1b6aff8e42cf9a47fa86b1e60f22719a996871ad412cbe4de78b5.budget.golden index 9cc5abfd196..0e9d2200cd5 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/2797d7ac77c1b6aff8e42cf9a47fa86b1e60f22719a996871ad412cbe4de78b5.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/2797d7ac77c1b6aff8e42cf9a47fa86b1e60f22719a996871ad412cbe4de78b5.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1766738702 -| mem: 1754906}) \ No newline at end of file +({cpu: 1757234702 +| mem: 1695506}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/28fdce478e179db0e38fb5f3f4105e940ece450b9ce8a0f42a6e313b752e6f2c.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/28fdce478e179db0e38fb5f3f4105e940ece450b9ce8a0f42a6e313b752e6f2c.budget.golden index ae585d1ca7b..4571a95ed8d 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/28fdce478e179db0e38fb5f3f4105e940ece450b9ce8a0f42a6e313b752e6f2c.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/28fdce478e179db0e38fb5f3f4105e940ece450b9ce8a0f42a6e313b752e6f2c.budget.golden @@ -1,2 +1,2 @@ -({cpu: 868071320 -| mem: 3330552}) \ No newline at end of file +({cpu: 850167320 +| mem: 3218652}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/2cb21612178a2d9336b59d06cbf80488577463d209a453048a66c6eee624a695.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/2cb21612178a2d9336b59d06cbf80488577463d209a453048a66c6eee624a695.budget.golden index d9ca84816a4..0a0b0bd57f1 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/2cb21612178a2d9336b59d06cbf80488577463d209a453048a66c6eee624a695.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/2cb21612178a2d9336b59d06cbf80488577463d209a453048a66c6eee624a695.budget.golden @@ -1,2 +1,2 @@ -({cpu: 739717728 -| mem: 3714295}) \ No newline at end of file +({cpu: 720517728 +| mem: 3594295}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/2f58c9d884813042bce9cf7c66048767dff166785e8b5183c8139db2aa7312d1.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/2f58c9d884813042bce9cf7c66048767dff166785e8b5183c8139db2aa7312d1.budget.golden index 2c1f8c60bd1..d8cb617349d 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/2f58c9d884813042bce9cf7c66048767dff166785e8b5183c8139db2aa7312d1.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/2f58c9d884813042bce9cf7c66048767dff166785e8b5183c8139db2aa7312d1.budget.golden @@ -1,2 +1,2 @@ -({cpu: 729269245 -| mem: 3416764}) \ No newline at end of file +({cpu: 709349245 +| mem: 3292264}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a.budget.golden index 852bade23ff..bdaf855841f 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1103689807 -| mem: 5617376}) \ No newline at end of file +({cpu: 1074313807 +| mem: 5433776}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/322acde099bc34a929182d5b894214fc87ec88446e2d10625119a9d17fa3ec3d.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/322acde099bc34a929182d5b894214fc87ec88446e2d10625119a9d17fa3ec3d.budget.golden index 1e611402712..20a32716b95 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/322acde099bc34a929182d5b894214fc87ec88446e2d10625119a9d17fa3ec3d.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/322acde099bc34a929182d5b894214fc87ec88446e2d10625119a9d17fa3ec3d.budget.golden @@ -1,2 +1,2 @@ -({cpu: 279273310 -| mem: 1391825}) \ No newline at end of file +({cpu: 270825310 +| mem: 1339025}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/331e4a1bb30f28d7073c54f9a13c10ae19e2e396c299a0ce101ee6bf4b2020db.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/331e4a1bb30f28d7073c54f9a13c10ae19e2e396c299a0ce101ee6bf4b2020db.budget.golden index acd4fc5c4b8..f04e3fd3727 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/331e4a1bb30f28d7073c54f9a13c10ae19e2e396c299a0ce101ee6bf4b2020db.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/331e4a1bb30f28d7073c54f9a13c10ae19e2e396c299a0ce101ee6bf4b2020db.budget.golden @@ -1,2 +1,2 @@ -({cpu: 433456222 -| mem: 2188467}) \ No newline at end of file +({cpu: 420928222 +| mem: 2110167}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/33c3efd79d9234a78262b52bc6bbf8124cb321a467dedb278328215167eca455.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/33c3efd79d9234a78262b52bc6bbf8124cb321a467dedb278328215167eca455.budget.golden index a944ba9922e..7315bb6f0a7 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/33c3efd79d9234a78262b52bc6bbf8124cb321a467dedb278328215167eca455.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/33c3efd79d9234a78262b52bc6bbf8124cb321a467dedb278328215167eca455.budget.golden @@ -1,2 +1,2 @@ -({cpu: 588336620 -| mem: 2977388}) \ No newline at end of file +({cpu: 571248620 +| mem: 2870588}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/383683bfcecdab0f4df507f59631c702bd11a81ca3841f47f37633e8aacbb5de.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/383683bfcecdab0f4df507f59631c702bd11a81ca3841f47f37633e8aacbb5de.budget.golden index 9c24db4ad0e..6197e01af6c 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/383683bfcecdab0f4df507f59631c702bd11a81ca3841f47f37633e8aacbb5de.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/383683bfcecdab0f4df507f59631c702bd11a81ca3841f47f37633e8aacbb5de.budget.golden @@ -1,2 +1,2 @@ -({cpu: 710149597 -| mem: 3473136}) \ No newline at end of file +({cpu: 691093597 +| mem: 3354036}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/3bb75b2e53eb13f718eacd3263ab4535f9137fabffc9de499a0de7cabb335479.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/3bb75b2e53eb13f718eacd3263ab4535f9137fabffc9de499a0de7cabb335479.budget.golden index a043a4a6578..e58e4ed4ee4 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/3bb75b2e53eb13f718eacd3263ab4535f9137fabffc9de499a0de7cabb335479.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/3bb75b2e53eb13f718eacd3263ab4535f9137fabffc9de499a0de7cabb335479.budget.golden @@ -1,2 +1,2 @@ -({cpu: 276827370 -| mem: 1385523}) \ No newline at end of file +({cpu: 268427370 +| mem: 1333023}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/3db496e6cd39a8b888a89d0de07dace4397878958cab3b9d9353978b08c36d8a.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/3db496e6cd39a8b888a89d0de07dace4397878958cab3b9d9353978b08c36d8a.budget.golden index 93aa7aaf70c..889605b5b8f 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/3db496e6cd39a8b888a89d0de07dace4397878958cab3b9d9353978b08c36d8a.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/3db496e6cd39a8b888a89d0de07dace4397878958cab3b9d9353978b08c36d8a.budget.golden @@ -1,2 +1,2 @@ -({cpu: 774667900 -| mem: 3710944}) \ No newline at end of file +({cpu: 755275900 +| mem: 3589744}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/44a9e339fa25948b48637fe7e10dcfc6d1256319a7b5ce4202cb54dfef8e37e7.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/44a9e339fa25948b48637fe7e10dcfc6d1256319a7b5ce4202cb54dfef8e37e7.budget.golden index a043a4a6578..e58e4ed4ee4 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/44a9e339fa25948b48637fe7e10dcfc6d1256319a7b5ce4202cb54dfef8e37e7.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/44a9e339fa25948b48637fe7e10dcfc6d1256319a7b5ce4202cb54dfef8e37e7.budget.golden @@ -1,2 +1,2 @@ -({cpu: 276827370 -| mem: 1385523}) \ No newline at end of file +({cpu: 268427370 +| mem: 1333023}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c.budget.golden index 6f3203388e5..d9235aa0cf3 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c.budget.golden @@ -1,2 +1,2 @@ -({cpu: 988359900 -| mem: 4976993}) \ No newline at end of file +({cpu: 962295900 +| mem: 4814093}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/4d7adf91bfc93cebe95a7e054ec17cfbb912b32bd8aecb48a228b50e02b055c8.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/4d7adf91bfc93cebe95a7e054ec17cfbb912b32bd8aecb48a228b50e02b055c8.budget.golden index 99ae5abcfef..5796579e308 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/4d7adf91bfc93cebe95a7e054ec17cfbb912b32bd8aecb48a228b50e02b055c8.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/4d7adf91bfc93cebe95a7e054ec17cfbb912b32bd8aecb48a228b50e02b055c8.budget.golden @@ -1,2 +1,2 @@ -({cpu: 655167703 -| mem: 3292901}) \ No newline at end of file +({cpu: 637215703 +| mem: 3180701}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/4f9e8d361b85e62db2350dd3ae77463540e7af0d28e1eb68faeecc45f4655f57.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/4f9e8d361b85e62db2350dd3ae77463540e7af0d28e1eb68faeecc45f4655f57.budget.golden index f297f96757b..4a827e29e39 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/4f9e8d361b85e62db2350dd3ae77463540e7af0d28e1eb68faeecc45f4655f57.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/4f9e8d361b85e62db2350dd3ae77463540e7af0d28e1eb68faeecc45f4655f57.budget.golden @@ -1,2 +1,2 @@ -({cpu: 374325225 -| mem: 1688192}) \ No newline at end of file +({cpu: 363717225 +| mem: 1621892}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/52df7c8dfaa5f801cd837faa65f2fd333665fff00a555ce8c55e36ddc003007a.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/52df7c8dfaa5f801cd837faa65f2fd333665fff00a555ce8c55e36ddc003007a.budget.golden index 73f7c557e0b..c2f75f61921 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/52df7c8dfaa5f801cd837faa65f2fd333665fff00a555ce8c55e36ddc003007a.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/52df7c8dfaa5f801cd837faa65f2fd333665fff00a555ce8c55e36ddc003007a.budget.golden @@ -1,2 +1,2 @@ -({cpu: 338810631 -| mem: 1654987}) \ No newline at end of file +({cpu: 328730631 +| mem: 1591987}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/53ed4db7ab33d6f907eec91a861d1188269be5ae1892d07ee71161bfb55a7cb7.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/53ed4db7ab33d6f907eec91a861d1188269be5ae1892d07ee71161bfb55a7cb7.budget.golden index 2b091f867c3..805ff3d794e 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/53ed4db7ab33d6f907eec91a861d1188269be5ae1892d07ee71161bfb55a7cb7.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/53ed4db7ab33d6f907eec91a861d1188269be5ae1892d07ee71161bfb55a7cb7.budget.golden @@ -1,2 +1,2 @@ -({cpu: 346354133 -| mem: 1689453}) \ No newline at end of file +({cpu: 336226133 +| mem: 1626153}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/55dfe42688ad683b638df1fa7700219f00f53b335a85a2825502ab1e0687197e.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/55dfe42688ad683b638df1fa7700219f00f53b335a85a2825502ab1e0687197e.budget.golden index a043a4a6578..e58e4ed4ee4 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/55dfe42688ad683b638df1fa7700219f00f53b335a85a2825502ab1e0687197e.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/55dfe42688ad683b638df1fa7700219f00f53b335a85a2825502ab1e0687197e.budget.golden @@ -1,2 +1,2 @@ -({cpu: 276827370 -| mem: 1385523}) \ No newline at end of file +({cpu: 268427370 +| mem: 1333023}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/56333d4e413dbf1a665463bf68067f63c118f38f7539b7ba7167d577c0c8b8ce.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/56333d4e413dbf1a665463bf68067f63c118f38f7539b7ba7167d577c0c8b8ce.budget.golden index ec114ab77d4..05276c10fd8 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/56333d4e413dbf1a665463bf68067f63c118f38f7539b7ba7167d577c0c8b8ce.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/56333d4e413dbf1a665463bf68067f63c118f38f7539b7ba7167d577c0c8b8ce.budget.golden @@ -1,2 +1,2 @@ -({cpu: 741543997 -| mem: 3777860}) \ No newline at end of file +({cpu: 720039997 +| mem: 3643460}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/57728d8b19b0e06412786f3dfed9e1894cd0ad1d2bc2bd497ec0ecb68f989d2b.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/57728d8b19b0e06412786f3dfed9e1894cd0ad1d2bc2bd497ec0ecb68f989d2b.budget.golden index a043a4a6578..e58e4ed4ee4 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/57728d8b19b0e06412786f3dfed9e1894cd0ad1d2bc2bd497ec0ecb68f989d2b.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/57728d8b19b0e06412786f3dfed9e1894cd0ad1d2bc2bd497ec0ecb68f989d2b.budget.golden @@ -1,2 +1,2 @@ -({cpu: 276827370 -| mem: 1385523}) \ No newline at end of file +({cpu: 268427370 +| mem: 1333023}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/5abae75af26f45658beccbe48f7c88e74efdfc0b8409ba1e98f95fa5b6caf999.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/5abae75af26f45658beccbe48f7c88e74efdfc0b8409ba1e98f95fa5b6caf999.budget.golden index 9d866eb18b1..8837adba017 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/5abae75af26f45658beccbe48f7c88e74efdfc0b8409ba1e98f95fa5b6caf999.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/5abae75af26f45658beccbe48f7c88e74efdfc0b8409ba1e98f95fa5b6caf999.budget.golden @@ -1,2 +1,2 @@ -({cpu: 458928366 -| mem: 2313067}) \ No newline at end of file +({cpu: 445824366 +| mem: 2231167}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/5d0a88250f13c49c20e146819357a808911c878a0e0a7d6f7fe1d4a619e06112.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/5d0a88250f13c49c20e146819357a808911c878a0e0a7d6f7fe1d4a619e06112.budget.golden index cac02e626eb..db93fbe5835 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/5d0a88250f13c49c20e146819357a808911c878a0e0a7d6f7fe1d4a619e06112.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/5d0a88250f13c49c20e146819357a808911c878a0e0a7d6f7fe1d4a619e06112.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1006112544 -| mem: 4843767}) \ No newline at end of file +({cpu: 981200544 +| mem: 4688067}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/5e274e0f593511543d41570a4b03646c1d7539062b5728182e073e5760561a66.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/5e274e0f593511543d41570a4b03646c1d7539062b5728182e073e5760561a66.budget.golden index a36301dca58..38e69b204c0 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/5e274e0f593511543d41570a4b03646c1d7539062b5728182e073e5760561a66.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/5e274e0f593511543d41570a4b03646c1d7539062b5728182e073e5760561a66.budget.golden @@ -1,2 +1,2 @@ -({cpu: 969541440 -| mem: 4784949}) \ No newline at end of file +({cpu: 943717440 +| mem: 4623549}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/5e2c68ac9f62580d626636679679b97109109df7ac1a8ce86d3e43dfb5e4f6bc.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/5e2c68ac9f62580d626636679679b97109109df7ac1a8ce86d3e43dfb5e4f6bc.budget.golden index 80ca99ea0cd..bda3b0fa911 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/5e2c68ac9f62580d626636679679b97109109df7ac1a8ce86d3e43dfb5e4f6bc.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/5e2c68ac9f62580d626636679679b97109109df7ac1a8ce86d3e43dfb5e4f6bc.budget.golden @@ -1,2 +1,2 @@ -({cpu: 488335895 -| mem: 2422605}) \ No newline at end of file +({cpu: 474799895 +| mem: 2338005}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/5f130d19918807b60eab4c03119d67878fb6c6712c28c54f5a25792049294acc.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/5f130d19918807b60eab4c03119d67878fb6c6712c28c54f5a25792049294acc.budget.golden index 1e611402712..20a32716b95 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/5f130d19918807b60eab4c03119d67878fb6c6712c28c54f5a25792049294acc.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/5f130d19918807b60eab4c03119d67878fb6c6712c28c54f5a25792049294acc.budget.golden @@ -1,2 +1,2 @@ -({cpu: 279273310 -| mem: 1391825}) \ No newline at end of file +({cpu: 270825310 +| mem: 1339025}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/5f306b4b24ff2b39dab6cdc9ac6ca9bb442c1dc6f4e7e412eeb5a3ced42fb642.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/5f306b4b24ff2b39dab6cdc9ac6ca9bb442c1dc6f4e7e412eeb5a3ced42fb642.budget.golden index cc352c04146..fa297df37d3 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/5f306b4b24ff2b39dab6cdc9ac6ca9bb442c1dc6f4e7e412eeb5a3ced42fb642.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/5f306b4b24ff2b39dab6cdc9ac6ca9bb442c1dc6f4e7e412eeb5a3ced42fb642.budget.golden @@ -1,2 +1,2 @@ -({cpu: 708845591 -| mem: 3544116}) \ No newline at end of file +({cpu: 689693591 +| mem: 3424416}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/5f3d46c57a56cef6764f96c9de9677ac6e494dd7a4e368d1c8dd9c1f7a4309a5.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/5f3d46c57a56cef6764f96c9de9677ac6e494dd7a4e368d1c8dd9c1f7a4309a5.budget.golden index a538d3831c1..9f1246f706b 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/5f3d46c57a56cef6764f96c9de9677ac6e494dd7a4e368d1c8dd9c1f7a4309a5.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/5f3d46c57a56cef6764f96c9de9677ac6e494dd7a4e368d1c8dd9c1f7a4309a5.budget.golden @@ -1,2 +1,2 @@ -({cpu: 461165536 -| mem: 2323859}) \ No newline at end of file +({cpu: 447965536 +| mem: 2241359}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/64c3d5b43f005855ffc4d0950a02fd159aa1575294ea39061b81a194ebb9eaae.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/64c3d5b43f005855ffc4d0950a02fd159aa1575294ea39061b81a194ebb9eaae.budget.golden index a0db3f58f68..71fd499a820 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/64c3d5b43f005855ffc4d0950a02fd159aa1575294ea39061b81a194ebb9eaae.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/64c3d5b43f005855ffc4d0950a02fd159aa1575294ea39061b81a194ebb9eaae.budget.golden @@ -1,2 +1,2 @@ -({cpu: 627113030 -| mem: 3157846}) \ No newline at end of file +({cpu: 608873030 +| mem: 3043846}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/65bc4b69b46d18fdff0fadbf00dd5ec2b3e03805fac9d5fb4ff2d3066e53fc7e.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/65bc4b69b46d18fdff0fadbf00dd5ec2b3e03805fac9d5fb4ff2d3066e53fc7e.budget.golden index cd02ab77aed..2d4179149ca 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/65bc4b69b46d18fdff0fadbf00dd5ec2b3e03805fac9d5fb4ff2d3066e53fc7e.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/65bc4b69b46d18fdff0fadbf00dd5ec2b3e03805fac9d5fb4ff2d3066e53fc7e.budget.golden @@ -1,2 +1,2 @@ -({cpu: 2155468779 -| mem: 1926290}) \ No newline at end of file +({cpu: 2145340779 +| mem: 1862990}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/66af9e473d75e3f464971f6879cc0f2ef84bafcb38fbfa1dbc31ac2053628a38.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/66af9e473d75e3f464971f6879cc0f2ef84bafcb38fbfa1dbc31ac2053628a38.budget.golden index e69923aea8e..8cb37094f6e 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/66af9e473d75e3f464971f6879cc0f2ef84bafcb38fbfa1dbc31ac2053628a38.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/66af9e473d75e3f464971f6879cc0f2ef84bafcb38fbfa1dbc31ac2053628a38.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1232593473 -| mem: 5221630}) \ No newline at end of file +({cpu: 1203409473 +| mem: 5039230}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/675d63836cad11b547d1b4cddd498f04c919d4342612accf40913f9ae9419fac.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/675d63836cad11b547d1b4cddd498f04c919d4342612accf40913f9ae9419fac.budget.golden index 605a65b71b5..1849f096737 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/675d63836cad11b547d1b4cddd498f04c919d4342612accf40913f9ae9419fac.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/675d63836cad11b547d1b4cddd498f04c919d4342612accf40913f9ae9419fac.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1001353101 -| mem: 5007553}) \ No newline at end of file +({cpu: 975481101 +| mem: 4845853}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/67ba5a9a0245ee3aff4f34852b9889b8c810fccd3dce2a23910bddd35c503b71.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/67ba5a9a0245ee3aff4f34852b9889b8c810fccd3dce2a23910bddd35c503b71.budget.golden index 1e8bdbfc667..4dd5050cf1e 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/67ba5a9a0245ee3aff4f34852b9889b8c810fccd3dce2a23910bddd35c503b71.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/67ba5a9a0245ee3aff4f34852b9889b8c810fccd3dce2a23910bddd35c503b71.budget.golden @@ -1,2 +1,2 @@ -({cpu: 3877242919 -| mem: 1750286}) \ No newline at end of file +({cpu: 3868218919 +| mem: 1693886}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/6d88f7294dd2b5ce02c3dc609bc7715bd508009738401d264bf9b3eb7c6f49c1.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/6d88f7294dd2b5ce02c3dc609bc7715bd508009738401d264bf9b3eb7c6f49c1.budget.golden index 10ff3fb7383..7bb10cd3c1b 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/6d88f7294dd2b5ce02c3dc609bc7715bd508009738401d264bf9b3eb7c6f49c1.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/6d88f7294dd2b5ce02c3dc609bc7715bd508009738401d264bf9b3eb7c6f49c1.budget.golden @@ -1,2 +1,2 @@ -({cpu: 461319862 -| mem: 2319369}) \ No newline at end of file +({cpu: 448167862 +| mem: 2237169}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/70f65b21b77ddb451f3df9d9fb403ced3d10e1e953867cc4900cc25e5b9dec47.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/70f65b21b77ddb451f3df9d9fb403ced3d10e1e953867cc4900cc25e5b9dec47.budget.golden index afdf61126cc..77c81283f23 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/70f65b21b77ddb451f3df9d9fb403ced3d10e1e953867cc4900cc25e5b9dec47.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/70f65b21b77ddb451f3df9d9fb403ced3d10e1e953867cc4900cc25e5b9dec47.budget.golden @@ -1,2 +1,2 @@ -({cpu: 727886628 -| mem: 3529611}) \ No newline at end of file +({cpu: 709886628 +| mem: 3417111}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/71965c9ccae31f1ffc1d85aa20a356d4ed97a420954018d8301ec4f9783be0d7.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/71965c9ccae31f1ffc1d85aa20a356d4ed97a420954018d8301ec4f9783be0d7.budget.golden index d2a9782ac6f..13e52283659 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/71965c9ccae31f1ffc1d85aa20a356d4ed97a420954018d8301ec4f9783be0d7.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/71965c9ccae31f1ffc1d85aa20a356d4ed97a420954018d8301ec4f9783be0d7.budget.golden @@ -1,2 +1,2 @@ -({cpu: 448162184 -| mem: 2254685}) \ No newline at end of file +({cpu: 434962184 +| mem: 2172185}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/74c67f2f182b9a0a66c62b95d6fac5ace3f7e71ea3abfc52ffbe3ecb93436ea2.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/74c67f2f182b9a0a66c62b95d6fac5ace3f7e71ea3abfc52ffbe3ecb93436ea2.budget.golden index 7da69dc6020..57eb2a0e633 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/74c67f2f182b9a0a66c62b95d6fac5ace3f7e71ea3abfc52ffbe3ecb93436ea2.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/74c67f2f182b9a0a66c62b95d6fac5ace3f7e71ea3abfc52ffbe3ecb93436ea2.budget.golden @@ -1,2 +1,2 @@ -({cpu: 758424627 -| mem: 3786042}) \ No newline at end of file +({cpu: 737208627 +| mem: 3653442}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/7529b206a78becb793da74b78c04d9d33a2540a1abd79718e681228f4057403a.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/7529b206a78becb793da74b78c04d9d33a2540a1abd79718e681228f4057403a.budget.golden index d53813dd02a..1708e6d4eca 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/7529b206a78becb793da74b78c04d9d33a2540a1abd79718e681228f4057403a.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/7529b206a78becb793da74b78c04d9d33a2540a1abd79718e681228f4057403a.budget.golden @@ -1,2 +1,2 @@ -({cpu: 765022449 -| mem: 3910436}) \ No newline at end of file +({cpu: 743326449 +| mem: 3774836}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/75a8bb183688bce447e00f435a144c835435e40a5defc6f3b9be68b70b4a3db6.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/75a8bb183688bce447e00f435a144c835435e40a5defc6f3b9be68b70b4a3db6.budget.golden index 1f5b0f3aa34..d6086853707 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/75a8bb183688bce447e00f435a144c835435e40a5defc6f3b9be68b70b4a3db6.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/75a8bb183688bce447e00f435a144c835435e40a5defc6f3b9be68b70b4a3db6.budget.golden @@ -1,2 +1,2 @@ -({cpu: 653081451 -| mem: 3281225}) \ No newline at end of file +({cpu: 635273451 +| mem: 3169925}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/7a758e17486d1a30462c32a5d5309bd1e98322a9dcbe277c143ed3aede9d265f.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/7a758e17486d1a30462c32a5d5309bd1e98322a9dcbe277c143ed3aede9d265f.budget.golden index 0f21813b7cd..e7c3264ff70 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/7a758e17486d1a30462c32a5d5309bd1e98322a9dcbe277c143ed3aede9d265f.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/7a758e17486d1a30462c32a5d5309bd1e98322a9dcbe277c143ed3aede9d265f.budget.golden @@ -1,2 +1,2 @@ -({cpu: 464259998 -| mem: 2226106}) \ No newline at end of file +({cpu: 453123998 +| mem: 2156506}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/7cbc5644b745f4ea635aca42cce5e4a4b9d2e61afdb3ac18128e1688c07071ba.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/7cbc5644b745f4ea635aca42cce5e4a4b9d2e61afdb3ac18128e1688c07071ba.budget.golden index 85b7546fc44..ba24b871154 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/7cbc5644b745f4ea635aca42cce5e4a4b9d2e61afdb3ac18128e1688c07071ba.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/7cbc5644b745f4ea635aca42cce5e4a4b9d2e61afdb3ac18128e1688c07071ba.budget.golden @@ -1,2 +1,2 @@ -({cpu: 453490103 -| mem: 2195846}) \ No newline at end of file +({cpu: 439954103 +| mem: 2111246}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/82213dfdb6a812b40446438767c61a388d2c0cfd0cbf7fd4a372b0dc59fa17e1.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/82213dfdb6a812b40446438767c61a388d2c0cfd0cbf7fd4a372b0dc59fa17e1.budget.golden index 9e28a0b23b9..dd571f60dd4 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/82213dfdb6a812b40446438767c61a388d2c0cfd0cbf7fd4a372b0dc59fa17e1.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/82213dfdb6a812b40446438767c61a388d2c0cfd0cbf7fd4a372b0dc59fa17e1.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1232992944 -| mem: 5157792}) \ No newline at end of file +({cpu: 1207360944 +| mem: 4997592}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/8c7fdc3da6822b5112074380003524f50fb3a1ce6db4e501df1086773c6c0201.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/8c7fdc3da6822b5112074380003524f50fb3a1ce6db4e501df1086773c6c0201.budget.golden index 5502cfef844..a24e837ad08 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/8c7fdc3da6822b5112074380003524f50fb3a1ce6db4e501df1086773c6c0201.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/8c7fdc3da6822b5112074380003524f50fb3a1ce6db4e501df1086773c6c0201.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1098556029 -| mem: 5486796}) \ No newline at end of file +({cpu: 1068844029 +| mem: 5301096}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/8d9ae67656a2911ab15a8e5301c960c69aa2517055197aff6b60a87ff718d66c.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/8d9ae67656a2911ab15a8e5301c960c69aa2517055197aff6b60a87ff718d66c.budget.golden index 7d752eb24d9..1962e69f89a 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/8d9ae67656a2911ab15a8e5301c960c69aa2517055197aff6b60a87ff718d66c.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/8d9ae67656a2911ab15a8e5301c960c69aa2517055197aff6b60a87ff718d66c.budget.golden @@ -1,2 +1,2 @@ -({cpu: 335540681 -| mem: 1656650}) \ No newline at end of file +({cpu: 325028681 +| mem: 1590950}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/96e1a2fa3ceb9a402f2a5841a0b645f87b4e8e75beb636692478ec39f74ee221.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/96e1a2fa3ceb9a402f2a5841a0b645f87b4e8e75beb636692478ec39f74ee221.budget.golden index 1e611402712..20a32716b95 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/96e1a2fa3ceb9a402f2a5841a0b645f87b4e8e75beb636692478ec39f74ee221.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/96e1a2fa3ceb9a402f2a5841a0b645f87b4e8e75beb636692478ec39f74ee221.budget.golden @@ -1,2 +1,2 @@ -({cpu: 279273310 -| mem: 1391825}) \ No newline at end of file +({cpu: 270825310 +| mem: 1339025}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/9fabc4fc3440cdb776b28c9bb1dd49c9a5b1605fe1490aa3f4f64a3fa8881b25.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/9fabc4fc3440cdb776b28c9bb1dd49c9a5b1605fe1490aa3f4f64a3fa8881b25.budget.golden index 9ea9ab77574..19e16cf37a5 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/9fabc4fc3440cdb776b28c9bb1dd49c9a5b1605fe1490aa3f4f64a3fa8881b25.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/9fabc4fc3440cdb776b28c9bb1dd49c9a5b1605fe1490aa3f4f64a3fa8881b25.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1044911014 -| mem: 4842999}) \ No newline at end of file +({cpu: 1018607014 +| mem: 4678599}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/a85173a832db3ea944fafc406dfe3fa3235254897d6d1d0e21bc380147687bd5.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/a85173a832db3ea944fafc406dfe3fa3235254897d6d1d0e21bc380147687bd5.budget.golden index 2b091f867c3..805ff3d794e 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/a85173a832db3ea944fafc406dfe3fa3235254897d6d1d0e21bc380147687bd5.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/a85173a832db3ea944fafc406dfe3fa3235254897d6d1d0e21bc380147687bd5.budget.golden @@ -1,2 +1,2 @@ -({cpu: 346354133 -| mem: 1689453}) \ No newline at end of file +({cpu: 336226133 +| mem: 1626153}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/a9a853b6d083551f4ed2995551af287880ef42aee239a2d9bc5314d127cce592.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/a9a853b6d083551f4ed2995551af287880ef42aee239a2d9bc5314d127cce592.budget.golden index 0f21813b7cd..e7c3264ff70 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/a9a853b6d083551f4ed2995551af287880ef42aee239a2d9bc5314d127cce592.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/a9a853b6d083551f4ed2995551af287880ef42aee239a2d9bc5314d127cce592.budget.golden @@ -1,2 +1,2 @@ -({cpu: 464259998 -| mem: 2226106}) \ No newline at end of file +({cpu: 453123998 +| mem: 2156506}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/acb9c83c2b78dabef8674319ad69ba54912cd9997bdf2d8b2998c6bfeef3b122.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/acb9c83c2b78dabef8674319ad69ba54912cd9997bdf2d8b2998c6bfeef3b122.budget.golden index 22429c703f3..4027eb54549 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/acb9c83c2b78dabef8674319ad69ba54912cd9997bdf2d8b2998c6bfeef3b122.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/acb9c83c2b78dabef8674319ad69ba54912cd9997bdf2d8b2998c6bfeef3b122.budget.golden @@ -1,2 +1,2 @@ -({cpu: 613584829 -| mem: 3052770}) \ No newline at end of file +({cpu: 596352829 +| mem: 2945070}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/acce04815e8fd51be93322888250060da173eccf3df3a605bd6bc6a456cde871.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/acce04815e8fd51be93322888250060da173eccf3df3a605bd6bc6a456cde871.budget.golden index ba5918ed697..24c352cac52 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/acce04815e8fd51be93322888250060da173eccf3df3a605bd6bc6a456cde871.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/acce04815e8fd51be93322888250060da173eccf3df3a605bd6bc6a456cde871.budget.golden @@ -1,2 +1,2 @@ -({cpu: 292982329 -| mem: 1384195}) \ No newline at end of file +({cpu: 283142329 +| mem: 1322695}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/ad6db94ed69b7161c7604568f44358e1cc11e81fea90e41afebd669e51bb60c8.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/ad6db94ed69b7161c7604568f44358e1cc11e81fea90e41afebd669e51bb60c8.budget.golden index 210c02bdc4a..66fb23193b0 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/ad6db94ed69b7161c7604568f44358e1cc11e81fea90e41afebd669e51bb60c8.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/ad6db94ed69b7161c7604568f44358e1cc11e81fea90e41afebd669e51bb60c8.budget.golden @@ -1,2 +1,2 @@ -({cpu: 548999898 -| mem: 2755802}) \ No newline at end of file +({cpu: 533447898 +| mem: 2658602}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/b21a4df3b0266ad3481a26d3e3d848aad2fcde89510b29cccce81971e38e0835.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/b21a4df3b0266ad3481a26d3e3d848aad2fcde89510b29cccce81971e38e0835.budget.golden index e2c2cb128ce..b08c12c5614 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/b21a4df3b0266ad3481a26d3e3d848aad2fcde89510b29cccce81971e38e0835.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/b21a4df3b0266ad3481a26d3e3d848aad2fcde89510b29cccce81971e38e0835.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1309680131 -| mem: 6354152}) \ No newline at end of file +({cpu: 1275072131 +| mem: 6137852}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/b50170cea48ee84b80558c02b15c6df52faf884e504d2c410ad63ba46d8ca35c.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/b50170cea48ee84b80558c02b15c6df52faf884e504d2c410ad63ba46d8ca35c.budget.golden index 4256d709942..efb150fdad8 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/b50170cea48ee84b80558c02b15c6df52faf884e504d2c410ad63ba46d8ca35c.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/b50170cea48ee84b80558c02b15c6df52faf884e504d2c410ad63ba46d8ca35c.budget.golden @@ -1,2 +1,2 @@ -({cpu: 725230429 -| mem: 3650940}) \ No newline at end of file +({cpu: 704110429 +| mem: 3518940}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/bb5345bfbbc460af84e784b900ec270df1948bb1d1e29eacecd022eeb168b315.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/bb5345bfbbc460af84e784b900ec270df1948bb1d1e29eacecd022eeb168b315.budget.golden index 5543088e5c8..45942d31849 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/bb5345bfbbc460af84e784b900ec270df1948bb1d1e29eacecd022eeb168b315.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/bb5345bfbbc460af84e784b900ec270df1948bb1d1e29eacecd022eeb168b315.budget.golden @@ -1,2 +1,2 @@ -({cpu: 908803786 -| mem: 4600936}) \ No newline at end of file +({cpu: 883075786 +| mem: 4440136}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/c4bb185380df6e9b66fc1ee0564f09a8d1253a51a0c0c7890f2214df9ac19274.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/c4bb185380df6e9b66fc1ee0564f09a8d1253a51a0c0c7890f2214df9ac19274.budget.golden index fc5e9cb3a4a..dcb1f0c8aa6 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/c4bb185380df6e9b66fc1ee0564f09a8d1253a51a0c0c7890f2214df9ac19274.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/c4bb185380df6e9b66fc1ee0564f09a8d1253a51a0c0c7890f2214df9ac19274.budget.golden @@ -1,2 +1,2 @@ -({cpu: 699461186 -| mem: 3549367}) \ No newline at end of file +({cpu: 680501186 +| mem: 3430867}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/c9efcb705ee057791f7c18a1de79c49f6e40ba143ce0579f1602fd780cabf153.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/c9efcb705ee057791f7c18a1de79c49f6e40ba143ce0579f1602fd780cabf153.budget.golden index b18aaea42da..246061fecbd 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/c9efcb705ee057791f7c18a1de79c49f6e40ba143ce0579f1602fd780cabf153.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/c9efcb705ee057791f7c18a1de79c49f6e40ba143ce0579f1602fd780cabf153.budget.golden @@ -1,2 +1,2 @@ -({cpu: 779256265 -| mem: 3916560}) \ No newline at end of file +({cpu: 757608265 +| mem: 3781260}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/ccab11ce1a8774135d0e3c9e635631b68af9e276b5dabc66ff669d5650d0be1c.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/ccab11ce1a8774135d0e3c9e635631b68af9e276b5dabc66ff669d5650d0be1c.budget.golden index c9e140cc89d..21b11eafdce 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/ccab11ce1a8774135d0e3c9e635631b68af9e276b5dabc66ff669d5650d0be1c.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/ccab11ce1a8774135d0e3c9e635631b68af9e276b5dabc66ff669d5650d0be1c.budget.golden @@ -1,2 +1,2 @@ -({cpu: 958116459 -| mem: 1295110}) \ No newline at end of file +({cpu: 949572459 +| mem: 1241710}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/cdb9d5c233b288a5a9dcfbd8d5c1831a0bb46eec7a26fa31b80ae69d44805efc.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/cdb9d5c233b288a5a9dcfbd8d5c1831a0bb46eec7a26fa31b80ae69d44805efc.budget.golden index 036d2f8930e..8d665a311d2 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/cdb9d5c233b288a5a9dcfbd8d5c1831a0bb46eec7a26fa31b80ae69d44805efc.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/cdb9d5c233b288a5a9dcfbd8d5c1831a0bb46eec7a26fa31b80ae69d44805efc.budget.golden @@ -1,2 +1,2 @@ -({cpu: 857892942 -| mem: 4300720}) \ No newline at end of file +({cpu: 833076942 +| mem: 4145620}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/ced1ea04649e093a501e43f8568ac3e6b37cd3eccec8cac9c70a4857b88a5eb8.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/ced1ea04649e093a501e43f8568ac3e6b37cd3eccec8cac9c70a4857b88a5eb8.budget.golden index 3595a65f12e..7f971b59d6e 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/ced1ea04649e093a501e43f8568ac3e6b37cd3eccec8cac9c70a4857b88a5eb8.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/ced1ea04649e093a501e43f8568ac3e6b37cd3eccec8cac9c70a4857b88a5eb8.budget.golden @@ -1,2 +1,2 @@ -({cpu: 806269962 -| mem: 4009892}) \ No newline at end of file +({cpu: 783469962 +| mem: 3867392}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/cf542b7df466b228ca2197c2aaa89238a8122f3330fe5b77b3222f570395d9f5.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/cf542b7df466b228ca2197c2aaa89238a8122f3330fe5b77b3222f570395d9f5.budget.golden index 52057ea32b1..73abc10615c 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/cf542b7df466b228ca2197c2aaa89238a8122f3330fe5b77b3222f570395d9f5.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/cf542b7df466b228ca2197c2aaa89238a8122f3330fe5b77b3222f570395d9f5.budget.golden @@ -1,2 +1,2 @@ -({cpu: 465300618 -| mem: 2339203}) \ No newline at end of file +({cpu: 451428618 +| mem: 2252503}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/d1ab832dfab25688f8845bec9387e46ee3f00ba5822197ade7dd540489ec5e95.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/d1ab832dfab25688f8845bec9387e46ee3f00ba5822197ade7dd540489ec5e95.budget.golden index 8676d9a2173..3a7510e597a 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/d1ab832dfab25688f8845bec9387e46ee3f00ba5822197ade7dd540489ec5e95.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/d1ab832dfab25688f8845bec9387e46ee3f00ba5822197ade7dd540489ec5e95.budget.golden @@ -1,2 +1,2 @@ -({cpu: 17825721738 -| mem: 1154542}) \ No newline at end of file +({cpu: 17818281738 +| mem: 1108042}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/d1c03759810747b7cab38c4296593b38567e11195d161b5bb0a2b58f89b2c65a.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/d1c03759810747b7cab38c4296593b38567e11195d161b5bb0a2b58f89b2c65a.budget.golden index 298472494bd..79bdccd9ec1 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/d1c03759810747b7cab38c4296593b38567e11195d161b5bb0a2b58f89b2c65a.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/d1c03759810747b7cab38c4296593b38567e11195d161b5bb0a2b58f89b2c65a.budget.golden @@ -1,2 +1,2 @@ -({cpu: 988102761 -| mem: 4999169}) \ No newline at end of file +({cpu: 961846761 +| mem: 4835069}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/d64607eb8a1448595081547ea8780886fcbd9e06036460eea3705c88ea867e33.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/d64607eb8a1448595081547ea8780886fcbd9e06036460eea3705c88ea867e33.budget.golden index a043a4a6578..e58e4ed4ee4 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/d64607eb8a1448595081547ea8780886fcbd9e06036460eea3705c88ea867e33.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/d64607eb8a1448595081547ea8780886fcbd9e06036460eea3705c88ea867e33.budget.golden @@ -1,2 +1,2 @@ -({cpu: 276827370 -| mem: 1385523}) \ No newline at end of file +({cpu: 268427370 +| mem: 1333023}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/dc241ac6ad1e04fb056d555d6a4f2d08a45d054c6f7f34355fcfeefebef479f3.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/dc241ac6ad1e04fb056d555d6a4f2d08a45d054c6f7f34355fcfeefebef479f3.budget.golden index 05670e238fd..b7cef0b5a10 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/dc241ac6ad1e04fb056d555d6a4f2d08a45d054c6f7f34355fcfeefebef479f3.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/dc241ac6ad1e04fb056d555d6a4f2d08a45d054c6f7f34355fcfeefebef479f3.budget.golden @@ -1,2 +1,2 @@ -({cpu: 435902162 -| mem: 2194769}) \ No newline at end of file +({cpu: 423326162 +| mem: 2116169}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/dd11ae574eaeab0e9925319768989313a93913fdc347c704ddaa27042757d990.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/dd11ae574eaeab0e9925319768989313a93913fdc347c704ddaa27042757d990.budget.golden index 3e3ffd2caed..4447fcbd6fb 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/dd11ae574eaeab0e9925319768989313a93913fdc347c704ddaa27042757d990.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/dd11ae574eaeab0e9925319768989313a93913fdc347c704ddaa27042757d990.budget.golden @@ -1,2 +1,2 @@ -({cpu: 720663970 -| mem: 3649734}) \ No newline at end of file +({cpu: 699543970 +| mem: 3517734}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/e26c1cddba16e05fd10c34cbdb16ea6acdbac7c8323256c31c90c520ee6a1080.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/e26c1cddba16e05fd10c34cbdb16ea6acdbac7c8323256c31c90c520ee6a1080.budget.golden index ba20c3d27c4..1eb95c72ae4 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/e26c1cddba16e05fd10c34cbdb16ea6acdbac7c8323256c31c90c520ee6a1080.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/e26c1cddba16e05fd10c34cbdb16ea6acdbac7c8323256c31c90c520ee6a1080.budget.golden @@ -1,2 +1,2 @@ -({cpu: 345130335 -| mem: 1605288}) \ No newline at end of file +({cpu: 335098335 +| mem: 1542588}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/e34b48f80d49360e88c612f4016f7d68cb5678dd8cd5ddb981375a028b3a40a5.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/e34b48f80d49360e88c612f4016f7d68cb5678dd8cd5ddb981375a028b3a40a5.budget.golden index e1feaf947a4..2bb990bac8e 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/e34b48f80d49360e88c612f4016f7d68cb5678dd8cd5ddb981375a028b3a40a5.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/e34b48f80d49360e88c612f4016f7d68cb5678dd8cd5ddb981375a028b3a40a5.budget.golden @@ -1,2 +1,2 @@ -({cpu: 368926633 -| mem: 1833768}) \ No newline at end of file +({cpu: 357166633 +| mem: 1760268}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/e3afd22d01ff12f381cf915fd32358634e6c413f979f2492cf3339319d8cc079.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/e3afd22d01ff12f381cf915fd32358634e6c413f979f2492cf3339319d8cc079.budget.golden index 1e611402712..20a32716b95 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/e3afd22d01ff12f381cf915fd32358634e6c413f979f2492cf3339319d8cc079.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/e3afd22d01ff12f381cf915fd32358634e6c413f979f2492cf3339319d8cc079.budget.golden @@ -1,2 +1,2 @@ -({cpu: 279273310 -| mem: 1391825}) \ No newline at end of file +({cpu: 270825310 +| mem: 1339025}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/e9234d2671760874f3f660aae5d3416d18ce6dfd7af4231bdd41b9ec268bc7e1.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/e9234d2671760874f3f660aae5d3416d18ce6dfd7af4231bdd41b9ec268bc7e1.budget.golden index 3f3533466bd..6d5167f8de2 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/e9234d2671760874f3f660aae5d3416d18ce6dfd7af4231bdd41b9ec268bc7e1.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/e9234d2671760874f3f660aae5d3416d18ce6dfd7af4231bdd41b9ec268bc7e1.budget.golden @@ -1,2 +1,2 @@ -({cpu: 886371409 -| mem: 2661854}) \ No newline at end of file +({cpu: 872307409 +| mem: 2573954}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/eb4a605ed3a64961e9e66ad9631c2813dadf7131740212762ae4483ec749fe1d.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/eb4a605ed3a64961e9e66ad9631c2813dadf7131740212762ae4483ec749fe1d.budget.golden index a043a4a6578..e58e4ed4ee4 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/eb4a605ed3a64961e9e66ad9631c2813dadf7131740212762ae4483ec749fe1d.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/eb4a605ed3a64961e9e66ad9631c2813dadf7131740212762ae4483ec749fe1d.budget.golden @@ -1,2 +1,2 @@ -({cpu: 276827370 -| mem: 1385523}) \ No newline at end of file +({cpu: 268427370 +| mem: 1333023}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/ecb5e8308b57724e0f8533921693f111eba942123cf8660aac2b5bac21ec28f0.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/ecb5e8308b57724e0f8533921693f111eba942123cf8660aac2b5bac21ec28f0.budget.golden index f1f06b84575..b5fd0768dd8 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/ecb5e8308b57724e0f8533921693f111eba942123cf8660aac2b5bac21ec28f0.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/ecb5e8308b57724e0f8533921693f111eba942123cf8660aac2b5bac21ec28f0.budget.golden @@ -1,2 +1,2 @@ -({cpu: 620296691 -| mem: 2983806}) \ No newline at end of file +({cpu: 603688691 +| mem: 2880006}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/f2a8fd2014922f0d8e01541205d47e9bb2d4e54333bdd408cbe7c47c55e73ae4.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/f2a8fd2014922f0d8e01541205d47e9bb2d4e54333bdd408cbe7c47c55e73ae4.budget.golden index d40f33f835f..5486bfc17cc 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/f2a8fd2014922f0d8e01541205d47e9bb2d4e54333bdd408cbe7c47c55e73ae4.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/f2a8fd2014922f0d8e01541205d47e9bb2d4e54333bdd408cbe7c47c55e73ae4.budget.golden @@ -1,2 +1,2 @@ -({cpu: 714684030 -| mem: 2973274}) \ No newline at end of file +({cpu: 698508030 +| mem: 2872174}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/f339f59bdf92495ed2b14e2e4d3705972b4dda59aa929cffe0f1ff5355db8d79.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/f339f59bdf92495ed2b14e2e4d3705972b4dda59aa929cffe0f1ff5355db8d79.budget.golden index fadb5253a38..8bcd4e65f45 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/f339f59bdf92495ed2b14e2e4d3705972b4dda59aa929cffe0f1ff5355db8d79.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/f339f59bdf92495ed2b14e2e4d3705972b4dda59aa929cffe0f1ff5355db8d79.budget.golden @@ -1,2 +1,2 @@ -({cpu: 3761221278 -| mem: 1237446}) \ No newline at end of file +({cpu: 3753205278 +| mem: 1187346}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/ffdd68a33afd86f8844c9f5e45b2bda5b035aa02274161b23d57709c0f8b8de6.budget.golden b/plutus-benchmark/marlowe/test/semantics/9.6/ffdd68a33afd86f8844c9f5e45b2bda5b035aa02274161b23d57709c0f8b8de6.budget.golden index 7db710704ca..3cad896a744 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/ffdd68a33afd86f8844c9f5e45b2bda5b035aa02274161b23d57709c0f8b8de6.budget.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/ffdd68a33afd86f8844c9f5e45b2bda5b035aa02274161b23d57709c0f8b8de6.budget.golden @@ -1,2 +1,2 @@ -({cpu: 902819231 -| mem: 4439954}) \ No newline at end of file +({cpu: 878483231 +| mem: 4287854}) \ No newline at end of file diff --git a/plutus-benchmark/marlowe/test/semantics/9.6/semantics.size.golden b/plutus-benchmark/marlowe/test/semantics/9.6/semantics.size.golden index 2d4ceff77d1..49f8877a6e3 100644 --- a/plutus-benchmark/marlowe/test/semantics/9.6/semantics.size.golden +++ b/plutus-benchmark/marlowe/test/semantics/9.6/semantics.size.golden @@ -1 +1 @@ -12416 \ No newline at end of file +12402 \ No newline at end of file diff --git a/plutus-benchmark/nofib/test/9.6/clausify-F5.budget.golden b/plutus-benchmark/nofib/test/9.6/clausify-F5.budget.golden index b4753fe465b..84300f2592a 100644 --- a/plutus-benchmark/nofib/test/9.6/clausify-F5.budget.golden +++ b/plutus-benchmark/nofib/test/9.6/clausify-F5.budget.golden @@ -1,2 +1,2 @@ -({cpu: 57792275160 -| mem: 340971480}) \ No newline at end of file +({cpu: 54177923160 +| mem: 318381780}) \ No newline at end of file diff --git a/plutus-benchmark/nofib/test/9.6/clausify-F5.size.golden b/plutus-benchmark/nofib/test/9.6/clausify-F5.size.golden index ef1d61bb83d..b7ec149a980 100644 --- a/plutus-benchmark/nofib/test/9.6/clausify-F5.size.golden +++ b/plutus-benchmark/nofib/test/9.6/clausify-F5.size.golden @@ -1 +1 @@ -1573 \ No newline at end of file +1566 \ No newline at end of file diff --git a/plutus-benchmark/nofib/test/9.6/knights10-4x4.budget.golden b/plutus-benchmark/nofib/test/9.6/knights10-4x4.budget.golden index 31561b0a542..d79ea331cea 100644 --- a/plutus-benchmark/nofib/test/9.6/knights10-4x4.budget.golden +++ b/plutus-benchmark/nofib/test/9.6/knights10-4x4.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1532270000 -| mem: 7885412}) \ No newline at end of file +({cpu: 1487774000 +| mem: 7607312}) \ No newline at end of file diff --git a/plutus-benchmark/nofib/test/9.6/knights10-4x4.size.golden b/plutus-benchmark/nofib/test/9.6/knights10-4x4.size.golden index 6c14b486075..4af39701d0b 100644 --- a/plutus-benchmark/nofib/test/9.6/knights10-4x4.size.golden +++ b/plutus-benchmark/nofib/test/9.6/knights10-4x4.size.golden @@ -1 +1 @@ -2056 \ No newline at end of file +2049 \ No newline at end of file diff --git a/plutus-benchmark/nofib/test/9.6/queens4-bt.budget.golden b/plutus-benchmark/nofib/test/9.6/queens4-bt.budget.golden index 796594e3b90..2571080815a 100644 --- a/plutus-benchmark/nofib/test/9.6/queens4-bt.budget.golden +++ b/plutus-benchmark/nofib/test/9.6/queens4-bt.budget.golden @@ -1,2 +1,2 @@ -({cpu: 5135342267 -| mem: 28186230}) \ No newline at end of file +({cpu: 4818974267 +| mem: 26208930}) \ No newline at end of file diff --git a/plutus-benchmark/nofib/test/9.6/queens4-bt.size.golden b/plutus-benchmark/nofib/test/9.6/queens4-bt.size.golden index 93f881d119e..6d92a178f90 100644 --- a/plutus-benchmark/nofib/test/9.6/queens4-bt.size.golden +++ b/plutus-benchmark/nofib/test/9.6/queens4-bt.size.golden @@ -1 +1 @@ -1960 \ No newline at end of file +1953 \ No newline at end of file diff --git a/plutus-benchmark/nofib/test/9.6/queens5-fc.budget.golden b/plutus-benchmark/nofib/test/9.6/queens5-fc.budget.golden index 840df570e93..fd7f21440c1 100644 --- a/plutus-benchmark/nofib/test/9.6/queens5-fc.budget.golden +++ b/plutus-benchmark/nofib/test/9.6/queens5-fc.budget.golden @@ -1,2 +1,2 @@ -({cpu: 182013934621 -| mem: 1040710766}) \ No newline at end of file +({cpu: 168637918621 +| mem: 957110666}) \ No newline at end of file diff --git a/plutus-benchmark/nofib/test/9.6/queens5-fc.size.golden b/plutus-benchmark/nofib/test/9.6/queens5-fc.size.golden index 93f881d119e..6d92a178f90 100644 --- a/plutus-benchmark/nofib/test/9.6/queens5-fc.size.golden +++ b/plutus-benchmark/nofib/test/9.6/queens5-fc.size.golden @@ -1 +1 @@ -1960 \ No newline at end of file +1953 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-20.budget.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-20.budget.golden index a81ca0fea2c..94c920a648f 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-20.budget.golden +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-20.budget.golden @@ -1,2 +1,2 @@ -({cpu: 294002639 -| mem: 1190319}) \ No newline at end of file +({cpu: 287810639 +| mem: 1151619}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-4.budget.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-4.budget.golden index 92703234b5c..a86c874b160 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-4.budget.golden +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-4.budget.golden @@ -1,2 +1,2 @@ -({cpu: 82690943 -| mem: 335087}) \ No newline at end of file +({cpu: 81106943 +| mem: 325187}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1.size.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1.size.golden index a3ace50d946..3d2b7eb6dfb 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1.size.golden +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1.size.golden @@ -1 +1 @@ -1793 \ No newline at end of file +1786 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-20.budget.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-20.budget.golden index 0d14e96bc80..baf14654785 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-20.budget.golden +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-20.budget.golden @@ -1,2 +1,2 @@ -({cpu: 283814167 -| mem: 1140876}) \ No newline at end of file +({cpu: 278630167 +| mem: 1108476}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-4.budget.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-4.budget.golden index 5db1d86e7d1..68428309b81 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-4.budget.golden +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-4.budget.golden @@ -1,2 +1,2 @@ -({cpu: 79753799 -| mem: 320876}) \ No newline at end of file +({cpu: 78409799 +| mem: 312476}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2.size.golden b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2.size.golden index a35fccb568c..72078b7c2e7 100644 --- a/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2.size.golden +++ b/plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2.size.golden @@ -1 +1 @@ -1736 \ No newline at end of file +1729 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-20.budget.golden b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-20.budget.golden index 8c58cfe9bbd..a4267ec97be 100644 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-20.budget.golden +++ b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-20.budget.golden @@ -1,2 +1,2 @@ -({cpu: 29358843 -| mem: 113113}) \ No newline at end of file +({cpu: 28302843 +| mem: 106513}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-4.budget.golden b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-4.budget.golden index bd4f241fb07..7b80df9a2cc 100644 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-4.budget.golden +++ b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1-4.budget.golden @@ -1,2 +1,2 @@ -({cpu: 12734603 -| mem: 47545}) \ No newline at end of file +({cpu: 12446603 +| mem: 45745}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1.size.golden b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1.size.golden index 4b74f2216db..b99877a5979 100644 --- a/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1.size.golden +++ b/plutus-benchmark/script-contexts/test/V1/Data/9.6/checkScriptContext1.size.golden @@ -1 +1 @@ -338 \ No newline at end of file +331 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-20.budget.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-20.budget.golden index 0530666c73b..e515493f0a6 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-20.budget.golden +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-20.budget.golden @@ -1,2 +1,2 @@ -({cpu: 323527589 -| mem: 1299115}) \ No newline at end of file +({cpu: 317239589 +| mem: 1259815}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-4.budget.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-4.budget.golden index a10cb3f37cb..9d4e41751f8 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-4.budget.golden +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1-4.budget.golden @@ -1,2 +1,2 @@ -({cpu: 91325173 -| mem: 370891}) \ No newline at end of file +({cpu: 89645173 +| mem: 360391}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1.size.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1.size.golden index af27f188b4d..49b43c458a2 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1.size.golden +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext1.size.golden @@ -1 +1 @@ -1873 \ No newline at end of file +1866 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-20.budget.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-20.budget.golden index 7cbc482fbec..a5510cf5dd2 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-20.budget.golden +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-20.budget.golden @@ -1,2 +1,2 @@ -({cpu: 313307117 -| mem: 1249472}) \ No newline at end of file +({cpu: 308027117 +| mem: 1216472}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-4.budget.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-4.budget.golden index e57f244d3c9..a9dd84653ae 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-4.budget.golden +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2-4.budget.golden @@ -1,2 +1,2 @@ -({cpu: 88356029 -| mem: 356480}) \ No newline at end of file +({cpu: 86916029 +| mem: 347480}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2.size.golden b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2.size.golden index a1b04e2707d..904344abab2 100644 --- a/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2.size.golden +++ b/plutus-benchmark/script-contexts/test/V2/9.6/checkScriptContext2.size.golden @@ -1 +1 @@ -1814 \ No newline at end of file +1807 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-20.budget.golden b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-20.budget.golden index 9d2fa602c5c..7c30a9966ad 100644 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-20.budget.golden +++ b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-20.budget.golden @@ -1,2 +1,2 @@ -({cpu: 30184405 -| mem: 116105}) \ No newline at end of file +({cpu: 29128405 +| mem: 109505}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-4.budget.golden b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-4.budget.golden index 55a0f34bf30..169b377212a 100644 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-4.budget.golden +++ b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1-4.budget.golden @@ -1,2 +1,2 @@ -({cpu: 13560165 -| mem: 50537}) \ No newline at end of file +({cpu: 13272165 +| mem: 48737}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1.size.golden b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1.size.golden index b18d64367d2..755152b7ef4 100644 --- a/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1.size.golden +++ b/plutus-benchmark/script-contexts/test/V2/Data/9.6/checkScriptContext1.size.golden @@ -1 +1 @@ -366 \ No newline at end of file +359 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-20.budget.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-20.budget.golden index f233e434660..0c44b40200f 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-20.budget.golden +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-20.budget.golden @@ -1,2 +1,2 @@ -({cpu: 326278695 -| mem: 1307829}) \ No newline at end of file +({cpu: 319558695 +| mem: 1265829}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-4.budget.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-4.budget.golden index 9f42fd78d40..7eb9137be18 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-4.budget.golden +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1-4.budget.golden @@ -1,2 +1,2 @@ -({cpu: 95356279 -| mem: 387605}) \ No newline at end of file +({cpu: 93244279 +| mem: 374405}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1.size.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1.size.golden index 9193385b9b3..18e20c783ca 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1.size.golden +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext1.size.golden @@ -1 +1 @@ -3330 \ No newline at end of file +3323 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-20.budget.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-20.budget.golden index aa1687c3e4d..07e8f4d381f 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-20.budget.golden +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-20.budget.golden @@ -1,2 +1,2 @@ -({cpu: 315978223 -| mem: 1257686}) \ No newline at end of file +({cpu: 310266223 +| mem: 1221986}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-4.budget.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-4.budget.golden index a183afe62ce..c1aa7dc1efb 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-4.budget.golden +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2-4.budget.golden @@ -1,2 +1,2 @@ -({cpu: 92307135 -| mem: 372694}) \ No newline at end of file +({cpu: 90435135 +| mem: 360994}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2.size.golden b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2.size.golden index f0dfa1fe343..7ba9a6eb74f 100644 --- a/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2.size.golden +++ b/plutus-benchmark/script-contexts/test/V3/9.6/checkScriptContext2.size.golden @@ -1 +1 @@ -3266 \ No newline at end of file +3259 \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-20.budget.golden b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-20.budget.golden index 9e48a1922b4..6f8647d8905 100644 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-20.budget.golden +++ b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-20.budget.golden @@ -1,2 +1,2 @@ -({cpu: 33072854 -| mem: 126955}) \ No newline at end of file +({cpu: 32016854 +| mem: 120355}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-4.budget.golden b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-4.budget.golden index 72e3fa449b7..3be856f727b 100644 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-4.budget.golden +++ b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1-4.budget.golden @@ -1,2 +1,2 @@ -({cpu: 16448614 -| mem: 61387}) \ No newline at end of file +({cpu: 16160614 +| mem: 59587}) \ No newline at end of file diff --git a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1.size.golden b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1.size.golden index 7d4983b9898..49912106603 100644 --- a/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1.size.golden +++ b/plutus-benchmark/script-contexts/test/V3/Data/9.6/checkScriptContext1.size.golden @@ -1 +1 @@ -458 \ No newline at end of file +451 \ No newline at end of file diff --git a/plutus-core/cost-model/data/cekMachineCostsA.json b/plutus-core/cost-model/data/cekMachineCostsA.json index bd1b910be2b..f5fb6d356fc 100644 --- a/plutus-core/cost-model/data/cekMachineCostsA.json +++ b/plutus-core/cost-model/data/cekMachineCostsA.json @@ -8,6 +8,7 @@ "cekApplyCost" : {"exBudgetCPU": 23000, "exBudgetMemory": 100}, "cekBuiltinCost" : {"exBudgetCPU": 23000, "exBudgetMemory": 100}, "cekConstrCost" : {"exBudgetCPU": 23000, "exBudgetMemory": 100}, - "cekCaseCost" : {"exBudgetCPU": 23000, "exBudgetMemory": 100} + "cekCaseCost" : {"exBudgetCPU": 23000, "exBudgetMemory": 100}, + "cekFixCost" : {"exBudgetCPU": 23000, "exBudgetMemory": 100} } diff --git a/plutus-core/cost-model/data/cekMachineCostsB.json b/plutus-core/cost-model/data/cekMachineCostsB.json index ac4ef705fcc..ae13d4c2702 100644 --- a/plutus-core/cost-model/data/cekMachineCostsB.json +++ b/plutus-core/cost-model/data/cekMachineCostsB.json @@ -8,6 +8,7 @@ "cekApplyCost" : {"exBudgetCPU": 16000, "exBudgetMemory": 100}, "cekBuiltinCost" : {"exBudgetCPU": 16000, "exBudgetMemory": 100}, "cekConstrCost" : {"exBudgetCPU": 16000, "exBudgetMemory": 100}, - "cekCaseCost" : {"exBudgetCPU": 16000, "exBudgetMemory": 100} + "cekCaseCost" : {"exBudgetCPU": 16000, "exBudgetMemory": 100}, + "cekFixCost" : {"exBudgetCPU": 16000, "exBudgetMemory": 100} } diff --git a/plutus-core/cost-model/data/cekMachineCostsC.json b/plutus-core/cost-model/data/cekMachineCostsC.json index ac4ef705fcc..ae13d4c2702 100644 --- a/plutus-core/cost-model/data/cekMachineCostsC.json +++ b/plutus-core/cost-model/data/cekMachineCostsC.json @@ -8,6 +8,7 @@ "cekApplyCost" : {"exBudgetCPU": 16000, "exBudgetMemory": 100}, "cekBuiltinCost" : {"exBudgetCPU": 16000, "exBudgetMemory": 100}, "cekConstrCost" : {"exBudgetCPU": 16000, "exBudgetMemory": 100}, - "cekCaseCost" : {"exBudgetCPU": 16000, "exBudgetMemory": 100} + "cekCaseCost" : {"exBudgetCPU": 16000, "exBudgetMemory": 100}, + "cekFixCost" : {"exBudgetCPU": 16000, "exBudgetMemory": 100} } diff --git a/plutus-core/plutus-core/src/PlutusCore/Compiler/Erase.hs b/plutus-core/plutus-core/src/PlutusCore/Compiler/Erase.hs index 6dd766d58f8..3ba84b27799 100644 --- a/plutus-core/plutus-core/src/PlutusCore/Compiler/Erase.hs +++ b/plutus-core/plutus-core/src/PlutusCore/Compiler/Erase.hs @@ -26,6 +26,7 @@ eraseTerm (IWrap _ _ _ term) = eraseTerm term eraseTerm (Error ann _) = UPLC.Error ann eraseTerm (Constr ann _ i args) = UPLC.Constr ann i (fmap eraseTerm args) eraseTerm (Case ann _ arg cs) = UPLC.Case ann (eraseTerm arg) (fromList $ fmap eraseTerm cs) +eraseTerm (Fix ann name _ body) = UPLC.Fix ann name (eraseTerm body) eraseProgram :: HasUnique name TermUnique => Program tyname name uni fun ann diff --git a/plutus-core/plutus-core/src/PlutusCore/Core/Instance/Eq.hs b/plutus-core/plutus-core/src/PlutusCore/Core/Instance/Eq.hs index 7a8f77c5ef2..a05c5e83600 100644 --- a/plutus-core/plutus-core/src/PlutusCore/Core/Instance/Eq.hs +++ b/plutus-core/plutus-core/src/PlutusCore/Core/Instance/Eq.hs @@ -123,7 +123,7 @@ eqTypeM TyIFix{} _ = empty eqTypeM TyApp{} _ = empty eqTypeM TyFun{} _ = empty eqTypeM TyBuiltin{} _ = empty -eqTypeM TySOP{} _ = empty +eqTypeM TySOP{} _ = empty -- See Note [Modulo alpha]. -- See Note [Scope tracking] @@ -137,6 +137,10 @@ eqTermM (LamAbs ann1 name1 ty1 body1) (LamAbs ann2 name2 ty2 body2) = do eqM ann1 ann2 eqTypeM ty1 ty2 withTwinBindings name1 name2 $ eqTermM body1 body2 +eqTermM (Fix ann1 name1 ty1 body1) (Fix ann2 name2 ty2 body2) = do + eqM ann1 ann2 + eqTypeM ty1 ty2 + withTwinBindings name1 name2 $ eqTermM body1 body2 eqTermM (TyAbs ann1 name1 kind1 body1) (TyAbs ann2 name2 kind2 body2) = do eqM ann1 ann2 eqM kind1 kind2 @@ -193,5 +197,6 @@ eqTermM TyInst{} _ = empty eqTermM Var{} _ = empty eqTermM Constant{} _ = empty eqTermM Builtin{} _ = empty -eqTermM Constr{} _ = empty -eqTermM Case{} _ = empty +eqTermM Constr{} _ = empty +eqTermM Case{} _ = empty +eqTermM Fix{} _ = empty diff --git a/plutus-core/plutus-core/src/PlutusCore/Core/Instance/Pretty/Readable.hs b/plutus-core/plutus-core/src/PlutusCore/Core/Instance/Pretty/Readable.hs index 6e68256f9b0..c8632a9631d 100644 --- a/plutus-core/plutus-core/src/PlutusCore/Core/Instance/Pretty/Readable.hs +++ b/plutus-core/plutus-core/src/PlutusCore/Core/Instance/Pretty/Readable.hs @@ -157,6 +157,7 @@ instance iterAppDocM $ \_ prettyArg -> "constr" :| [prettyArg ty, prettyArg i, prettyArg es] Case _ ty arg cs -> iterAppDocM $ \_ prettyArg -> "case" :| [prettyArg ty, prettyArg arg, prettyArg cs] + Fix ann name ty body -> fixPrettyM (VarDecl ann name ty) body instance PrettyReadableBy configName (Term tyname name uni fun a) => PrettyBy (PrettyConfigReadable configName) (Program tyname name uni fun a) where diff --git a/plutus-core/plutus-core/src/PlutusCore/Core/Plated.hs b/plutus-core/plutus-core/src/PlutusCore/Core/Plated.hs index d6f7ac7d7c9..a10386c6de7 100644 --- a/plutus-core/plutus-core/src/PlutusCore/Core/Plated.hs +++ b/plutus-core/plutus-core/src/PlutusCore/Core/Plated.hs @@ -134,6 +134,7 @@ termConstants f term0 = case term0 of Builtin{} -> pure term0 Constr{} -> pure term0 Case{} -> pure term0 + Fix{} -> pure term0 -- | Get all the direct child 'tyname a's of the given 'Term' from 'TyAbs'es. termTyBinds :: Traversal' (Term tyname name uni fun ann) tyname @@ -150,11 +151,13 @@ termTyBinds f term0 = case term0 of Builtin{} -> pure term0 Constr{} -> pure term0 Case{} -> pure term0 + Fix{} -> pure term0 -- | Get all the direct child 'name a's of the given 'Term' from 'LamAbs'es. termBinds :: Traversal' (Term tyname name uni fun ann) name termBinds f term0 = case term0 of LamAbs ann n ty t -> f n <&> \n' -> LamAbs ann n' ty t + Fix ann n ty t -> f n <&> \n' -> Fix ann n' ty t Var{} -> pure term0 TyAbs{} -> pure term0 TyInst{} -> pure term0 @@ -182,12 +185,14 @@ termVars f term0 = case term0 of Builtin{} -> pure term0 Constr{} -> pure term0 Case{} -> pure term0 + Fix{} -> pure term0 -- | Get all the direct child 'Unique's of the given 'Term' (including the type-level ones). termUniques :: HasUniques (Term tyname name uni fun ann) => Traversal' (Term tyname name uni fun ann) Unique termUniques f term0 = case term0 of TyAbs ann tn k t -> theUnique f tn <&> \tn' -> TyAbs ann tn' k t LamAbs ann n ty t -> theUnique f n <&> \n' -> LamAbs ann n' ty t + Fix ann n ty t -> theUnique f n <&> \n' -> Fix ann n' ty t Var ann n -> theUnique f n <&> Var ann TyInst{} -> pure term0 IWrap{} -> pure term0 @@ -214,6 +219,7 @@ termSubkinds f term0 = case term0 of Builtin{} -> pure term0 Constr{} -> pure term0 Case{} -> pure term0 + Fix{} -> pure term0 {-# INLINE termSubkinds #-} -- | Get all the direct child 'Type's of the given 'Term'. @@ -231,6 +237,7 @@ termSubtypes f term0 = case term0 of Var{} -> pure term0 Constant{} -> pure term0 Builtin{} -> pure term0 + Fix{} -> pure term0 {-# INLINE termSubtypes #-} -- | Get all the transitive child 'Constant's of the given 'Term'. @@ -252,6 +259,7 @@ termSubterms f term0 = case term0 of Unwrap ann t -> Unwrap ann <$> f t Constr ann ty i es -> Constr ann ty i <$> traverse f es Case ann ty arg cs -> Case ann ty <$> f arg <*> traverse f cs + Fix ann n ty t -> Fix ann n ty <$> f t Error{} -> pure term0 Var{} -> pure term0 Constant{} -> pure term0 diff --git a/plutus-core/plutus-core/src/PlutusCore/Core/Type.hs b/plutus-core/plutus-core/src/PlutusCore/Core/Type.hs index 861a2858655..690c49e00df 100644 --- a/plutus-core/plutus-core/src/PlutusCore/Core/Type.hs +++ b/plutus-core/plutus-core/src/PlutusCore/Core/Type.hs @@ -143,6 +143,7 @@ data Term tyname name uni fun ann | Constant ann (Some (ValueOf uni)) -- ^ constants | Builtin ann fun -- ^ builtin functions | Error ann (Type tyname uni ann) -- ^ fail with error + | Fix ann name (Type tyname uni ann) (Term tyname name uni fun ann) deriving stock (Functor, Generic) deriving stock instance (Show tyname, Show name, GShow uni, Everywhere uni Show, Show fun, Show ann, Closed uni) @@ -253,6 +254,7 @@ termAnn (Error ann _ ) = ann termAnn (LamAbs ann _ _ _) = ann termAnn (Constr ann _ _ _) = ann termAnn (Case ann _ _ _ ) = ann +termAnn (Fix ann _ _ _ ) = ann -- | Map a function over the set of built-in functions. mapFun :: (fun -> fun') -> Term tyname name uni fun ann -> Term tyname name uni fun' ann @@ -269,6 +271,7 @@ mapFun f = go where go (Builtin ann fun) = Builtin ann (f fun) go (Constr ann ty i args) = Constr ann ty i (map go args) go (Case ann ty arg cs) = Case ann ty (go arg) (map go cs) + go (Fix ann name ty body) = Fix ann name ty (go body) -- | This is a wrapper to mark the place where the binder is introduced (i.e. LamAbs/TyAbs) -- and not where it is actually used (TyVar/Var..). diff --git a/plutus-core/plutus-core/src/PlutusCore/DeBruijn.hs b/plutus-core/plutus-core/src/PlutusCore/DeBruijn.hs index bc15f5eb8ff..3339a45c21e 100644 --- a/plutus-core/plutus-core/src/PlutusCore/DeBruijn.hs +++ b/plutus-core/plutus-core/src/PlutusCore/DeBruijn.hs @@ -177,6 +177,9 @@ deBruijnTermWithM h = go -- boring non-recursive cases Constant ann con -> pure $ Constant ann con Builtin ann bn -> pure $ Builtin ann bn + Fix ann n ty t -> declareUnique n $ do + n' <- nameToDeBruijn h n + withScope $ Fix ann n' <$> goT ty <*> go t -- | Takes a "handler" function to execute when encountering free variables. unDeBruijnTyWithM @@ -246,3 +249,8 @@ unDeBruijnTermWithM h = go -- boring non-recursive cases Constant ann con -> pure $ Constant ann con Builtin ann bn -> pure $ Builtin ann bn + Fix ann n ty t -> + -- See Note [DeBruijn indices of Binders] + declareBinder $ do + n' <- deBruijnToName h $ set index deBruijnInitIndex n + withScope $ Fix ann n' <$> goT ty <*> go t diff --git a/plutus-core/plutus-core/src/PlutusCore/Evaluation/Machine/Ck.hs b/plutus-core/plutus-core/src/PlutusCore/Evaluation/Machine/Ck.hs index a0c99813492..b075148bde7 100644 --- a/plutus-core/plutus-core/src/PlutusCore/Evaluation/Machine/Ck.hs +++ b/plutus-core/plutus-core/src/PlutusCore/Evaluation/Machine/Ck.hs @@ -132,6 +132,7 @@ data Frame uni fun | FrameIWrap (Type TyName uni ()) (Type TyName uni ()) -- ^ @(iwrap A B _)@ | FrameConstr (Type TyName uni ()) Word64 [Term TyName Name uni fun ()] [CkValue uni fun] | FrameCase [Term TyName Name uni fun ()] + | FrameFix Name (Type TyName uni ()) deriving stock instance (GShow uni, Closed uni, uni `Everywhere` Show, Show fun) => Show (Frame uni fun) @@ -185,6 +186,7 @@ stack |> Constr _ ty i es = case es of [] -> stack <| VConstr ty i [] t : ts -> FrameConstr ty i ts [] : stack |> t stack |> Case _ _ arg cs = FrameCase cs : stack |> arg +stack |> Fix _ recName ty body = FrameFix recName ty : stack |> body _ |> Error{} = throwingWithCause _EvaluationError (OperationalEvaluationError CkEvaluationFailure) Nothing _ |> var@Var{} = @@ -207,7 +209,7 @@ _ |> var@Var{} = (<|) :: Context uni fun -> CkValue uni fun -> CkM uni fun s (Term TyName Name uni fun ()) [] <| val = pure $ ckValueToTerm val -FrameTyInstArg ty : stack <| fun = instantiateEvaluate stack ty fun +FrameTyInstArg ty : stack <| fun = instantiateEvaluate stack ty fun FrameAwaitFunTerm arg : stack <| fun = FrameAwaitArg fun : stack |> arg FrameAwaitArg fun : stack <| arg = applyEvaluate stack fun arg FrameAwaitFunValue arg : stack <| fun = applyEvaluate stack fun arg @@ -229,6 +231,11 @@ FrameCase cs : stack <| e = case e of go (arg:rest) s = go rest (FrameAwaitFunValue arg : s) Nothing -> throwingWithCause _MachineError (MissingCaseBranch i) (Just $ ckValueToTerm e) _ -> throwingWithCause _MachineError NonConstrScrutinized (Just $ ckValueToTerm e) +FrameFix recName ty : stack <| body = + let bodyTerm = ckValueToTerm body + in case body of + VLamAbs{} -> stack |> termSubstClosedTerm recName (Fix () recName ty bodyTerm) bodyTerm + _ -> throwingWithCause _MachineError NonLambdaFixedMachineError $ Just bodyTerm -- | Transfers a 'Spine' onto the stack. The first argument will be at the top of the stack. -- diff --git a/plutus-core/plutus-core/src/PlutusCore/Evaluation/Machine/Exception.hs b/plutus-core/plutus-core/src/PlutusCore/Evaluation/Machine/Exception.hs index 77a47a26b00..555ea7386e6 100644 --- a/plutus-core/plutus-core/src/PlutusCore/Evaluation/Machine/Exception.hs +++ b/plutus-core/plutus-core/src/PlutusCore/Evaluation/Machine/Exception.hs @@ -62,6 +62,7 @@ data MachineError fun -- ^ A builtin received a term argument when something else was expected | NonConstrScrutinized | MissingCaseBranch Word64 + | NonLambdaFixedMachineError deriving stock (Show, Eq, Functor, Generic) deriving anyclass (NFData) @@ -133,3 +134,5 @@ instance (HasPrettyDefaults config ~ 'True, Pretty fun) => "A non-constructor value was scrutinized in a case expression" prettyBy _ (MissingCaseBranch i) = "Case expression missing the branch required by the scrutinee tag:" <+> pretty i + prettyBy _ NonLambdaFixedMachineError = + "Attempted to take the fixed-point of a non-lambda term" diff --git a/plutus-core/plutus-core/src/PlutusCore/MkPlc.hs b/plutus-core/plutus-core/src/PlutusCore/MkPlc.hs index 6a5932c704d..aa105681344 100644 --- a/plutus-core/plutus-core/src/PlutusCore/MkPlc.hs +++ b/plutus-core/plutus-core/src/PlutusCore/MkPlc.hs @@ -82,6 +82,7 @@ class TermLike term tyname name uni fun | term -> tyname name uni fun where error :: ann -> Type tyname uni ann -> term ann constr :: ann -> Type tyname uni ann -> Word64 -> [term ann] -> term ann kase :: ann -> Type tyname uni ann -> term ann -> [term ann] -> term ann + mkFix :: ann -> name -> Type tyname uni ann -> term ann -> term ann termLet :: ann -> TermDef term tyname name uni ann -> term ann -> term ann typeLet :: ann -> TypeDef tyname uni ann -> term ann -> term ann @@ -121,6 +122,7 @@ instance TermLike (Term tyname name uni fun) tyname name uni fun where error = Error constr = Constr kase = Case + mkFix = Fix embedTerm :: TermLike term tyname name uni fun => Term tyname name uni fun ann -> term ann embedTerm = \case @@ -136,6 +138,7 @@ embedTerm = \case IWrap a ty1 ty2 t -> iWrap a ty1 ty2 (embedTerm t) Constr a ty i es -> constr a ty i (fmap embedTerm es) Case a ty arg cs -> kase a ty (embedTerm arg) (fmap embedTerm cs) + Fix a name ty t -> mkFix a name ty (embedTerm t) -- | Make a 'Var' referencing the given 'VarDecl'. mkVar :: TermLike term tyname name uni fun => ann -> VarDecl tyname name uni ann -> term ann diff --git a/plutus-core/plutus-core/src/PlutusCore/Pretty.hs b/plutus-core/plutus-core/src/PlutusCore/Pretty.hs index f0bab62379a..7ec5b587047 100644 --- a/plutus-core/plutus-core/src/PlutusCore/Pretty.hs +++ b/plutus-core/plutus-core/src/PlutusCore/Pretty.hs @@ -71,6 +71,7 @@ module PlutusCore.Pretty , iterAppDocM , iterInterAppPrettyM , iterAppPrettyM + , fixPrettyM -- * Utils , prettyBytes , ConstConfig (..) diff --git a/plutus-core/plutus-core/src/PlutusCore/Pretty/Readable.hs b/plutus-core/plutus-core/src/PlutusCore/Pretty/Readable.hs index b35b03858f8..ad0d872b5ba 100644 --- a/plutus-core/plutus-core/src/PlutusCore/Pretty/Readable.hs +++ b/plutus-core/plutus-core/src/PlutusCore/Pretty/Readable.hs @@ -184,6 +184,17 @@ iterLamAbsPrettyM :: m (Doc ann) iterLamAbsPrettyM = iterBinderPrettyM $ \binds -> "\\" <> binds <+> "->" +-- | Lay out a 'Fix' via 'iterBinderPrettyM'. +fixPrettyM :: + ( MonadPrettyReadable configName env m + , PrettyReadableBy configName arg + , PrettyReadableBy configName body + ) => + arg -> + body -> + m (Doc ann) +fixPrettyM = iterBinderPrettyM (\bind -> "fix" <+> bind <> ".") . pure + -- | Lay out an iterated 'TyAbs' via 'iterBinderPrettyM'. iterTyAbsPrettyM :: ( MonadPrettyReadable configName env m diff --git a/plutus-core/plutus-core/src/PlutusCore/Rename/Internal.hs b/plutus-core/plutus-core/src/PlutusCore/Rename/Internal.hs index 6292114149f..6426165fe72 100644 --- a/plutus-core/plutus-core/src/PlutusCore/Rename/Internal.hs +++ b/plutus-core/plutus-core/src/PlutusCore/Rename/Internal.hs @@ -92,6 +92,8 @@ renameTermM => Term tyname name uni fun ann -> m (Term tyname name uni fun ann) renameTermM (LamAbs ann name ty body) = withFreshenedName name $ \nameFr -> LamAbs ann nameFr <$> renameTypeM ty <*> renameTermM body +renameTermM (Fix ann name ty body) = + withFreshenedName name $ \nameFr -> Fix ann nameFr <$> renameTypeM ty <*> renameTermM body renameTermM (TyAbs ann name kind body) = withFreshenedName name $ \nameFr -> TyAbs ann nameFr kind <$> renameTermM body renameTermM (IWrap ann pat arg term) = diff --git a/plutus-core/plutus-core/src/PlutusCore/Subst.hs b/plutus-core/plutus-core/src/PlutusCore/Subst.hs index b6c7eb119d3..b89a080c150 100644 --- a/plutus-core/plutus-core/src/PlutusCore/Subst.hs +++ b/plutus-core/plutus-core/src/PlutusCore/Subst.hs @@ -164,6 +164,7 @@ termSubstClosedTerm varFor new = go where go = \case Var a var -> if var == varFor then new else Var a var LamAbs a var ty body -> LamAbs a var ty (goUnder var body) + Fix a rec ty body -> Fix a rec ty (goUnder rec body) t -> t & over termSubterms go goUnder var term = if var == varFor then term else go term @@ -200,6 +201,7 @@ termMapNames f g = go go :: Term tyname name uni fun ann -> Term tyname' name' uni fun ann go = \case LamAbs ann name ty body -> LamAbs ann (g name) (typeMapNames f ty) (go body) + Fix ann name ty body -> Fix ann (g name) (typeMapNames f ty) (go body) TyAbs ann tyname k body -> TyAbs ann (f tyname) k (go body) Var ann name -> Var ann (g name) Apply ann t1 t2 -> Apply ann (go t1) (go t2) @@ -232,6 +234,7 @@ fvTermCtx fvTermCtx bound f = \case Var a n -> Var a <$> (if USet.memberByName n bound then pure n else f n) LamAbs a n ty t -> LamAbs a n ty <$> fvTermCtx (USet.insertByName n bound) f t + Fix a n ty t -> Fix a n ty <$> fvTermCtx (USet.insertByName n bound) f t t -> (termSubterms . fvTermCtx bound) f t -- | Get all the free type variables in a term. diff --git a/plutus-core/plutus-core/src/PlutusCore/TypeCheck/Internal.hs b/plutus-core/plutus-core/src/PlutusCore/TypeCheck/Internal.hs index a8675b1ccf4..04ab2d9bd03 100644 --- a/plutus-core/plutus-core/src/PlutusCore/TypeCheck/Internal.hs +++ b/plutus-core/plutus-core/src/PlutusCore/TypeCheck/Internal.hs @@ -443,7 +443,7 @@ inferTypeM (Builtin ann fun) = inferTypeM (Var ann name) = lookupVarM ann name --- [check| G !- dom :: *] dom ~> vDom [infer| G , n : dom !- body : vCod] +-- [check| G !- dom :: *] dom ~> vDom [infer| G , n : vDom !- body : vCod] -- ---------------------------------------------------------------------------- -- [infer| G !- lam n dom body : vDom -> vCod] inferTypeM (LamAbs ann n dom body) = do @@ -451,6 +451,15 @@ inferTypeM (LamAbs ann n dom body) = do vDom <- normalizeTypeM $ void dom TyFun () <<$>> pure vDom <<*>> withVar n vDom (inferTypeM body) +-- [check| G !- ty :: *] ty ~> vTy [check| G , rec : vTy !- body : vTy] +-- ---------------------------------------------------------------------------- +-- [infer| G !- fix rec ty body : vTy] +inferTypeM (Fix ann rec ty body) = do + checkKindM ann ty $ Type () + vTy <- normalizeTypeM $ void ty + withVar rec vTy $ checkTypeM ann body vTy + pure vTy + -- [infer| G , n :: nK !- body : vBodyTy] -- --------------------------------------------------- -- [infer| G !- abs n nK body : all (n :: nK) vBodyTy] diff --git a/plutus-core/plutus-core/stdlib/PlutusCore/StdLib/Data/Function.hs b/plutus-core/plutus-core/stdlib/PlutusCore/StdLib/Data/Function.hs index 4bce9452545..68c5b7e6d99 100644 --- a/plutus-core/plutus-core/stdlib/PlutusCore/StdLib/Data/Function.hs +++ b/plutus-core/plutus-core/stdlib/PlutusCore/StdLib/Data/Function.hs @@ -152,8 +152,7 @@ unroll = runQuote $ do -- | 'fix' as a PLC term. -- -- > /\(a b :: *) -> \(f : (a -> b) -> a -> b) -> --- > unroll {a -> b} (iwrap selfF (a -> b) \(s : self (a -> b)) -> --- > f (\(x : a) -> unroll {a -> b} s x)) +-- > Fix [a] rec (\(x : a) -> f rec x) -- -- See @plutus/runQuote $ docs/fomega/z-combinator-benchmarks@ for details. fix :: TermLike term TyName Name uni fun => term () @@ -161,30 +160,24 @@ fix = fst fixAndType fixAndType :: TermLike term TyName Name uni fun => (term (), Type TyName uni ()) fixAndType = runQuote $ do - let RecursiveType self wrapSelf = selfData a <- freshTyName "a" b <- freshTyName "b" f <- freshName "f" - s <- freshName "s" + rec <- freshName "rec" x <- freshName "x" let funAB = TyFun () (TyVar () a) $ TyVar () b - unrollFunAB = tyInst () unroll funAB - let selfFunAB = TyApp () self funAB - let fixTerm = - tyAbs () a (Type ()) + fixTerm + = tyAbs () a (Type ()) . tyAbs () b (Type ()) . lamAbs () f (TyFun () funAB funAB) - . apply () unrollFunAB - . wrapSelf [funAB] - . lamAbs () s selfFunAB - . apply () (var () f) + . mkFix () rec (TyFun () (TyVar () a) $ TyVar () b) . lamAbs () x (TyVar () a) - $ mkIterAppNoAnn unrollFunAB - [ var () s + $ mkIterAppNoAnn (var () f) + [ var () rec , var () x ] - let fixType = - TyForall () a (Type ()) + fixType + = TyForall () a (Type ()) . TyForall () b (Type ()) $ TyFun () (TyFun () funAB funAB) funAB pure (fixTerm, fixType) diff --git a/plutus-core/plutus-core/test/CostModelInterface/Spec.hs b/plutus-core/plutus-core/test/CostModelInterface/Spec.hs index 7f7e4b042a6..26d8eacc59a 100644 --- a/plutus-core/plutus-core/test/CostModelInterface/Spec.hs +++ b/plutus-core/plutus-core/test/CostModelInterface/Spec.hs @@ -60,6 +60,7 @@ randomCekCosts = , cekBuiltinCost = pure $ ExBudget 4 4 , cekConstrCost = pure $ ExBudget 8 100000 , cekCaseCost = pure $ ExBudget 3324234 555 + , cekFixCost = pure $ ExBudget 13 4236247 } cekVarCostCpuKey :: Text.Text diff --git a/plutus-core/plutus-core/test/CostModelSafety/Spec.hs b/plutus-core/plutus-core/test/CostModelSafety/Spec.hs index d42f2b8482d..3bd41c70bd0 100644 --- a/plutus-core/plutus-core/test/CostModelSafety/Spec.hs +++ b/plutus-core/plutus-core/test/CostModelSafety/Spec.hs @@ -75,6 +75,7 @@ testMachineCostModel ( cekBuiltinBudget cekConstrBudget cekCaseBudget + cekFixBudget ) = do checkBudget cekStartupBudget checkBudget cekVarBudget @@ -86,6 +87,7 @@ testMachineCostModel ( checkBudget cekBuiltinBudget checkBudget cekConstrBudget checkBudget cekCaseBudget + checkBudget cekFixBudget -- Builtin costs diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/Data/ofoldrData.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/Data/ofoldrData.golden index 33b468c073f..8b01517ad01 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/Data/ofoldrData.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/Data/ofoldrData.golden @@ -4,27 +4,7 @@ (fI : integer -> data) (fB : bytestring -> data) -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {data} {data} (\(rec : data -> data) (d : data) -> @@ -45,36 +25,7 @@ \(f : a -> a) -> (/\a b -> \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : - (\a -> - ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> - ifix - (\(self :: * -> *) a -> self a -> a) - a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> - ifix - (\(self :: * -> *) a -> - self a -> a) - a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + fix (rec : a -> b). \(x : a) -> f rec x) {list a} {list a} (\(rec : list a -> list a) (xs : list a) -> @@ -98,36 +49,7 @@ \(f : a -> a) -> (/\a b -> \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : - (\a -> - ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> - ifix - (\(self :: * -> *) a -> self a -> a) - a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> - ifix - (\(self :: * -> *) a -> - self a -> a) - a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + fix (rec : a -> b). \(x : a) -> f rec x) {list a} {list a} (\(rec : list a -> list a) (xs : list a) -> @@ -159,36 +81,7 @@ \(f : a -> a) -> (/\a b -> \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : - (\a -> - ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> - ifix - (\(self :: * -> *) a -> self a -> a) - a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> - ifix - (\(self :: * -> *) a -> - self a -> a) - a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + fix (rec : a -> b). \(x : a) -> f rec x) {list a} {list a} (\(rec : list a -> list a) (xs : list a) -> diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/Data/ofoldrDataViaChoose.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/Data/ofoldrDataViaChoose.golden index 636f336ba62..aa14a1b3ea5 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/Data/ofoldrDataViaChoose.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/Data/ofoldrDataViaChoose.golden @@ -4,27 +4,7 @@ (fI : integer -> data) (fB : bytestring -> data) -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {data} {data} (\(rec : data -> data) (d : data) -> @@ -61,36 +41,7 @@ \(f : a -> a) -> (/\a b -> \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : - (\a -> - ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> - ifix - (\(self :: * -> *) a -> self a -> a) - a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> - ifix - (\(self :: * -> *) a -> - self a -> a) - a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + fix (rec : a -> b). \(x : a) -> f rec x) {list a} {list a} (\(rec : list a -> list a) (xs : list a) -> @@ -123,36 +74,7 @@ \(f : a -> a) -> (/\a b -> \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : - (\a -> - ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> - ifix - (\(self :: * -> *) a -> self a -> a) - a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> - ifix - (\(self :: * -> *) a -> - self a -> a) - a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + fix (rec : a -> b). \(x : a) -> f rec x) {list a} {list a} (\(rec : list a -> list a) (xs : list a) -> @@ -193,36 +115,7 @@ \(f : a -> a) -> (/\a b -> \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : - (\a -> - ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> - ifix - (\(self :: * -> *) a -> self a -> a) - a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> - ifix - (\(self :: * -> *) a -> - self a -> a) - a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + fix (rec : a -> b). \(x : a) -> f rec x) {list a} {list a} (\(rec : list a -> list a) (xs : list a) -> diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/Function/unsafeCoerce.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/Function/unsafeCoerce.golden index 0702f1af1fa..cec72a28198 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/Function/unsafeCoerce.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/Function/unsafeCoerce.golden @@ -1,26 +1,6 @@ /\a b -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {a} {b} ((/\a -> \(x : a) -> x) {a -> b}) \ No newline at end of file diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/InterList/FoldrInterList.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/InterList/FoldrInterList.golden index 5058d31e10a..f927ec0310c 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/InterList/FoldrInterList.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/InterList/FoldrInterList.golden @@ -1,27 +1,7 @@ /\a0 b0 r -> \(f : a0 -> b0 -> r -> r) (z : r) -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {unit} {all a b. (a -> b -> r -> r) -> diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/List/omapList.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/List/omapList.golden index b144dc1fb37..40800298f89 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/List/omapList.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/List/omapList.golden @@ -1,27 +1,7 @@ /\a -> \(f : a -> a) -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {list a} {list a} (\(rec : list a -> list a) (xs : list a) -> diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/List/omapListViaChoose.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/List/omapListViaChoose.golden index aec3db7bb39..d47d0e4fc6d 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/List/omapListViaChoose.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/Examples/List/omapListViaChoose.golden @@ -1,27 +1,7 @@ /\a -> \(f : a -> a) -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {list a} {list a} (\(rec : list a -> list a) (xs : list a) -> diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Function/Fix.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Function/Fix.golden index 499fa00bca6..2633a92b6a4 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Function/Fix.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Function/Fix.golden @@ -1,20 +1 @@ -/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x))) \ No newline at end of file +/\a b -> \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x \ No newline at end of file diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Function/Fix2.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Function/Fix2.golden index 9417830ea5c..b0650287cbd 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Function/Fix2.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Function/Fix2.golden @@ -4,29 +4,7 @@ \(by : (all Q. F Q -> Q) -> (all Q. F Q -> Q)) -> (/\a b -> \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> - ifix - (\(self :: * -> *) a -> self a -> a) - a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + fix (rec : a -> b). \(x : a) -> f rec x) {all Q. F Q -> F Q} {all Q. F Q -> Q} (\(rec : (all Q. F Q -> F Q) -> (all Q. F Q -> Q)) diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/List/FoldList.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/List/FoldList.golden index b189de0133d..d78afcfa9e6 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/List/FoldList.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/List/FoldList.golden @@ -1,27 +1,7 @@ /\a r -> \(f : r -> a -> r) -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {r} {list a -> r} (\(rec : r -> list a -> r) (z : r) (xs : list a) -> diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/List/FoldListViaChoose.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/List/FoldListViaChoose.golden index f3a62eba26a..45c0e342ecc 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/List/FoldListViaChoose.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/List/FoldListViaChoose.golden @@ -1,27 +1,7 @@ /\a r -> \(f : r -> a -> r) -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {r} {list a -> r} (\(rec : r -> list a -> r) (z : r) (xs : list a) -> diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/List/FoldrList.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/List/FoldrList.golden index 2df355561de..352743a5bf3 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/List/FoldrList.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/List/FoldrList.golden @@ -1,27 +1,7 @@ /\a r -> \(f : a -> r -> r) (z : r) -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {list a} {r} (\(rec : list a -> r) (xs : list a) -> diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/List/FoldrListViaChoose.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/List/FoldrListViaChoose.golden index eb67b42b988..777cb04e1d2 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/List/FoldrListViaChoose.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/List/FoldrListViaChoose.golden @@ -1,27 +1,7 @@ /\a r -> \(f : a -> r -> r) (z : r) -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {list a} {r} (\(rec : list a -> r) (xs : list a) -> diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Nat/FoldNat.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Nat/FoldNat.golden index 31683a998e7..9d2e4a3f815 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Nat/FoldNat.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Nat/FoldNat.golden @@ -1,27 +1,7 @@ /\r -> \(f : r -> r) -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {r} {ifix (\(rec :: (* -> *) -> *) (f :: * -> *) -> f (rec f)) diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Nat/FoldrNat.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Nat/FoldrNat.golden index 663de76031d..c1899b7e694 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Nat/FoldrNat.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Nat/FoldrNat.golden @@ -1,27 +1,7 @@ /\r -> \(f : r -> r) (z : r) -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {ifix (\(rec :: (* -> *) -> *) (f :: * -> *) -> f (rec f)) (\nat -> all r. r -> (nat -> r) -> r)} diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Nat/NatToInteger.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Nat/NatToInteger.golden index d3cd1f5de80..709c085561e 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Nat/NatToInteger.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/Nat/NatToInteger.golden @@ -1,28 +1,7 @@ (/\r -> \(f : r -> r) -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> - ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {r} {ifix (\(rec :: (* -> *) -> *) (f :: * -> *) -> f (rec f)) diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/EnumFromTo.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/EnumFromTo.golden index 518484f8068..28dc9feaa19 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/EnumFromTo.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/EnumFromTo.golden @@ -1,26 +1,6 @@ \(n : integer) (m : integer) -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {integer} {(\a -> ifix (\(list :: * -> *) a -> all r. r -> (a -> list a -> r) -> r) a) integer} diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/FoldList.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/FoldList.golden index eeb3c82f0e9..6779f155a7d 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/FoldList.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/FoldList.golden @@ -1,27 +1,7 @@ /\a r -> \(f : r -> a -> r) -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {r} {(\a -> ifix (\(list :: * -> *) a -> all r. r -> (a -> list a -> r) -> r) a) diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/FoldrList.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/FoldrList.golden index 34adc020054..34034c5f0c0 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/FoldrList.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/FoldrList.golden @@ -1,27 +1,7 @@ /\a r -> \(f : a -> r -> r) (z : r) -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {(\a -> ifix (\(list :: * -> *) a -> all r. r -> (a -> list a -> r) -> r) a) a} diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/Product.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/Product.golden index 8184be46715..1d813ae863a 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/Product.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/Product.golden @@ -1,28 +1,7 @@ (/\a r -> \(f : r -> a -> r) -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> - ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {r} {(\a -> ifix (\(list :: * -> *) a -> all r. r -> (a -> list a -> r) -> r) a) diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/Reverse.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/Reverse.golden index 1eb467a2a2b..48000a8a209 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/Reverse.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/Reverse.golden @@ -7,29 +7,7 @@ \(f : r -> a -> r) -> (/\a b -> \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> - ifix - (\(self :: * -> *) a -> self a -> a) - a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + fix (rec : a -> b). \(x : a) -> f rec x) {r} {(\a -> ifix diff --git a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/Sum.golden b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/Sum.golden index 0e927abe33a..e06090d1e53 100644 --- a/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/Sum.golden +++ b/plutus-core/plutus-core/test/Pretty/Golden/Readable/StdLib/Data/ScottList/Sum.golden @@ -1,28 +1,7 @@ (/\a r -> \(f : r -> a -> r) -> (/\a b -> - \(f : (a -> b) -> a -> b) -> - (/\a -> - \(s : (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) a) -> - unwrap s s) - {a -> b} - (iwrap - (\(self :: * -> *) a -> self a -> a) - (a -> b) - (\(s : - (\a -> ifix (\(self :: * -> *) a -> self a -> a) a) - (a -> b)) -> - f - (\(x : a) -> - (/\a -> - \(s : - (\a -> - ifix (\(self :: * -> *) a -> self a -> a) a) - a) -> - unwrap s s) - {a -> b} - s - x)))) + \(f : (a -> b) -> a -> b) -> fix (rec : a -> b). \(x : a) -> f rec x) {r} {(\a -> ifix (\(list :: * -> *) a -> all r. r -> (a -> list a -> r) -> r) a) diff --git a/plutus-core/plutus-ir/src/PlutusIR/Analysis/VarInfo.hs b/plutus-core/plutus-ir/src/PlutusIR/Analysis/VarInfo.hs index b496af2a194..9be714e7449 100644 --- a/plutus-core/plutus-ir/src/PlutusIR/Analysis/VarInfo.hs +++ b/plutus-core/plutus-ir/src/PlutusIR/Analysis/VarInfo.hs @@ -89,6 +89,9 @@ termVarInfo = \case LamAbs _ n ty t -> VarsInfo (UMap.insertByName n (NormalVar Strict ty Nothing) mempty) mempty <> termVarInfo t + Fix _ n ty t -> + VarsInfo (UMap.insertByName n (NormalVar Strict ty Nothing) mempty) mempty + <> termVarInfo t TyAbs _ n _ t -> VarsInfo mempty (UMap.insertByName n NormalTyVar mempty) <> termVarInfo t diff --git a/plutus-core/plutus-ir/src/PlutusIR/Compiler/Lower.hs b/plutus-core/plutus-ir/src/PlutusIR/Compiler/Lower.hs index aa3b8727df2..b1b87bdf067 100644 --- a/plutus-core/plutus-ir/src/PlutusIR/Compiler/Lower.hs +++ b/plutus-core/plutus-ir/src/PlutusIR/Compiler/Lower.hs @@ -20,6 +20,7 @@ lowerTerm = \case Var x n -> pure $ PLC.Var x n TyAbs x n k t -> PLC.TyAbs x n k <$> lowerTerm t LamAbs x n ty t -> PLC.LamAbs x n ty <$> lowerTerm t + Fix x n ty t -> PLC.Fix x n ty <$> lowerTerm t Apply x t1 t2 -> PLC.Apply x <$> lowerTerm t1 <*> lowerTerm t2 Constant x c -> pure $ PLC.Constant x c Builtin x bi -> pure $ PLC.Builtin x bi diff --git a/plutus-core/plutus-ir/src/PlutusIR/Core/Instance/Pretty/Readable.hs b/plutus-core/plutus-ir/src/PlutusIR/Core/Instance/Pretty/Readable.hs index e30f639fbae..7683397180b 100644 --- a/plutus-core/plutus-ir/src/PlutusIR/Core/Instance/Pretty/Readable.hs +++ b/plutus-core/plutus-ir/src/PlutusIR/Core/Instance/Pretty/Readable.hs @@ -105,6 +105,7 @@ instance (PrettyConstraints configName tyname name uni, Pretty fun) iterAppDocM $ \_ prettyArg -> "constr" :| [prettyArg ty, prettyArg i, prettyArg es] Case _ ty arg cs -> iterAppDocM $ \_ prettyArg -> "case" :| [prettyArg ty, prettyArg arg, prettyArg cs] + Fix ann name ty body -> fixPrettyM (VarDecl ann name ty) body instance (PrettyConstraints configName tyname name uni, Pretty fun) => PrettyBy (PrettyConfigReadable configName) (Program tyname name uni fun a) where diff --git a/plutus-core/plutus-ir/src/PlutusIR/Core/Plated.hs b/plutus-core/plutus-ir/src/PlutusIR/Core/Plated.hs index 725de4d5b51..326561a49e6 100644 --- a/plutus-core/plutus-ir/src/PlutusIR/Core/Plated.hs +++ b/plutus-core/plutus-ir/src/PlutusIR/Core/Plated.hs @@ -134,6 +134,8 @@ termConstants f term0 = case term0 of Builtin{} -> pure term0 Constr{} -> pure term0 Case{} -> pure term0 + Fix{} -> pure term0 +{-# INLINE termConstants #-} -- | Get all the direct child 'Kind's of the given 'Term'. termSubkinds :: Traversal' (Term tyname name uni fun ann) (Kind ann) @@ -151,6 +153,7 @@ termSubkinds f term0 = case term0 of Builtin{} -> pure term0 Constr{} -> pure term0 Case{} -> pure term0 + Fix{} -> pure term0 {-# INLINE termSubkinds #-} -- | Get all the direct child 'Term's of the given 'Term', including those within 'Binding's. @@ -165,6 +168,7 @@ termSubterms f = \case Unwrap x t -> Unwrap x <$> f t Constr x ty i es -> Constr x ty i <$> traverse f es Case x ty arg cs -> Case x ty <$> f arg <*> traverse f cs + Fix x n ty t -> Fix x n ty <$> f t e@Error {} -> pure e v@Var {} -> pure v c@Constant {} -> pure c @@ -180,6 +184,7 @@ termSubtypes :: Traversal' (Term tyname name uni fun a) (Type tyname uni a) termSubtypes f = \case Let x r bs t -> Let x r <$> (traverse . bindingSubtypes) f bs <*> pure t LamAbs x n ty t -> LamAbs x n <$> f ty <*> pure t + Fix x n ty t -> Fix x n <$> f ty <*> pure t TyInst x t ty -> TyInst x t <$> f ty IWrap x ty1 ty2 t -> IWrap x <$> f ty1 <*> f ty2 <*> pure t Error x ty -> Error x <$> f ty @@ -213,6 +218,7 @@ termUniques f = \case Var ann n -> PLC.theUnique f n <&> Var ann TyAbs ann tn k t -> PLC.theUnique f tn <&> \tn' -> TyAbs ann tn' k t LamAbs ann n ty t -> PLC.theUnique f n <&> \n' -> LamAbs ann n' ty t + Fix ann n ty t -> PLC.theUnique f n <&> \n' -> Fix ann n' ty t a@Apply{} -> pure a c@Constant{} -> pure c b@Builtin{} -> pure b diff --git a/plutus-core/plutus-ir/src/PlutusIR/Core/Type.hs b/plutus-core/plutus-ir/src/PlutusIR/Core/Type.hs index 3a9fa6c785b..329262b632d 100644 --- a/plutus-core/plutus-ir/src/PlutusIR/Core/Type.hs +++ b/plutus-core/plutus-ir/src/PlutusIR/Core/Type.hs @@ -150,6 +150,7 @@ data Term tyname name uni fun a | -- See Note [Constr tag type] Constr a (Type tyname uni a) Word64 [Term tyname name uni fun a] | Case a (Type tyname uni a) (Term tyname name uni fun a) [Term tyname name uni fun a] + | Fix a name (Type tyname uni a) (Term tyname name uni fun a) deriving stock (Functor, Generic) deriving stock instance @@ -189,6 +190,7 @@ instance TermLike (Term tyname name uni fun) tyname name uni fun where error = Error constr = Constr kase = Case + mkFix = Fix termLet x (Def vd bind) = Let x NonRec (pure $ TermBind x Strict vd bind) typeLet x (Def vd bind) = Let x NonRec (pure $ TypeBind x vd bind) @@ -250,6 +252,7 @@ termAnn = \case Unwrap a _ -> a Constr a _ _ _ -> a Case a _ _ _ -> a + Fix a _ _ _ -> a bindingAnn :: Binding tyname name uni fun a -> a bindingAnn = \case diff --git a/plutus-core/plutus-ir/src/PlutusIR/Subst.hs b/plutus-core/plutus-ir/src/PlutusIR/Subst.hs index 08f942f4612..cee72c683e3 100644 --- a/plutus-core/plutus-ir/src/PlutusIR/Subst.hs +++ b/plutus-core/plutus-ir/src/PlutusIR/Subst.hs @@ -48,6 +48,7 @@ fvTermCtx bound f = \case in Let a r <$> traverse (fvBindingCtx bound f) bs <*> fvTermCtx bound' f tIn Var a n -> Var a <$> (if USet.memberByName n bound then pure n else f n) LamAbs a n ty t -> LamAbs a n ty <$> fvTermCtx (USet.insertByName n bound) f t + Fix a n ty t -> Fix a n ty <$> fvTermCtx (USet.insertByName n bound) f t t -> (termSubterms . fvTermCtx bound) f t -- | Get all the free type variables in a PIR term. diff --git a/plutus-core/plutus-ir/src/PlutusIR/Transform/Inline/Utils.hs b/plutus-core/plutus-ir/src/PlutusIR/Transform/Inline/Utils.hs index 45720564ff2..ad305e3d7b7 100644 --- a/plutus-core/plutus-ir/src/PlutusIR/Transform/Inline/Utils.hs +++ b/plutus-core/plutus-ir/src/PlutusIR/Transform/Inline/Utils.hs @@ -343,6 +343,7 @@ costIsAcceptable = \case -- This will mean that we create closures at each use site instead of -- once, but that's a very low cost which we're okay rounding to 0. LamAbs{} -> True + Fix{} -> True TyAbs{} -> True -- Inlining constructors of size 1 or 0 seems okay, but does result in doing @@ -371,6 +372,7 @@ sizeIsAcceptable inlineConstants = \case Var{} -> True Error{} -> True LamAbs {} -> False + Fix {} -> False TyAbs {} -> False -- Inlining constructors of size 1 or 0 seems okay diff --git a/plutus-core/plutus-ir/src/PlutusIR/Transform/LetFloatIn.hs b/plutus-core/plutus-ir/src/PlutusIR/Transform/LetFloatIn.hs index 6c46a4ee323..978e7cf691a 100644 --- a/plutus-core/plutus-ir/src/PlutusIR/Transform/LetFloatIn.hs +++ b/plutus-core/plutus-ir/src/PlutusIR/Transform/LetFloatIn.hs @@ -247,6 +247,10 @@ floatTerm binfo relaxed t0 = let ty = goType ty0 body = go body0 in LamAbs (a, typeUniqs ty <> termUniqs body) n ty body + Fix a n ty0 body0 -> + let ty = goType ty0 + body = go body0 + in Fix (a, typeUniqs ty <> termUniqs body) n ty body TyAbs a n k body0 -> let body = go body0 in TyAbs (a, termUniqs body) n (noUniq k) body diff --git a/plutus-core/plutus-ir/src/PlutusIR/Transform/LetFloatOut.hs b/plutus-core/plutus-ir/src/PlutusIR/Transform/LetFloatOut.hs index 74f42fff6bc..ea0a94bb57a 100644 --- a/plutus-core/plutus-ir/src/PlutusIR/Transform/LetFloatOut.hs +++ b/plutus-core/plutus-ir/src/PlutusIR/Transform/LetFloatOut.hs @@ -206,6 +206,7 @@ mark binfo tm = snd $ runWriter $ flip runReaderT (MarkCtx topDepth mempty binfo where go :: Term tyname name uni fun a -> ReaderT (MarkCtx tyname name uni fun a) (Writer Marks) () go = breakNonRec >>> \case + -- TODO: handle Fix? -- lam/Lam are treated the same. LamAbs _ n _ tBody -> withLam n $ go tBody TyAbs _ n _ tBody -> withAbs n $ go tBody @@ -304,6 +305,7 @@ removeLets marks term = runWriter $ go term TyInst a t ty -> TyInst a <$> go t <*> pure ty TyAbs a tyname k t -> TyAbs a tyname k <$> go t LamAbs a name ty t -> LamAbs a name ty <$> go t + Fix a name ty t -> Fix a name ty <$> go t IWrap a ty1 ty2 t -> IWrap a ty1 ty2 <$> go t Unwrap a t -> Unwrap a <$> go t Constr a ty i es -> Constr a ty i <$> traverse go es @@ -335,6 +337,7 @@ floatBackLets term fTable = goTop = floatLam topUnique <=< go go = \case + -- TODO: handle fix? -- lam anchor, increase depth & try to float inside the lam's body LamAbs a n ty tBody -> local (+1) $ LamAbs a n ty <$> (floatLam (n^.PLC.theUnique) =<< go tBody) diff --git a/plutus-core/plutus-ir/src/PlutusIR/Transform/Rename.hs b/plutus-core/plutus-ir/src/PlutusIR/Transform/Rename.hs index e6b396773ed..4aeb7e8f602 100644 --- a/plutus-core/plutus-ir/src/PlutusIR/Transform/Rename.hs +++ b/plutus-core/plutus-ir/src/PlutusIR/Transform/Rename.hs @@ -362,6 +362,9 @@ renameTermM = \case LamAbs x name ty body -> PLC.withFreshenedName name $ \nameFr -> LamAbs x nameFr <$> PLC.renameTypeM ty <*> renameTermM body + Fix x rec ty body -> + PLC.withFreshenedName rec $ \recFr -> + Fix x recFr <$> PLC.renameTypeM ty <*> renameTermM body Apply x fun arg -> Apply x <$> renameTermM fun <*> renameTermM arg Constant x con -> diff --git a/plutus-core/plutus-ir/src/PlutusIR/TypeCheck/Internal.hs b/plutus-core/plutus-ir/src/PlutusIR/TypeCheck/Internal.hs index e990b6f5df8..7c8d5b1ddcd 100644 --- a/plutus-core/plutus-ir/src/PlutusIR/TypeCheck/Internal.hs +++ b/plutus-core/plutus-ir/src/PlutusIR/TypeCheck/Internal.hs @@ -159,7 +159,7 @@ inferTypeM (Builtin ann bn) = inferTypeM (Var ann name) = lookupVarM ann name --- [check| G !- dom :: *] dom ~> vDom [infer| G , n : dom !- body : vCod] +-- [check| G !- dom :: *] dom ~> vDom [infer| G , n : vDom !- body : vCod] -- ---------------------------------------------------------------------------- -- [infer| G !- lam n dom body : vDom -> vCod] inferTypeM (LamAbs ann n dom body) = do @@ -167,6 +167,15 @@ inferTypeM (LamAbs ann n dom body) = do vDom <- normalizeTypeM $ void dom TyFun () <<$>> pure vDom <<*>> withVar n vDom (inferTypeM body) +-- [check| G !- ty :: *] ty ~> vTy [check| G , rec : vTy !- body : vTy] +-- ---------------------------------------------------------------------------- +-- [infer| G !- fix rec ty body : vTy] +inferTypeM (Fix ann rec ty body) = do + checkKindM ann ty $ Type () + vTy <- normalizeTypeM $ void ty + withVar rec vTy $ checkTypeM ann body vTy + pure vTy + -- [infer| G , n :: nK !- body : vBodyTy] -- --------------------------------------------------- -- [infer| G !- abs n nK body : all (n :: nK) vBodyTy] diff --git a/plutus-core/testlib/PlutusCore/Generators/Hedgehog/Interesting.hs b/plutus-core/testlib/PlutusCore/Generators/Hedgehog/Interesting.hs index 427279aa8da..6488f6ed9e0 100644 --- a/plutus-core/testlib/PlutusCore/Generators/Hedgehog/Interesting.hs +++ b/plutus-core/testlib/PlutusCore/Generators/Hedgehog/Interesting.hs @@ -88,41 +88,33 @@ factorial = runQuote $ do -- | The naive exponential fibonacci function as a PLC term. -- --- > \(i0 : integer) -> --- > fix {integer} {integer} --- > (\(rec : integer -> integer) (i : integer) -> --- > ifThenElse {integer} --- > (lessThanEqInteger i 1) --- > (\(u : unit) -> i) --- > (\(u : unit) -> addInteger --- > (rec (subtractInteger i 1)) --- > (rec (subtractInteger i 2))) --- > i0 +-- > fix [integer] rec (\(i : integer) -> +-- > ifThenElse {integer} +-- > (lessThanEqInteger i 1) +-- > (\(u : unit) -> i) +-- > (\(u : unit) -> addInteger +-- > (rec (subtractInteger i 1)) +-- > (rec (subtractInteger i 2)))) naiveFib :: Integer -> Term TyName Name DefaultUni DefaultFun () naiveFib iv = runQuote $ do - i0 <- freshName "i0" rec <- freshName "rec" i <- freshName "i" u <- freshName "u" let intS = mkTyBuiltin @_ @Integer () - fib = LamAbs () i0 intS - $ mkIterAppNoAnn (mkIterInstNoAnn fix [intS, intS]) - [ LamAbs () rec (TyFun () intS intS) - . LamAbs () i intS - $ mkIterAppNoAnn (TyInst () ifThenElse intS) - [ mkIterAppNoAnn (Builtin () LessThanEqualsInteger) + fib = Fix () rec (TyFun () intS intS) + . LamAbs () i intS + $ mkIterAppNoAnn (TyInst () ifThenElse intS) + [ mkIterAppNoAnn (Builtin () LessThanEqualsInteger) + [Var () i, mkConstant @Integer () 1] + , LamAbs () u unit $ Var () i + , LamAbs () u unit $ mkIterAppNoAnn (Builtin () AddInteger) + [ Apply () (Var () rec) $ mkIterAppNoAnn (Builtin () SubtractInteger) [Var () i, mkConstant @Integer () 1] - , LamAbs () u unit $ Var () i - , LamAbs () u unit $ mkIterAppNoAnn (Builtin () AddInteger) - [ Apply () (Var () rec) $ mkIterAppNoAnn (Builtin () SubtractInteger) - [Var () i, mkConstant @Integer () 1] - , Apply () (Var () rec) $ mkIterAppNoAnn (Builtin () SubtractInteger) - [Var () i, mkConstant @Integer () 2] - ] + , Apply () (Var () rec) $ mkIterAppNoAnn (Builtin () SubtractInteger) + [Var () i, mkConstant @Integer () 2] ] - , Var () i0 - ] + ] pure . Apply () fib $ mkConstant @Integer () iv -- | Generate a term that computes the factorial of an @integer@ and return it diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Analysis/Definitions.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Analysis/Definitions.hs index 343f2070244..a962eb0ec9a 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Analysis/Definitions.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Analysis/Definitions.hs @@ -40,6 +40,8 @@ handleTerm = \case addUsage n ann TermScope LamAbs ann n _ -> addDef n ann TermScope + Fix ann n _ -> + addDef n ann TermScope _ -> pure () runTermDefs diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Instance/Eq.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Instance/Eq.hs index 64d617ad9d0..5abb370904d 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Instance/Eq.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Instance/Eq.hs @@ -85,6 +85,9 @@ eqTermM (Var ann1 name1) (Var ann2 name2) = do eqTermM (LamAbs ann1 name1 body1) (LamAbs ann2 name2 body2) = do eqM ann1 ann2 withTwinBindings name1 name2 $ eqTermM body1 body2 +eqTermM (Fix ann1 name1 body1) (Fix ann2 name2 body2) = do + eqM ann1 ann2 + withTwinBindings name1 name2 $ eqTermM body1 body2 eqTermM (Apply ann1 fun1 arg1) (Apply ann2 fun2 arg2) = do eqM ann1 ann2 eqTermM fun1 fun2 @@ -116,5 +119,6 @@ eqTermM Apply{} _ = empty eqTermM Delay{} _ = empty eqTermM Force{} _ = empty eqTermM Error{} _ = empty -eqTermM Constr{} _ = empty -eqTermM Case{} _ = empty +eqTermM Constr{} _ = empty +eqTermM Case{} _ = empty +eqTermM Fix{} _ = empty diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Instance/Flat.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Instance/Flat.hs index 307163b5907..17ca88ddcb7 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Instance/Flat.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Instance/Flat.hs @@ -124,6 +124,7 @@ encodeTerm = \case Builtin ann bn -> encodeTermTag 7 <> encode ann <> encode bn Constr ann i es -> encodeTermTag 8 <> encode ann <> encode i <> encodeListWith encodeTerm es Case ann arg cs -> encodeTermTag 9 <> encode ann <> encodeTerm arg <> encodeListWith encodeTerm (V.toList cs) + Fix ann n t -> encodeTermTag 10 <> encode ann <> encode (Binder n) <> encodeTerm t decodeTerm :: forall name uni fun ann @@ -161,6 +162,7 @@ decodeTerm version builtinPred = go handleTerm 9 = do unless (version >= PLC.plcVersion110) $ fail $ "'case' is not allowed before version 1.1.0, this program has version: " ++ (show $ pretty version) Case <$> decode <*> go <*> (V.fromList <$> decodeListWith go) + handleTerm 10 = Fix <$> decode <*> (unBinder <$> decode) <*> go handleTerm t = fail $ "Unknown term constructor tag: " ++ show t sizeTerm @@ -182,6 +184,7 @@ sizeTerm tm sz = Var ann n -> size ann $ size n sz' Delay ann t -> size ann $ sizeTerm t sz' LamAbs ann n t -> size ann $ size n $ sizeTerm t sz' + Fix ann n t -> size ann $ size n $ sizeTerm t sz' Apply ann t t' -> size ann $ sizeTerm t $ sizeTerm t' sz' Constant ann c -> size ann $ size c sz' Force ann t -> size ann $ sizeTerm t sz' diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Instance/Pretty/Readable.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Instance/Pretty/Readable.hs index 681d1c81ea6..08012be9633 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Instance/Pretty/Readable.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Instance/Pretty/Readable.hs @@ -53,6 +53,7 @@ instance Constr _ i es -> iterAppDocM $ \_ prettyArg -> ("constr" <+> prettyArg i) :| [prettyArg es] Case _ arg cs -> iterAppDocM $ \_ prettyArg -> "case" :| [prettyArg arg, prettyArg (toList cs)] + Fix _ name body -> fixPrettyM name body instance (PrettyReadableBy configName (Term name uni fun a)) => diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Plated.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Plated.hs index bb2683bbd16..16349d7eb94 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Plated.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Plated.hs @@ -32,6 +32,7 @@ termConstants f term0 = case term0 of Builtin{} -> pure term0 Constr{} -> pure term0 Case{} -> pure term0 + Fix{} -> pure term0 -- | Get all the direct child 'name a's of the given 'Term' from 'LamAbs'es. termBinds :: Traversal' (Term name uni fun ann) name @@ -61,6 +62,7 @@ termSubterms f = \case Force ann t -> Force ann <$> f t Constr ann i args -> Constr ann i <$> traverse f args Case ann arg cs -> Case ann <$> f arg <*> traverse f cs + Fix ann n t -> Fix ann n <$> f t e@Error {} -> pure e v@Var {} -> pure v c@Constant {} -> pure c diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Type.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Type.hs index 9815d9b29fe..cfea836c533 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Type.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Type.hs @@ -87,6 +87,7 @@ data Term name uni fun ann -- See Note [Constr tag type] | Constr !ann !Word64 ![Term name uni fun ann] | Case !ann !(Term name uni fun ann) !(Vector (Term name uni fun ann)) + | Fix !ann !name !(Term name uni fun ann) deriving stock (Functor, Generic) deriving stock instance (Show name, GShow uni, Everywhere uni Show, Show fun, Show ann, Closed uni) @@ -154,6 +155,7 @@ termAnn (Force ann _) = ann termAnn (Error ann) = ann termAnn (Constr ann _ _) = ann termAnn (Case ann _ _) = ann +termAnn (Fix ann _ _) = ann bindFunM :: Monad m @@ -171,6 +173,7 @@ bindFunM f = go where go (Error ann) = pure $ Error ann go (Constr ann i args) = Constr ann i <$> traverse go args go (Case ann arg cs) = Case ann <$> go arg <*> traverse go cs + go (Fix ann name fun) = Fix ann name <$> go fun bindFun :: (ann -> fun -> Term name uni fun' ann) diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/DeBruijn.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/DeBruijn.hs index 9e75972b184..6ea1779c2a1 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/DeBruijn.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/DeBruijn.hs @@ -84,6 +84,9 @@ deBruijnTermWithM h = go LamAbs ann n t -> declareUnique n $ do n' <- nameToDeBruijn h n withScope $ LamAbs ann n' <$> go t + Fix ann n b -> declareUnique n $ do + n' <- nameToDeBruijn h n + withScope $ Fix ann n' <$> go b -- boring recursive cases Apply ann t1 t2 -> Apply ann <$> go t1 <*> go t2 Delay ann t -> Delay ann <$> go t @@ -112,6 +115,11 @@ unDeBruijnTermWithM h = go declareBinder $ do n' <- deBruijnToName h $ set index deBruijnInitIndex n withScope $ LamAbs ann n' <$> go t + Fix ann n b -> + -- See Note [DeBruijn indices of Binders] + declareBinder $ do + n' <- deBruijnToName h $ set index deBruijnInitIndex n + withScope $ Fix ann n' <$> go b -- boring recursive cases Apply ann t1 t2 -> Apply ann <$> go t1 <*> go t2 Delay ann t -> Delay ann <$> go t diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Evaluation/Machine/Cek/CekMachineCosts.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Evaluation/Machine/Cek/CekMachineCosts.hs index 9ed9697652e..70ddcf796ba 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Evaluation/Machine/Cek/CekMachineCosts.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Evaluation/Machine/Cek/CekMachineCosts.hs @@ -49,6 +49,7 @@ data CekMachineCostsBase f = -- happen if calling 'Error' caused the budget to be exceeded? , cekConstrCost :: f ExBudget , cekCaseCost :: f ExBudget + , cekFixCost :: f ExBudget } deriving stock (Generic) deriving anyclass (FunctorB, TraversableB, ConstraintsB) @@ -85,6 +86,7 @@ unitCekMachineCosts = , cekBuiltinCost = unitCost , cekConstrCost = unitCost , cekCaseCost = unitCost + , cekFixCost = unitCost } where zeroCost = Identity $ ExBudget 0 0 diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Evaluation/Machine/Cek/Internal.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Evaluation/Machine/Cek/Internal.hs index 993063fdffe..f0619111116 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Evaluation/Machine/Cek/Internal.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Evaluation/Machine/Cek/Internal.hs @@ -168,6 +168,7 @@ data StepKind | BBuiltin -- Cost of evaluating a Builtin AST node, not the function itself | BConstr | BCase + | BFix deriving stock (Show, Eq, Ord, Generic, Enum, Bounded) deriving anyclass (NFData, Hashable) @@ -182,6 +183,7 @@ cekStepCost costs = runIdentity . \case BBuiltin -> cekBuiltinCost costs BConstr -> cekConstrCost costs BCase -> cekCaseCost costs + BFix -> cekFixCost costs data ExBudgetCategory fun = BStep StepKind @@ -553,6 +555,7 @@ data Context uni fun ann -- ^ @(constr i V0 ... Vj-1 _ Nj ... Nn)@ | FrameCases !(CekValEnv uni fun ann) !(V.Vector (NTerm uni fun ann)) !(Context uni fun ann) -- ^ @(case _ C0 .. Cn)@ + | FrameFix !(Context uni fun ann) | NoFrame deriving stock instance (GShow uni, Everywhere uni Show, Show fun, Show ann, Closed uni) @@ -684,6 +687,9 @@ enterComputeCek = computeCek computeCek !ctx !env (Case _ scrut cs) = do stepAndMaybeSpend BCase computeCek (FrameCases env cs ctx) env scrut + computeCek !ctx !env (Fix _ _ bodyOuter) = do + stepAndMaybeSpend BFix + computeCek (FrameFix ctx) env bodyOuter -- s ; ρ ▻ error ↦ <> A computeCek !_ !_ (Error _) = throwing_ _EvaluationFailure @@ -737,6 +743,13 @@ enterComputeCek = computeCek Just t -> computeCek (transferArgStack args ctx) env t Nothing -> throwingDischarged _MachineError (MissingCaseBranch i) e _ -> throwingDischarged _MachineError NonConstrScrutinized e + returnCek (FrameFix ctx) bodyOuter = + case bodyOuter of + VLamAbs nameArg bodyInner env -> + let env' = Env.cons bodyOuter' env + bodyOuter' = VLamAbs nameArg bodyInner env' + in returnCek ctx bodyOuter' + _ -> throwingDischarged _MachineError NonLambdaFixedMachineError bodyOuter -- | Evaluate a 'HeadSpine' by pushing the arguments (if any) onto the stack and proceeding with -- the returning phase of the CEK machine. diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Evaluation/Machine/SteppableCek/Internal.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Evaluation/Machine/SteppableCek/Internal.hs index c5260720803..26dff600e7a 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Evaluation/Machine/SteppableCek/Internal.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Evaluation/Machine/SteppableCek/Internal.hs @@ -101,6 +101,7 @@ data Context uni fun ann | FrameForce ann !(Context uni fun ann) -- ^ @(force _)@ | FrameConstr ann !(CekValEnv uni fun ann) {-# UNPACK #-} !Word64 ![NTerm uni fun ann] !(ArgStack uni fun ann) !(Context uni fun ann) | FrameCases ann !(CekValEnv uni fun ann) !(V.Vector (NTerm uni fun ann)) !(Context uni fun ann) + | FrameFix ann !(Context uni fun ann) | NoFrame deriving stock instance (GShow uni, Everywhere uni Show, Show fun, Show ann, Closed uni) @@ -164,6 +165,9 @@ computeCek !ctx !env (Constr ann i es) = do computeCek !ctx !env (Case ann scrut cs) = do stepAndMaybeSpend BCase computeCek (FrameCases ann env cs ctx) env scrut +computeCek !ctx !env (Fix ann _ bodyOuter) = do + stepAndMaybeSpend BFix + computeCek (FrameFix ann ctx) env bodyOuter -- s ; ρ ▻ error A ↦ <> A computeCek !_ !_ (Error _) = throwing_ _EvaluationFailure @@ -212,6 +216,13 @@ returnCek (FrameCases ann env cs ctx) e = case e of in computeCek ctx' env t Nothing -> throwingDischarged _MachineError (MissingCaseBranch i) e _ -> throwingDischarged _MachineError NonConstrScrutinized e +returnCek (FrameFix _ ctx) bodyOuter = + case bodyOuter of + VLamAbs nameArg bodyInner env -> + let env' = Env.cons bodyOuter' env + bodyOuter' = VLamAbs nameArg bodyInner env' + in pure $ Returning ctx bodyOuter' + _ -> throwingDischarged _MachineError NonLambdaFixedMachineError bodyOuter -- | @force@ a term and proceed. -- If v is a delay then compute the body of v; @@ -383,6 +394,7 @@ contextAnn = \case FrameForce ann _ -> pure ann FrameConstr ann _ _ _ _ _ -> pure ann FrameCases ann _ _ _ -> pure ann + FrameFix ann _ -> pure ann NoFrame -> empty lenContext :: Context uni fun ann -> Word @@ -396,6 +408,7 @@ lenContext = go 0 FrameForce _ k -> go (n+1) k FrameConstr _ _ _ _ _ k -> go (n+1) k FrameCases _ _ _ k -> go (n+1) k + FrameFix _ k -> go (n+1) k NoFrame -> 0 @@ -414,6 +427,7 @@ cekStepCost costs = runIdentity . \case BBuiltin -> cekBuiltinCost costs BConstr -> cekConstrCost costs BCase -> cekCaseCost costs + BFix -> cekFixCost costs -- | Call 'dischargeCekValue' over the received 'CekVal' and feed the resulting 'Term' to -- 'throwingWithCause' as the cause of the failure. diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Purity.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Purity.hs index 3197f5d9cb3..3eb49971a0e 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Purity.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Purity.hs @@ -122,6 +122,13 @@ termEvaluationOrder builtinSemanticsVariant = goTerm LamAbs _ _ body -> goTerm body -- unknown function body _ -> evalThis Unknown + t@(Fix _ _ body) -> + -- first the body + goTerm body + -- then the whole term, which means work + <> evalThis (EvalTerm Pure MaybeWork t) + -- then recursion + <> evalThis Unknown t@(Force _ dterm) -> -- first delayed term goTerm dterm diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Rename/Internal.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Rename/Internal.hs index 5212de3c41b..382c93ae586 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Rename/Internal.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Rename/Internal.hs @@ -21,6 +21,8 @@ renameTermM => Term name uni fun ann -> ScopedRenameT m (Term name uni fun ann) renameTermM (LamAbs ann name body) = withFreshenedName name $ \nameFr -> LamAbs ann nameFr <$> renameTermM body +renameTermM (Fix ann name body) = + withFreshenedName name $ \nameFr -> Fix ann nameFr <$> renameTermM body renameTermM (Apply ann fun arg) = Apply ann <$> renameTermM fun <*> renameTermM arg renameTermM err@Error{} = pure err renameTermM (Var ann name) = Var ann <$> renameNameM name diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Subst.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Subst.hs index 213836fad85..8d977566418 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Subst.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Subst.hs @@ -63,6 +63,7 @@ termMapNames f = go go :: Term name uni fun ann -> Term name' uni fun ann go = \case LamAbs ann name body -> LamAbs ann (f name) (go body) + Fix ann name body -> Fix ann (f name) (go body) Var ann name -> Var ann (f name) Apply ann t1 t2 -> Apply ann (go t1) (go t2) diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/Cse.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/Cse.hs index 6663f314484..66219f3f9a5 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/Cse.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/Cse.hs @@ -256,6 +256,10 @@ annotate = flip evalState 0 . flip runReaderT [] . go freshId <- (+ 1) <$> lift get lift $ put freshId LamAbs (path, ann) n <$> local (freshId :) (go body) + Fix ann n body -> do + freshId <- (+ 1) <$> lift get + lift $ put freshId + Fix (path, ann) n <$> local (freshId :) (go body) Delay ann body -> do freshId <- (+ 1) <$> lift get lift $ put freshId @@ -381,6 +385,7 @@ applyCse c = mkLamApp . transformOf termSubterms substCseVarForTerm | currPath `isAncestorOrSelf` candidatePath = case t of Var ann name -> Var ann name LamAbs ann name body -> LamAbs ann name (mkLamApp body) + Fix ann name body -> Fix ann name (mkLamApp body) Apply ann fun arg -> Apply ann (mkLamApp fun) (mkLamApp arg) Force ann body -> Force ann (mkLamApp body) Delay ann body -> Delay ann (mkLamApp body) diff --git a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/Inline.hs b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/Inline.hs index 7c4b69a99aa..5f8b1b90b7c 100644 --- a/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/Inline.hs +++ b/plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Transform/Inline.hs @@ -414,6 +414,7 @@ costIsAcceptable = \case Case{} -> False Force{} -> False Delay{} -> True + Fix{} -> False {- | Is the size increase (in the AST) of inlining a variable whose RHS is the given term acceptable? @@ -442,6 +443,7 @@ sizeIsAcceptable inlineConstants = \case Apply{} -> False Force _ t -> sizeIsAcceptable inlineConstants t Delay _ t -> sizeIsAcceptable inlineConstants t + Fix{} -> False -- | Fully apply and beta reduce. fullyApplyAndBetaReduce :: diff --git a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/Fib/1.uplc.golden b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/Fib/1.uplc.golden index 6b20e1d289e..9c01aac2c19 100644 --- a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/Fib/1.uplc.golden +++ b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/Fib/1.uplc.golden @@ -1,16 +1,16 @@ ( (Right 1) , ({ tally: ({BStep BConst causes ({cpu: 48000 | mem: 300}) -| BStep BVar causes ({cpu: 144000 | mem: 900}) -| BStep BLamAbs causes ({cpu: 192000 | mem: 1200}) -| BStep BApply causes ({cpu: 240000 | mem: 1500}) -| BStep BDelay causes ({cpu: 64000 | mem: 400}) -| BStep BForce causes ({cpu: 80000 | mem: 500}) +| BStep BVar causes ({cpu: 80000 | mem: 500}) +| BStep BLamAbs causes ({cpu: 96000 | mem: 600}) +| BStep BApply causes ({cpu: 160000 | mem: 1000}) +| BStep BDelay causes ({cpu: 16000 | mem: 100}) +| BStep BForce causes ({cpu: 32000 | mem: 200}) | BStep BBuiltin causes ({cpu: 32000 | mem: 200}) | BStep BConstr causes ({cpu: 0 | mem: 0}) | BStep BCase causes ({cpu: 0 | mem: 0}) | BBuiltinApp LessThanEqualsInteger causes ({cpu: 43837 | mem: 1}) | BBuiltinApp IfThenElse causes ({cpu: 76049 | mem: 1}) | BStartup causes ({cpu: 100 | mem: 100})}) -| budget: ({cpu: 919986 -| mem: 5102}) +| budget: ({cpu: 583986 +| mem: 3002}) }) ) \ No newline at end of file diff --git a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/Fib/2.uplc.golden b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/Fib/2.uplc.golden index 3db175b89de..e820ae97c19 100644 --- a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/Fib/2.uplc.golden +++ b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/Fib/2.uplc.golden @@ -1,10 +1,10 @@ ( (Right 1) , ({ tally: ({BStep BConst causes ({cpu: 144000 | mem: 900}) -| BStep BVar causes ({cpu: 512000 | mem: 3200}) -| BStep BLamAbs causes ({cpu: 448000 | mem: 2800}) -| BStep BApply causes ({cpu: 784000 | mem: 4900}) -| BStep BDelay causes ({cpu: 128000 | mem: 800}) -| BStep BForce causes ({cpu: 176000 | mem: 1100}) +| BStep BVar causes ({cpu: 288000 | mem: 1800}) +| BStep BLamAbs causes ({cpu: 256000 | mem: 1600}) +| BStep BApply causes ({cpu: 576000 | mem: 3600}) +| BStep BDelay causes ({cpu: 48000 | mem: 300}) +| BStep BForce causes ({cpu: 96000 | mem: 600}) | BStep BBuiltin causes ({cpu: 144000 | mem: 900}) | BStep BConstr causes ({cpu: 0 | mem: 0}) | BStep BCase causes ({cpu: 0 | mem: 0}) @@ -13,6 +13,6 @@ | BBuiltinApp LessThanEqualsInteger causes ({cpu: 131511 | mem: 3}) | BBuiltinApp IfThenElse causes ({cpu: 228147 | mem: 3}) | BStartup causes ({cpu: 100 | mem: 100})}) -| budget: ({cpu: 2999382 -| mem: 14712}) +| budget: ({cpu: 2215382 +| mem: 9812}) }) ) \ No newline at end of file diff --git a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/Fib/3.uplc.golden b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/Fib/3.uplc.golden index 54f617fc22c..83aa8124f58 100644 --- a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/Fib/3.uplc.golden +++ b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/Fib/3.uplc.golden @@ -1,10 +1,10 @@ ( (Right 2) , ({ tally: ({BStep BConst causes ({cpu: 240000 | mem: 1500}) -| BStep BVar causes ({cpu: 880000 | mem: 5500}) -| BStep BLamAbs causes ({cpu: 704000 | mem: 4400}) -| BStep BApply causes ({cpu: 1328000 | mem: 8300}) -| BStep BDelay causes ({cpu: 192000 | mem: 1200}) -| BStep BForce causes ({cpu: 272000 | mem: 1700}) +| BStep BVar causes ({cpu: 496000 | mem: 3100}) +| BStep BLamAbs causes ({cpu: 416000 | mem: 2600}) +| BStep BApply causes ({cpu: 992000 | mem: 6200}) +| BStep BDelay causes ({cpu: 80000 | mem: 500}) +| BStep BForce causes ({cpu: 160000 | mem: 1000}) | BStep BBuiltin causes ({cpu: 256000 | mem: 1600}) | BStep BConstr causes ({cpu: 0 | mem: 0}) | BStep BCase causes ({cpu: 0 | mem: 0}) @@ -13,6 +13,6 @@ | BBuiltinApp LessThanEqualsInteger causes ({cpu: 219185 | mem: 5}) | BBuiltinApp IfThenElse causes ({cpu: 380245 | mem: 5}) | BStartup causes ({cpu: 100 | mem: 100})}) -| budget: ({cpu: 5078778 -| mem: 24322}) +| budget: ({cpu: 3846778 +| mem: 16622}) }) ) \ No newline at end of file diff --git a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IdNat/0.uplc.golden b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IdNat/0.uplc.golden index fdbc1b65ee8..d8966f9b525 100644 --- a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IdNat/0.uplc.golden +++ b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IdNat/0.uplc.golden @@ -43,15 +43,15 @@ f-21 -> z-20)))))))))))))))))))))) , ({ tally: ({BStep BConst causes ({cpu: 0 | mem: 0}) -| BStep BVar causes ({cpu: 2176000 | mem: 13600}) -| BStep BLamAbs causes ({cpu: 1472000 | mem: 9200}) -| BStep BApply causes ({cpu: 1904000 | mem: 11900}) -| BStep BDelay causes ({cpu: 576000 | mem: 3600}) -| BStep BForce causes ({cpu: 400000 | mem: 2500}) +| BStep BVar causes ({cpu: 1856000 | mem: 11600}) +| BStep BLamAbs causes ({cpu: 1120000 | mem: 7000}) +| BStep BApply causes ({cpu: 1568000 | mem: 9800}) +| BStep BDelay causes ({cpu: 400000 | mem: 2500}) +| BStep BForce causes ({cpu: 224000 | mem: 1400}) | BStep BBuiltin causes ({cpu: 0 | mem: 0}) | BStep BConstr causes ({cpu: 0 | mem: 0}) | BStep BCase causes ({cpu: 0 | mem: 0}) | BStartup causes ({cpu: 100 | mem: 100})}) -| budget: ({cpu: 6528100 -| mem: 40900}) +| budget: ({cpu: 5168100 +| mem: 32400}) }) ) \ No newline at end of file diff --git a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IdNat/3.uplc.golden b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IdNat/3.uplc.golden index c1da85de793..4cfeaf9bfbf 100644 --- a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IdNat/3.uplc.golden +++ b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IdNat/3.uplc.golden @@ -43,16 +43,16 @@ f-21 -> z-20)))))))))))))))))))))) , ({ tally: ({BStep BConst causes ({cpu: 0 | mem: 0}) -| BStep BVar causes ({cpu: 2176000 | mem: 13600}) -| BStep BLamAbs causes ({cpu: 1472000 | mem: 9200}) -| BStep BApply causes ({cpu: 1952000 | mem: 12200}) -| BStep BDelay causes ({cpu: 576000 | mem: 3600}) -| BStep BForce causes ({cpu: 448000 | mem: 2800}) +| BStep BVar causes ({cpu: 1856000 | mem: 11600}) +| BStep BLamAbs causes ({cpu: 1120000 | mem: 7000}) +| BStep BApply causes ({cpu: 1616000 | mem: 10100}) +| BStep BDelay causes ({cpu: 400000 | mem: 2500}) +| BStep BForce causes ({cpu: 272000 | mem: 1700}) | BStep BBuiltin causes ({cpu: 48000 | mem: 300}) | BStep BConstr causes ({cpu: 0 | mem: 0}) | BStep BCase causes ({cpu: 0 | mem: 0}) | BBuiltinApp Id causes ({cpu: 0 | mem: 0}) | BStartup causes ({cpu: 100 | mem: 100})}) -| budget: ({cpu: 6672100 -| mem: 41800}) +| budget: ({cpu: 5312100 +| mem: 33300}) }) ) \ No newline at end of file diff --git a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IdNat/6.uplc.golden b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IdNat/6.uplc.golden index cb8c5a1da45..772453a466e 100644 --- a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IdNat/6.uplc.golden +++ b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IdNat/6.uplc.golden @@ -43,16 +43,16 @@ f-21 -> z-20)))))))))))))))))))))) , ({ tally: ({BStep BConst causes ({cpu: 0 | mem: 0}) -| BStep BVar causes ({cpu: 2176000 | mem: 13600}) -| BStep BLamAbs causes ({cpu: 1472000 | mem: 9200}) -| BStep BApply causes ({cpu: 2000000 | mem: 12500}) -| BStep BDelay causes ({cpu: 576000 | mem: 3600}) -| BStep BForce causes ({cpu: 496000 | mem: 3100}) +| BStep BVar causes ({cpu: 1856000 | mem: 11600}) +| BStep BLamAbs causes ({cpu: 1120000 | mem: 7000}) +| BStep BApply causes ({cpu: 1664000 | mem: 10400}) +| BStep BDelay causes ({cpu: 400000 | mem: 2500}) +| BStep BForce causes ({cpu: 320000 | mem: 2000}) | BStep BBuiltin causes ({cpu: 96000 | mem: 600}) | BStep BConstr causes ({cpu: 0 | mem: 0}) | BStep BCase causes ({cpu: 0 | mem: 0}) | BBuiltinApp Id causes ({cpu: 0 | mem: 0}) | BStartup causes ({cpu: 100 | mem: 100})}) -| budget: ({cpu: 6816100 -| mem: 42700}) +| budget: ({cpu: 5456100 +| mem: 34200}) }) ) \ No newline at end of file diff --git a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IdNat/9.uplc.golden b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IdNat/9.uplc.golden index 95ae1902625..4e9519430b2 100644 --- a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IdNat/9.uplc.golden +++ b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IdNat/9.uplc.golden @@ -43,16 +43,16 @@ f-21 -> z-20)))))))))))))))))))))) , ({ tally: ({BStep BConst causes ({cpu: 0 | mem: 0}) -| BStep BVar causes ({cpu: 2176000 | mem: 13600}) -| BStep BLamAbs causes ({cpu: 1472000 | mem: 9200}) -| BStep BApply causes ({cpu: 2048000 | mem: 12800}) -| BStep BDelay causes ({cpu: 576000 | mem: 3600}) -| BStep BForce causes ({cpu: 544000 | mem: 3400}) +| BStep BVar causes ({cpu: 1856000 | mem: 11600}) +| BStep BLamAbs causes ({cpu: 1120000 | mem: 7000}) +| BStep BApply causes ({cpu: 1712000 | mem: 10700}) +| BStep BDelay causes ({cpu: 400000 | mem: 2500}) +| BStep BForce causes ({cpu: 368000 | mem: 2300}) | BStep BBuiltin causes ({cpu: 144000 | mem: 900}) | BStep BConstr causes ({cpu: 0 | mem: 0}) | BStep BCase causes ({cpu: 0 | mem: 0}) | BBuiltinApp Id causes ({cpu: 0 | mem: 0}) | BStartup causes ({cpu: 100 | mem: 100})}) -| budget: ({cpu: 6960100 -| mem: 43600}) +| budget: ({cpu: 5600100 +| mem: 35100}) }) ) \ No newline at end of file diff --git a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/0.uplc.golden b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/0.uplc.golden index fdbc1b65ee8..d8966f9b525 100644 --- a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/0.uplc.golden +++ b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/0.uplc.golden @@ -43,15 +43,15 @@ f-21 -> z-20)))))))))))))))))))))) , ({ tally: ({BStep BConst causes ({cpu: 0 | mem: 0}) -| BStep BVar causes ({cpu: 2176000 | mem: 13600}) -| BStep BLamAbs causes ({cpu: 1472000 | mem: 9200}) -| BStep BApply causes ({cpu: 1904000 | mem: 11900}) -| BStep BDelay causes ({cpu: 576000 | mem: 3600}) -| BStep BForce causes ({cpu: 400000 | mem: 2500}) +| BStep BVar causes ({cpu: 1856000 | mem: 11600}) +| BStep BLamAbs causes ({cpu: 1120000 | mem: 7000}) +| BStep BApply causes ({cpu: 1568000 | mem: 9800}) +| BStep BDelay causes ({cpu: 400000 | mem: 2500}) +| BStep BForce causes ({cpu: 224000 | mem: 1400}) | BStep BBuiltin causes ({cpu: 0 | mem: 0}) | BStep BConstr causes ({cpu: 0 | mem: 0}) | BStep BCase causes ({cpu: 0 | mem: 0}) | BStartup causes ({cpu: 100 | mem: 100})}) -| budget: ({cpu: 6528100 -| mem: 40900}) +| budget: ({cpu: 5168100 +| mem: 32400}) }) ) \ No newline at end of file diff --git a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/1.uplc.golden b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/1.uplc.golden index 83bb9621f8e..4f2cfece107 100644 --- a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/1.uplc.golden +++ b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/1.uplc.golden @@ -43,16 +43,16 @@ f-21 -> z-20)))))))))))))))))))))) , ({ tally: ({BStep BConst causes ({cpu: 16000 | mem: 100}) -| BStep BVar causes ({cpu: 2240000 | mem: 14000}) -| BStep BLamAbs causes ({cpu: 1632000 | mem: 10200}) -| BStep BApply causes ({cpu: 2064000 | mem: 12900}) -| BStep BDelay causes ({cpu: 656000 | mem: 4100}) -| BStep BForce causes ({cpu: 480000 | mem: 3000}) +| BStep BVar causes ({cpu: 1920000 | mem: 12000}) +| BStep BLamAbs causes ({cpu: 1248000 | mem: 7800}) +| BStep BApply causes ({cpu: 1712000 | mem: 10700}) +| BStep BDelay causes ({cpu: 464000 | mem: 2900}) +| BStep BForce causes ({cpu: 288000 | mem: 1800}) | BStep BBuiltin causes ({cpu: 16000 | mem: 100}) | BStep BConstr causes ({cpu: 0 | mem: 0}) | BStep BCase causes ({cpu: 0 | mem: 0}) | BBuiltinApp IfThenElse causes ({cpu: 76049 | mem: 1}) | BStartup causes ({cpu: 100 | mem: 100})}) -| budget: ({cpu: 7180149 -| mem: 44501}) +| budget: ({cpu: 5740149 +| mem: 35501}) }) ) \ No newline at end of file diff --git a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/2.uplc.golden b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/2.uplc.golden index daa53e2f4a2..6d9358101e8 100644 --- a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/2.uplc.golden +++ b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/2.uplc.golden @@ -43,16 +43,16 @@ f-21 -> z-20)))))))))))))))))))))) , ({ tally: ({BStep BConst causes ({cpu: 32000 | mem: 200}) -| BStep BVar causes ({cpu: 2256000 | mem: 14100}) -| BStep BLamAbs causes ({cpu: 1664000 | mem: 10400}) -| BStep BApply causes ({cpu: 2128000 | mem: 13300}) -| BStep BDelay causes ({cpu: 656000 | mem: 4100}) -| BStep BForce causes ({cpu: 496000 | mem: 3100}) +| BStep BVar causes ({cpu: 1936000 | mem: 12100}) +| BStep BLamAbs causes ({cpu: 1280000 | mem: 8000}) +| BStep BApply causes ({cpu: 1776000 | mem: 11100}) +| BStep BDelay causes ({cpu: 464000 | mem: 2900}) +| BStep BForce causes ({cpu: 304000 | mem: 1900}) | BStep BBuiltin causes ({cpu: 32000 | mem: 200}) | BStep BConstr causes ({cpu: 0 | mem: 0}) | BStep BCase causes ({cpu: 0 | mem: 0}) | BBuiltinApp IfThenElse causes ({cpu: 152098 | mem: 2}) | BStartup causes ({cpu: 100 | mem: 100})}) -| budget: ({cpu: 7416198 -| mem: 45502}) +| budget: ({cpu: 5976198 +| mem: 36502}) }) ) \ No newline at end of file diff --git a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/3.uplc.golden b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/3.uplc.golden index 6de901bc1bb..b3ac1f738f2 100644 --- a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/3.uplc.golden +++ b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/3.uplc.golden @@ -43,16 +43,16 @@ f-21 -> z-20)))))))))))))))))))))) , ({ tally: ({BStep BConst causes ({cpu: 48000 | mem: 300}) -| BStep BVar causes ({cpu: 2272000 | mem: 14200}) -| BStep BLamAbs causes ({cpu: 1696000 | mem: 10600}) -| BStep BApply causes ({cpu: 2192000 | mem: 13700}) -| BStep BDelay causes ({cpu: 656000 | mem: 4100}) -| BStep BForce causes ({cpu: 512000 | mem: 3200}) +| BStep BVar causes ({cpu: 1952000 | mem: 12200}) +| BStep BLamAbs causes ({cpu: 1312000 | mem: 8200}) +| BStep BApply causes ({cpu: 1840000 | mem: 11500}) +| BStep BDelay causes ({cpu: 464000 | mem: 2900}) +| BStep BForce causes ({cpu: 320000 | mem: 2000}) | BStep BBuiltin causes ({cpu: 48000 | mem: 300}) | BStep BConstr causes ({cpu: 0 | mem: 0}) | BStep BCase causes ({cpu: 0 | mem: 0}) | BBuiltinApp IfThenElse causes ({cpu: 228147 | mem: 3}) | BStartup causes ({cpu: 100 | mem: 100})}) -| budget: ({cpu: 7652247 -| mem: 46503}) +| budget: ({cpu: 6212247 +| mem: 37503}) }) ) \ No newline at end of file diff --git a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/4.uplc.golden b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/4.uplc.golden index 1be22bdf093..9a752adc3fd 100644 --- a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/4.uplc.golden +++ b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/4.uplc.golden @@ -43,16 +43,16 @@ f-21 -> z-20)))))))))))))))))))))) , ({ tally: ({BStep BConst causes ({cpu: 64000 | mem: 400}) -| BStep BVar causes ({cpu: 2288000 | mem: 14300}) -| BStep BLamAbs causes ({cpu: 1728000 | mem: 10800}) -| BStep BApply causes ({cpu: 2256000 | mem: 14100}) -| BStep BDelay causes ({cpu: 656000 | mem: 4100}) -| BStep BForce causes ({cpu: 528000 | mem: 3300}) +| BStep BVar causes ({cpu: 1968000 | mem: 12300}) +| BStep BLamAbs causes ({cpu: 1344000 | mem: 8400}) +| BStep BApply causes ({cpu: 1904000 | mem: 11900}) +| BStep BDelay causes ({cpu: 464000 | mem: 2900}) +| BStep BForce causes ({cpu: 336000 | mem: 2100}) | BStep BBuiltin causes ({cpu: 64000 | mem: 400}) | BStep BConstr causes ({cpu: 0 | mem: 0}) | BStep BCase causes ({cpu: 0 | mem: 0}) | BBuiltinApp IfThenElse causes ({cpu: 304196 | mem: 4}) | BStartup causes ({cpu: 100 | mem: 100})}) -| budget: ({cpu: 7888296 -| mem: 47504}) +| budget: ({cpu: 6448296 +| mem: 38504}) }) ) \ No newline at end of file diff --git a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/5.uplc.golden b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/5.uplc.golden index e8843cd922b..90cc25090ac 100644 --- a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/5.uplc.golden +++ b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Budget/IfThenElse/5.uplc.golden @@ -43,16 +43,16 @@ f-21 -> z-20)))))))))))))))))))))) , ({ tally: ({BStep BConst causes ({cpu: 80000 | mem: 500}) -| BStep BVar causes ({cpu: 2304000 | mem: 14400}) -| BStep BLamAbs causes ({cpu: 1760000 | mem: 11000}) -| BStep BApply causes ({cpu: 2320000 | mem: 14500}) -| BStep BDelay causes ({cpu: 656000 | mem: 4100}) -| BStep BForce causes ({cpu: 544000 | mem: 3400}) +| BStep BVar causes ({cpu: 1984000 | mem: 12400}) +| BStep BLamAbs causes ({cpu: 1376000 | mem: 8600}) +| BStep BApply causes ({cpu: 1968000 | mem: 12300}) +| BStep BDelay causes ({cpu: 464000 | mem: 2900}) +| BStep BForce causes ({cpu: 352000 | mem: 2200}) | BStep BBuiltin causes ({cpu: 80000 | mem: 500}) | BStep BConstr causes ({cpu: 0 | mem: 0}) | BStep BCase causes ({cpu: 0 | mem: 0}) | BBuiltinApp IfThenElse causes ({cpu: 380245 | mem: 5}) | BStartup causes ({cpu: 100 | mem: 100})}) -| budget: ({cpu: 8124345 -| mem: 48505}) +| budget: ({cpu: 6684345 +| mem: 39505}) }) ) \ No newline at end of file diff --git a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Tallying/Fib/1.uplc.golden b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Tallying/Fib/1.uplc.golden index 6b20e1d289e..9c01aac2c19 100644 --- a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Tallying/Fib/1.uplc.golden +++ b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Tallying/Fib/1.uplc.golden @@ -1,16 +1,16 @@ ( (Right 1) , ({ tally: ({BStep BConst causes ({cpu: 48000 | mem: 300}) -| BStep BVar causes ({cpu: 144000 | mem: 900}) -| BStep BLamAbs causes ({cpu: 192000 | mem: 1200}) -| BStep BApply causes ({cpu: 240000 | mem: 1500}) -| BStep BDelay causes ({cpu: 64000 | mem: 400}) -| BStep BForce causes ({cpu: 80000 | mem: 500}) +| BStep BVar causes ({cpu: 80000 | mem: 500}) +| BStep BLamAbs causes ({cpu: 96000 | mem: 600}) +| BStep BApply causes ({cpu: 160000 | mem: 1000}) +| BStep BDelay causes ({cpu: 16000 | mem: 100}) +| BStep BForce causes ({cpu: 32000 | mem: 200}) | BStep BBuiltin causes ({cpu: 32000 | mem: 200}) | BStep BConstr causes ({cpu: 0 | mem: 0}) | BStep BCase causes ({cpu: 0 | mem: 0}) | BBuiltinApp LessThanEqualsInteger causes ({cpu: 43837 | mem: 1}) | BBuiltinApp IfThenElse causes ({cpu: 76049 | mem: 1}) | BStartup causes ({cpu: 100 | mem: 100})}) -| budget: ({cpu: 919986 -| mem: 5102}) +| budget: ({cpu: 583986 +| mem: 3002}) }) ) \ No newline at end of file diff --git a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Tallying/Fib/2.uplc.golden b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Tallying/Fib/2.uplc.golden index 3db175b89de..e820ae97c19 100644 --- a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Tallying/Fib/2.uplc.golden +++ b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Tallying/Fib/2.uplc.golden @@ -1,10 +1,10 @@ ( (Right 1) , ({ tally: ({BStep BConst causes ({cpu: 144000 | mem: 900}) -| BStep BVar causes ({cpu: 512000 | mem: 3200}) -| BStep BLamAbs causes ({cpu: 448000 | mem: 2800}) -| BStep BApply causes ({cpu: 784000 | mem: 4900}) -| BStep BDelay causes ({cpu: 128000 | mem: 800}) -| BStep BForce causes ({cpu: 176000 | mem: 1100}) +| BStep BVar causes ({cpu: 288000 | mem: 1800}) +| BStep BLamAbs causes ({cpu: 256000 | mem: 1600}) +| BStep BApply causes ({cpu: 576000 | mem: 3600}) +| BStep BDelay causes ({cpu: 48000 | mem: 300}) +| BStep BForce causes ({cpu: 96000 | mem: 600}) | BStep BBuiltin causes ({cpu: 144000 | mem: 900}) | BStep BConstr causes ({cpu: 0 | mem: 0}) | BStep BCase causes ({cpu: 0 | mem: 0}) @@ -13,6 +13,6 @@ | BBuiltinApp LessThanEqualsInteger causes ({cpu: 131511 | mem: 3}) | BBuiltinApp IfThenElse causes ({cpu: 228147 | mem: 3}) | BStartup causes ({cpu: 100 | mem: 100})}) -| budget: ({cpu: 2999382 -| mem: 14712}) +| budget: ({cpu: 2215382 +| mem: 9812}) }) ) \ No newline at end of file diff --git a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Tallying/Fib/3.uplc.golden b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Tallying/Fib/3.uplc.golden index 54f617fc22c..83aa8124f58 100644 --- a/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Tallying/Fib/3.uplc.golden +++ b/plutus-core/untyped-plutus-core/test/Evaluation/Machines/Tallying/Fib/3.uplc.golden @@ -1,10 +1,10 @@ ( (Right 2) , ({ tally: ({BStep BConst causes ({cpu: 240000 | mem: 1500}) -| BStep BVar causes ({cpu: 880000 | mem: 5500}) -| BStep BLamAbs causes ({cpu: 704000 | mem: 4400}) -| BStep BApply causes ({cpu: 1328000 | mem: 8300}) -| BStep BDelay causes ({cpu: 192000 | mem: 1200}) -| BStep BForce causes ({cpu: 272000 | mem: 1700}) +| BStep BVar causes ({cpu: 496000 | mem: 3100}) +| BStep BLamAbs causes ({cpu: 416000 | mem: 2600}) +| BStep BApply causes ({cpu: 992000 | mem: 6200}) +| BStep BDelay causes ({cpu: 80000 | mem: 500}) +| BStep BForce causes ({cpu: 160000 | mem: 1000}) | BStep BBuiltin causes ({cpu: 256000 | mem: 1600}) | BStep BConstr causes ({cpu: 0 | mem: 0}) | BStep BCase causes ({cpu: 0 | mem: 0}) @@ -13,6 +13,6 @@ | BBuiltinApp LessThanEqualsInteger causes ({cpu: 219185 | mem: 5}) | BBuiltinApp IfThenElse causes ({cpu: 380245 | mem: 5}) | BStartup causes ({cpu: 100 | mem: 100})}) -| budget: ({cpu: 5078778 -| mem: 24322}) +| budget: ({cpu: 3846778 +| mem: 16622}) }) ) \ No newline at end of file diff --git a/plutus-ledger-api/src/PlutusLedgerApi/V3/ParamName.hs b/plutus-ledger-api/src/PlutusLedgerApi/V3/ParamName.hs index 606b3d44528..c849bfd07e3 100644 --- a/plutus-ledger-api/src/PlutusLedgerApi/V3/ParamName.hs +++ b/plutus-ledger-api/src/PlutusLedgerApi/V3/ParamName.hs @@ -212,6 +212,8 @@ data ParamName = | CekConstrCost'exBudgetMemory | CekCaseCost'exBudgetCPU | CekCaseCost'exBudgetMemory + | CekFixCost'exBudgetCPU + | CekFixCost'exBudgetMemory | Bls12_381_G1_add'cpu'arguments | Bls12_381_G1_add'memory'arguments | Bls12_381_G1_compress'cpu'arguments diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/currencySymbolValueOf.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/currencySymbolValueOf.budget.golden index 1ea9a5f57b7..59b80a52701 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/currencySymbolValueOf.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/currencySymbolValueOf.budget.golden @@ -1,2 +1,2 @@ -({cpu: 17880858 -| mem: 104124}) \ No newline at end of file +({cpu: 17256858 +| mem: 100224}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq1.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq1.budget.golden index aed73a28336..a62912066b6 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq1.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq1.budget.golden @@ -1,2 +1,2 @@ -({cpu: 151674685 -| mem: 870930}) \ No newline at end of file +({cpu: 141018685 +| mem: 804330}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq2.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq2.budget.golden index 0db1285d454..a41a6d68334 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq2.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq2.budget.golden @@ -1,2 +1,2 @@ -({cpu: 163635949 -| mem: 941642}) \ No newline at end of file +({cpu: 152307949 +| mem: 870842}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq3.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq3.budget.golden index 99595ce64d3..6e883f5dcce 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq3.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq3.budget.golden @@ -1,2 +1,2 @@ -({cpu: 168210644 -| mem: 966452}) \ No newline at end of file +({cpu: 156546644 +| mem: 893552}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq4.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq4.budget.golden index 06b82b4a379..2b9958f1531 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq4.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq4.budget.golden @@ -1,2 +1,2 @@ -({cpu: 146764728 -| mem: 844320}) \ No newline at end of file +({cpu: 136492728 +| mem: 780120}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq5.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq5.budget.golden index a9d958ac149..b3639ad9975 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq5.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/geq5.budget.golden @@ -1,2 +1,2 @@ -({cpu: 156320779 -| mem: 897238}) \ No newline at end of file +({cpu: 145328779 +| mem: 828538}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt1.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt1.budget.golden index 24a6d6cc9a1..1beed51bfa3 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt1.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt1.budget.golden @@ -1,2 +1,2 @@ -({cpu: 186560115 -| mem: 1063800}) \ No newline at end of file +({cpu: 172208115 +| mem: 974100}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt2.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt2.budget.golden index 47502697dac..41053d4081f 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt2.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt2.budget.golden @@ -1,2 +1,2 @@ -({cpu: 162355949 -| mem: 933642}) \ No newline at end of file +({cpu: 150883949 +| mem: 861942}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt3.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt3.budget.golden index 08451be2fb8..4364b4fade0 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt3.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt3.budget.golden @@ -1,2 +1,2 @@ -({cpu: 203400456 -| mem: 1160424}) \ No newline at end of file +({cpu: 188136456 +| mem: 1065024}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt4.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt4.budget.golden index 490589664b9..91b24dcffdf 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt4.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt4.budget.golden @@ -1,2 +1,2 @@ -({cpu: 146348728 -| mem: 841720}) \ No newline at end of file +({cpu: 135932728 +| mem: 776620}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt5.budget.golden b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt5.budget.golden index 0f42e6e17c6..9118582a57a 100644 --- a/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt5.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Budget/9.6/gt5.budget.golden @@ -1,2 +1,2 @@ -({cpu: 172601718 -| mem: 987470}) \ No newline at end of file +({cpu: 159593718 +| mem: 906170}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/currencySymbolValueOf.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/currencySymbolValueOf.budget.golden index 826c245653e..59f4b21fab4 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/currencySymbolValueOf.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/currencySymbolValueOf.budget.golden @@ -1,2 +1,2 @@ -({cpu: 25335162 -| mem: 79180}) \ No newline at end of file +({cpu: 24711162 +| mem: 75280}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq1.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq1.budget.golden index 167434af9f9..fe9e63c609d 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq1.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq1.budget.golden @@ -1,2 +1,2 @@ -({cpu: 668962560 -| mem: 2174050}) \ No newline at end of file +({cpu: 657202560 +| mem: 2100550}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq2.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq2.budget.golden index ddf2283d0e3..9203d8e2753 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq2.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq2.budget.golden @@ -1,2 +1,2 @@ -({cpu: 707450509 -| mem: 2314770}) \ No newline at end of file +({cpu: 694922509 +| mem: 2236470}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq3.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq3.budget.golden index 043bbc71e1d..5fd58310e21 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq3.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq3.budget.golden @@ -1,2 +1,2 @@ -({cpu: 738553054 -| mem: 2421556}) \ No newline at end of file +({cpu: 725353054 +| mem: 2339056}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq4.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq4.budget.golden index b60f3c421d7..a06f1d2df35 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq4.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq4.budget.golden @@ -1,2 +1,2 @@ -({cpu: 641726155 -| mem: 2054342}) \ No newline at end of file +({cpu: 630398155 +| mem: 1983542}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq5.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq5.budget.golden index 17801e910ba..3e469b37365 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq5.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/geq5.budget.golden @@ -1,2 +1,2 @@ -({cpu: 693519047 -| mem: 2252158}) \ No newline at end of file +({cpu: 681231047 +| mem: 2175358}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt1.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt1.budget.golden index 6b354c0e130..4bcf5fa0607 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt1.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt1.budget.golden @@ -1,2 +1,2 @@ -({cpu: 778128368 -| mem: 2552784}) \ No newline at end of file +({cpu: 762192368 +| mem: 2453184}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt2.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt2.budget.golden index 2f283ae1620..845a05fe6ba 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt2.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt2.budget.golden @@ -1,2 +1,2 @@ -({cpu: 708042509 -| mem: 2318470}) \ No newline at end of file +({cpu: 695466509 +| mem: 2239870}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt3.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt3.budget.golden index b49834a9389..06b04a22c45 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt3.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt3.budget.golden @@ -1,2 +1,2 @@ -({cpu: 851737022 -| mem: 2818176}) \ No newline at end of file +({cpu: 834265022 +| mem: 2708976}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt4.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt4.budget.golden index 195203c6a24..0afe125ddb2 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt4.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt4.budget.golden @@ -1,2 +1,2 @@ -({cpu: 642174155 -| mem: 2057142}) \ No newline at end of file +({cpu: 630798155 +| mem: 1986042}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt5.budget.golden b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt5.budget.golden index edfc68139ba..1b50dbd9a12 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt5.budget.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Budget/9.6/gt5.budget.golden @@ -1,2 +1,2 @@ -({cpu: 745919527 -| mem: 2438662}) \ No newline at end of file +({cpu: 731663527 +| mem: 2349562}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Value/9.6/Long.stat.golden b/plutus-ledger-api/test-plugin/Spec/Data/Value/9.6/Long.stat.golden index 65a60b90f84..a310753f92f 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Value/9.6/Long.stat.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Value/9.6/Long.stat.golden @@ -1,15 +1,15 @@ -({cpu: 8693320589 | mem: 14424858}) -({cpu: 9615052 | mem: 39976}) -({cpu: 6180436712 | mem: 10071058}) -({cpu: 9615052 | mem: 39976}) -({cpu: 6180436712 | mem: 10071058}) -({cpu: 9615052 | mem: 39976}) -({cpu: 3667552835 | mem: 5717258}) -({cpu: 9615052 | mem: 39976}) -({cpu: 6180436712 | mem: 10071058}) -({cpu: 9615052 | mem: 39976}) -({cpu: 3667552835 | mem: 5717258}) -({cpu: 9615052 | mem: 39976}) -({cpu: 3667552835 | mem: 5717258}) -({cpu: 9615052 | mem: 39976}) -({cpu: 1154668958 | mem: 1363458}) \ No newline at end of file +({cpu: 8531128589 | mem: 13411158}) +({cpu: 9279052 | mem: 37876}) +({cpu: 6067204712 | mem: 9363358}) +({cpu: 9279052 | mem: 37876}) +({cpu: 6067204712 | mem: 9363358}) +({cpu: 9279052 | mem: 37876}) +({cpu: 3603280835 | mem: 5315558}) +({cpu: 9279052 | mem: 37876}) +({cpu: 6067204712 | mem: 9363358}) +({cpu: 9279052 | mem: 37876}) +({cpu: 3603280835 | mem: 5315558}) +({cpu: 9279052 | mem: 37876}) +({cpu: 3603280835 | mem: 5315558}) +({cpu: 9279052 | mem: 37876}) +({cpu: 1139356958 | mem: 1267758}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Data/Value/9.6/Short.stat.golden b/plutus-ledger-api/test-plugin/Spec/Data/Value/9.6/Short.stat.golden index 13466c37976..f0a6fc298e0 100644 --- a/plutus-ledger-api/test-plugin/Spec/Data/Value/9.6/Short.stat.golden +++ b/plutus-ledger-api/test-plugin/Spec/Data/Value/9.6/Short.stat.golden @@ -1,21 +1,21 @@ -({cpu: 2202088 | mem: 12264}) -({cpu: 5753311 | mem: 29152}) -({cpu: 8487302 | mem: 35814}) -({cpu: 11438034 | mem: 48972}) -({cpu: 13523152 | mem: 52402}) -({cpu: 17493312 | mem: 69988}) -({cpu: 25035169 | mem: 92540}) -({cpu: 28146199 | mem: 112760}) -({cpu: 31320383 | mem: 116090}) -({cpu: 20171460 | mem: 75918}) -({cpu: 48059203 | mem: 172816}) -({cpu: 14841855 | mem: 56564}) -({cpu: 69833873 | mem: 246130}) -({cpu: 84308749 | mem: 308686}) -({cpu: 99126782 | mem: 336032}) -({cpu: 113601658 | mem: 398588}) -({cpu: 133646494 | mem: 442522}) -({cpu: 137616654 | mem: 460108}) -({cpu: 173393009 | mem: 565600}) -({cpu: 67258101 | mem: 251492}) -({cpu: 1154668958 | mem: 1363458}) \ No newline at end of file +({cpu: 2106088 | mem: 11664}) +({cpu: 5513311 | mem: 27652}) +({cpu: 8151302 | mem: 33714}) +({cpu: 11006034 | mem: 46272}) +({cpu: 12995152 | mem: 49102}) +({cpu: 16869312 | mem: 66088}) +({cpu: 24075169 | mem: 86540}) +({cpu: 27090199 | mem: 106160}) +({cpu: 30120383 | mem: 108590}) +({cpu: 19403460 | mem: 71118}) +({cpu: 46235203 | mem: 161416}) +({cpu: 14313855 | mem: 53264}) +({cpu: 67193873 | mem: 229630}) +({cpu: 81524749 | mem: 291286}) +({cpu: 95478782 | mem: 313232}) +({cpu: 109809658 | mem: 374888}) +({cpu: 128798494 | mem: 412222}) +({cpu: 132672654 | mem: 429208}) +({cpu: 167153009 | mem: 526600}) +({cpu: 65530101 | mem: 240692}) +({cpu: 1139356958 | mem: 1267758}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Value/9.6/Long.stat.golden b/plutus-ledger-api/test-plugin/Spec/Value/9.6/Long.stat.golden index eb83b17f321..f6e8d5a5a57 100644 --- a/plutus-ledger-api/test-plugin/Spec/Value/9.6/Long.stat.golden +++ b/plutus-ledger-api/test-plugin/Spec/Value/9.6/Long.stat.golden @@ -1,15 +1,15 @@ -({cpu: 1961256408 | mem: 11157042}) -({cpu: 495818067 | mem: 3097504}) -({cpu: 1370121026 | mem: 7793754}) -({cpu: 408618067 | mem: 2552504}) -({cpu: 1370121026 | mem: 7793754}) -({cpu: 321226067 | mem: 2006304}) -({cpu: 778985644 | mem: 4430466}) -({cpu: 321322067 | mem: 2006904}) -({cpu: 1370121026 | mem: 7793754}) -({cpu: 321226067 | mem: 2006304}) -({cpu: 778985644 | mem: 4430466}) -({cpu: 234026067 | mem: 1461304}) -({cpu: 778985644 | mem: 4430466}) -({cpu: 146634067 | mem: 915104}) -({cpu: 187850262 | mem: 1067178}) \ No newline at end of file +({cpu: 1833144408 | mem: 10356342}) +({cpu: 494954067 | mem: 3092104}) +({cpu: 1280409026 | mem: 7233054}) +({cpu: 407754067 | mem: 2547104}) +({cpu: 1280409026 | mem: 7233054}) +({cpu: 320362067 | mem: 2000904}) +({cpu: 727673644 | mem: 4109766}) +({cpu: 320458067 | mem: 2001504}) +({cpu: 1280409026 | mem: 7233054}) +({cpu: 320362067 | mem: 2000904}) +({cpu: 727673644 | mem: 4109766}) +({cpu: 233162067 | mem: 1455904}) +({cpu: 727673644 | mem: 4109766}) +({cpu: 145770067 | mem: 909704}) +({cpu: 174938262 | mem: 986478}) \ No newline at end of file diff --git a/plutus-ledger-api/test-plugin/Spec/Value/9.6/Short.stat.golden b/plutus-ledger-api/test-plugin/Spec/Value/9.6/Short.stat.golden index a7b66fc64f2..52b3b9b7b58 100644 --- a/plutus-ledger-api/test-plugin/Spec/Value/9.6/Short.stat.golden +++ b/plutus-ledger-api/test-plugin/Spec/Value/9.6/Short.stat.golden @@ -1,21 +1,21 @@ -({cpu: 3040100 | mem: 19100}) -({cpu: 4096100 | mem: 25700}) -({cpu: 5673685 | mem: 34902}) -({cpu: 6794067 | mem: 41104}) -({cpu: 8083652 | mem: 48506}) -({cpu: 9604034 | mem: 57208}) -({cpu: 12935470 | mem: 76712}) -({cpu: 13774267 | mem: 81812}) -({cpu: 15377055 | mem: 91314}) -({cpu: 12968897 | mem: 77610}) -({cpu: 22639106 | mem: 133124}) -({cpu: 14132300 | mem: 85508}) -({cpu: 32311124 | mem: 188538}) -({cpu: 38639440 | mem: 223350}) -({cpu: 44396567 | mem: 257556}) -({cpu: 51076883 | mem: 294568}) -({cpu: 58892243 | mem: 340178}) -({cpu: 62172625 | mem: 359880}) -({cpu: 75798152 | mem: 436404}) -({cpu: 60396401 | mem: 362940}) -({cpu: 187850262 | mem: 1067178}) \ No newline at end of file +({cpu: 2224100 | mem: 14000}) +({cpu: 3328100 | mem: 20900}) +({cpu: 4857685 | mem: 29802}) +({cpu: 5930067 | mem: 35704}) +({cpu: 7075652 | mem: 42206}) +({cpu: 8692034 | mem: 51508}) +({cpu: 11735470 | mem: 69212}) +({cpu: 12718267 | mem: 75212}) +({cpu: 14177055 | mem: 83814}) +({cpu: 11816897 | mem: 70410}) +({cpu: 21055106 | mem: 123224}) +({cpu: 13076300 | mem: 78908}) +({cpu: 30151124 | mem: 175038}) +({cpu: 36815440 | mem: 211950}) +({cpu: 41468567 | mem: 239256}) +({cpu: 48484883 | mem: 278368}) +({cpu: 55004243 | mem: 315878}) +({cpu: 58380625 | mem: 336180}) +({cpu: 70758152 | mem: 404904}) +({cpu: 59532401 | mem: 357540}) +({cpu: 174938262 | mem: 986478}) \ No newline at end of file diff --git a/plutus-ledger-api/testlib/PlutusLedgerApi/Test/V3/Data/EvaluationContext.hs b/plutus-ledger-api/testlib/PlutusLedgerApi/Test/V3/Data/EvaluationContext.hs index 0849ba62a39..2fe984e1d14 100644 --- a/plutus-ledger-api/testlib/PlutusLedgerApi/Test/V3/Data/EvaluationContext.hs +++ b/plutus-ledger-api/testlib/PlutusLedgerApi/Test/V3/Data/EvaluationContext.hs @@ -41,6 +41,7 @@ clearMachineCostModel :: (m ~ MCekMachineCosts) => m -> m clearMachineCostModel r = r { cekConstrCost = mempty , cekCaseCost = mempty + , cekFixCost = mempty } {- | Assign to `mempty` those builtins that the @PlutusV3@ introduces. diff --git a/plutus-ledger-api/testlib/PlutusLedgerApi/Test/V3/EvaluationContext.hs b/plutus-ledger-api/testlib/PlutusLedgerApi/Test/V3/EvaluationContext.hs index 21529c32bb0..81d16452872 100644 --- a/plutus-ledger-api/testlib/PlutusLedgerApi/Test/V3/EvaluationContext.hs +++ b/plutus-ledger-api/testlib/PlutusLedgerApi/Test/V3/EvaluationContext.hs @@ -42,6 +42,7 @@ clearMachineCostModel :: (m ~ MCekMachineCosts) => m -> m clearMachineCostModel r = r { cekConstrCost = mempty , cekCaseCost = mempty + , cekFixCost = mempty } {- | Assign to `mempty` those builtins that the @PlutusV3@ introduces. diff --git a/plutus-tx-plugin/test/Budget/9.6/allCheap.budget.golden b/plutus-tx-plugin/test/Budget/9.6/allCheap.budget.golden index 454c71d258a..6b65c05a20d 100644 --- a/plutus-tx-plugin/test/Budget/9.6/allCheap.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/allCheap.budget.golden @@ -1,2 +1,2 @@ -({cpu: 935986 -| mem: 5202}) \ No newline at end of file +({cpu: 839986 +| mem: 4602}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/allCheap.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/allCheap.uplc.golden index f72945d7c15..11fd32457cc 100644 --- a/plutus-tx-plugin/test/Budget/9.6/allCheap.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/allCheap.uplc.golden @@ -1,11 +1,10 @@ (program 1.1.0 - ((\s -> - s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 0 [])) , (\x xs -> delay @@ -14,7 +13,7 @@ (force ifThenElse (lessThanEqualsInteger 1 x) (delay (delay (constr 1 []))) - (delay (delay (s s xs))))))) ])) + (delay (delay (rec xs))))))) ])) (constr 1 [ 1 , (constr 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/allEmptyList.budget.golden b/plutus-tx-plugin/test/Budget/9.6/allEmptyList.budget.golden index 258148cc9b3..9e30b07f7cd 100644 --- a/plutus-tx-plugin/test/Budget/9.6/allEmptyList.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/allEmptyList.budget.golden @@ -1,2 +1,2 @@ -({cpu: 224100 -| mem: 1500}) \ No newline at end of file +({cpu: 128100 +| mem: 900}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/allEmptyList.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/allEmptyList.uplc.golden index 7f5ac34f297..cba50e85e38 100644 --- a/plutus-tx-plugin/test/Budget/9.6/allEmptyList.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/allEmptyList.uplc.golden @@ -1,10 +1,10 @@ (program 1.1.0 - ((\s -> s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 0 [])) , (\x xs -> delay @@ -13,5 +13,5 @@ (force ifThenElse (lessThanEqualsInteger 1 x) (delay (delay (constr 1 []))) - (delay (delay (s s xs))))))) ])) + (delay (delay (rec xs))))))) ])) (constr 0 []))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/allExpensive.budget.golden b/plutus-tx-plugin/test/Budget/9.6/allExpensive.budget.golden index 0fcf3e05164..746a99a31fb 100644 --- a/plutus-tx-plugin/test/Budget/9.6/allExpensive.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/allExpensive.budget.golden @@ -1,2 +1,2 @@ -({cpu: 6062960 -| mem: 30520}) \ No newline at end of file +({cpu: 5486960 +| mem: 26920}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/allExpensive.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/allExpensive.uplc.golden index b23a61ea97d..dc40995c1fa 100644 --- a/plutus-tx-plugin/test/Budget/9.6/allExpensive.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/allExpensive.uplc.golden @@ -1,11 +1,10 @@ (program 1.1.0 - ((\s -> - s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 0 [])) , (\x xs -> delay @@ -14,7 +13,7 @@ (force ifThenElse (lessThanEqualsInteger 11 x) (delay (delay (constr 1 []))) - (delay (delay (s s xs))))))) ])) + (delay (delay (rec xs))))))) ])) (constr 1 [ 1 , (constr 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/andCheap.budget.golden b/plutus-tx-plugin/test/Budget/9.6/andCheap.budget.golden index e39875df9fc..286bb49bbaf 100644 --- a/plutus-tx-plugin/test/Budget/9.6/andCheap.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/andCheap.budget.golden @@ -1,2 +1,2 @@ -({cpu: 640100 -| mem: 4100}) \ No newline at end of file +({cpu: 544100 +| mem: 3500}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/andCheap.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/andCheap.uplc.golden index 14a11f1e466..323b0d5f1bd 100644 --- a/plutus-tx-plugin/test/Budget/9.6/andCheap.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/andCheap.uplc.golden @@ -1,16 +1,15 @@ (program 1.1.0 - ((\s -> - s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 0 [])) , (\x xs -> delay (force - (case x [(delay (s s xs)), (delay (constr 1 []))]))) ])) + (case x [(delay (rec xs)), (delay (constr 1 []))]))) ])) (constr 1 [ (constr 1 []) , (constr 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/andExpensive.budget.golden b/plutus-tx-plugin/test/Budget/9.6/andExpensive.budget.golden index 3d610c2a12c..27d23332232 100644 --- a/plutus-tx-plugin/test/Budget/9.6/andExpensive.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/andExpensive.budget.golden @@ -1,2 +1,2 @@ -({cpu: 3104100 -| mem: 19500}) \ No newline at end of file +({cpu: 2528100 +| mem: 15900}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/andExpensive.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/andExpensive.uplc.golden index 17225b1f9a9..5cca6f39c08 100644 --- a/plutus-tx-plugin/test/Budget/9.6/andExpensive.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/andExpensive.uplc.golden @@ -1,16 +1,15 @@ (program 1.1.0 - ((\s -> - s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 0 [])) , (\x xs -> delay (force - (case x [(delay (s s xs)), (delay (constr 1 []))]))) ])) + (case x [(delay (rec xs)), (delay (constr 1 []))]))) ])) (constr 1 [ (constr 0 []) , (constr 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/anyCheap.budget.golden b/plutus-tx-plugin/test/Budget/9.6/anyCheap.budget.golden index 454c71d258a..6b65c05a20d 100644 --- a/plutus-tx-plugin/test/Budget/9.6/anyCheap.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/anyCheap.budget.golden @@ -1,2 +1,2 @@ -({cpu: 935986 -| mem: 5202}) \ No newline at end of file +({cpu: 839986 +| mem: 4602}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/anyCheap.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/anyCheap.uplc.golden index f8ea3ee5874..b6aeb7f7a16 100644 --- a/plutus-tx-plugin/test/Budget/9.6/anyCheap.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/anyCheap.uplc.golden @@ -1,11 +1,10 @@ (program 1.1.0 - ((\s -> - s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 1 [])) , (\x xs -> delay @@ -13,7 +12,7 @@ (force (force ifThenElse (lessThanEqualsInteger 10 x) - (delay (delay (s s xs))) + (delay (delay (rec xs))) (delay (delay (constr 0 []))))))) ])) (constr 1 [ 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.budget.golden b/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.budget.golden index 258148cc9b3..9e30b07f7cd 100644 --- a/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.budget.golden @@ -1,2 +1,2 @@ -({cpu: 224100 -| mem: 1500}) \ No newline at end of file +({cpu: 128100 +| mem: 900}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.uplc.golden index 449b242be9a..8d8d0a76fac 100644 --- a/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/anyEmptyList.uplc.golden @@ -1,10 +1,10 @@ (program 1.1.0 - ((\s -> s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 1 [])) , (\x xs -> delay @@ -12,6 +12,6 @@ (force (force ifThenElse (lessThanEqualsInteger 1 x) - (delay (delay (s s xs))) + (delay (delay (rec xs))) (delay (delay (constr 0 []))))))) ])) (constr 0 []))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/anyExpensive.budget.golden b/plutus-tx-plugin/test/Budget/9.6/anyExpensive.budget.golden index 0fcf3e05164..746a99a31fb 100644 --- a/plutus-tx-plugin/test/Budget/9.6/anyExpensive.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/anyExpensive.budget.golden @@ -1,2 +1,2 @@ -({cpu: 6062960 -| mem: 30520}) \ No newline at end of file +({cpu: 5486960 +| mem: 26920}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/anyExpensive.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/anyExpensive.uplc.golden index 2d4571c1c61..0184d73f5cf 100644 --- a/plutus-tx-plugin/test/Budget/9.6/anyExpensive.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/anyExpensive.uplc.golden @@ -1,11 +1,10 @@ (program 1.1.0 - ((\s -> - s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 1 [])) , (\x xs -> delay @@ -13,7 +12,7 @@ (force (force ifThenElse (lessThanEqualsInteger 1 x) - (delay (delay (s s xs))) + (delay (delay (rec xs))) (delay (delay (constr 0 []))))))) ])) (constr 1 [ 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/builtinListIndexing.budget.golden b/plutus-tx-plugin/test/Budget/9.6/builtinListIndexing.budget.golden index 98c445bb648..7ab43ecbc81 100644 --- a/plutus-tx-plugin/test/Budget/9.6/builtinListIndexing.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/builtinListIndexing.budget.golden @@ -1,2 +1,2 @@ -({cpu: 8593207 -| mem: 35130}) \ No newline at end of file +({cpu: 8257207 +| mem: 33030}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/builtinListIndexing.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/builtinListIndexing.uplc.golden index 403b9d99cd5..b8b544a5c99 100644 --- a/plutus-tx-plugin/test/Budget/9.6/builtinListIndexing.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/builtinListIndexing.uplc.golden @@ -1,22 +1,21 @@ (program 1.1.0 ((\go d -> go (unListData d) 5) - ((\s -> s s) - (\s xs i -> - force - (force (force chooseList) - xs - (delay (\ds -> error)) - (delay - ((\x xs ds eta -> - force - (force - (force ifThenElse - (equalsInteger 0 i) - (delay (delay x)) - (delay - (delay (s s xs (subtractInteger i 1))))))) - (force headList xs) - (force tailList xs)))) - (constr 0 []) - (constr 0 []))))) \ No newline at end of file + (fix rec. + \x i -> + force + (force (force chooseList) + x + (delay (\ds -> error)) + (delay + ((\x xs ds eta -> + force + (force + (force ifThenElse + (equalsInteger 0 i) + (delay (delay x)) + (delay (delay (rec xs (subtractInteger i 1))))))) + (force headList x) + (force tailList x)))) + (constr 0 []) + (constr 0 [])))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/constAccL.budget.golden b/plutus-tx-plugin/test/Budget/9.6/constAccL.budget.golden index 7f146314931..87eac25f69d 100644 --- a/plutus-tx-plugin/test/Budget/9.6/constAccL.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/constAccL.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1086205986 -| mem: 5410302}) \ No newline at end of file +({cpu: 990109986 +| mem: 4809702}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/constAccL.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/constAccL.uplc.golden index e7b8462b08b..02d3d4913c0 100644 --- a/plutus-tx-plugin/test/Budget/9.6/constAccL.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/constAccL.uplc.golden @@ -17,4 +17,4 @@ (fix1 (\go acc ds -> force (case ds [(delay acc), (\x xs -> delay (go acc xs))])))) - (\f -> (\s -> s s) (\s -> f (\x -> s s x))))) \ No newline at end of file + (\f -> fix rec. \x -> f rec x))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/constAccR.budget.golden b/plutus-tx-plugin/test/Budget/9.6/constAccR.budget.golden index 11a791944db..a6ea83c6160 100644 --- a/plutus-tx-plugin/test/Budget/9.6/constAccR.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/constAccR.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1038061986 -| mem: 5109402}) \ No newline at end of file +({cpu: 941965986 +| mem: 4508802}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/constAccR.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/constAccR.uplc.golden index 0ff0d343daa..0fb0f99fd7e 100644 --- a/plutus-tx-plugin/test/Budget/9.6/constAccR.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/constAccR.uplc.golden @@ -13,4 +13,4 @@ (delay (delay (constr 1 [1, (go (subtractInteger n 1))])))))) 1000)) - (\f -> (\s -> s s) (\s -> f (\x -> s s x))))) \ No newline at end of file + (\f -> fix rec. \x -> f rec x))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/constElL.budget.golden b/plutus-tx-plugin/test/Budget/9.6/constElL.budget.golden index 7f146314931..87eac25f69d 100644 --- a/plutus-tx-plugin/test/Budget/9.6/constElL.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/constElL.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1086205986 -| mem: 5410302}) \ No newline at end of file +({cpu: 990109986 +| mem: 4809702}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/constElL.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/constElL.uplc.golden index 124fd03ada5..cc15ddc645d 100644 --- a/plutus-tx-plugin/test/Budget/9.6/constElL.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/constElL.uplc.golden @@ -17,4 +17,4 @@ (fix1 (\go acc ds -> force (case ds [(delay acc), (\x xs -> delay (go x xs))])))) - (\f -> (\s -> s s) (\s -> f (\x -> s s x))))) \ No newline at end of file + (\f -> fix rec. \x -> f rec x))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/constElR.budget.golden b/plutus-tx-plugin/test/Budget/9.6/constElR.budget.golden index 3dfd7d30b66..157cce6aeb3 100644 --- a/plutus-tx-plugin/test/Budget/9.6/constElR.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/constElR.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1086061986 -| mem: 5409402}) \ No newline at end of file +({cpu: 989965986 +| mem: 4808802}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/constElR.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/constElR.uplc.golden index 10ecc6525c2..c7b6c9a74cc 100644 --- a/plutus-tx-plugin/test/Budget/9.6/constElR.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/constElR.uplc.golden @@ -14,4 +14,4 @@ (delay (delay (constr 1 [1, (go (subtractInteger n 1))])))))) 1000)) - (\f -> (\s -> s s) (\s -> f (\x -> s s x))))) \ No newline at end of file + (\f -> fix rec. \x -> f rec x))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/elemCheap.budget.golden b/plutus-tx-plugin/test/Budget/9.6/elemCheap.budget.golden index 78391dbcf1a..a0fffd703f9 100644 --- a/plutus-tx-plugin/test/Budget/9.6/elemCheap.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/elemCheap.budget.golden @@ -1,2 +1,2 @@ -({cpu: 944482 -| mem: 5202}) \ No newline at end of file +({cpu: 848482 +| mem: 4602}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/elemCheap.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/elemCheap.uplc.golden index fa3edc63c34..d7e433f7d03 100644 --- a/plutus-tx-plugin/test/Budget/9.6/elemCheap.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/elemCheap.uplc.golden @@ -1,11 +1,10 @@ (program 1.1.0 - ((\s -> - s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 1 [])) , (\x xs -> delay @@ -14,7 +13,7 @@ (force ifThenElse (equalsInteger 1 x) (delay (delay (constr 0 []))) - (delay (delay (s s xs))))))) ])) + (delay (delay (rec xs))))))) ])) (constr 1 [ 1 , (constr 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/elemExpensive.budget.golden b/plutus-tx-plugin/test/Budget/9.6/elemExpensive.budget.golden index 524d1d54703..5251888478c 100644 --- a/plutus-tx-plugin/test/Budget/9.6/elemExpensive.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/elemExpensive.budget.golden @@ -1,2 +1,2 @@ -({cpu: 6147920 -| mem: 30520}) \ No newline at end of file +({cpu: 5571920 +| mem: 26920}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/elemExpensive.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/elemExpensive.uplc.golden index e2053411e8d..7c598d4f0e8 100644 --- a/plutus-tx-plugin/test/Budget/9.6/elemExpensive.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/elemExpensive.uplc.golden @@ -1,11 +1,10 @@ (program 1.1.0 - ((\s -> - s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 1 [])) , (\x xs -> delay @@ -14,7 +13,7 @@ (force ifThenElse (equalsInteger 0 x) (delay (delay (constr 0 []))) - (delay (delay (s s xs))))))) ])) + (delay (delay (rec xs))))))) ])) (constr 1 [ 1 , (constr 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/filter.budget.golden b/plutus-tx-plugin/test/Budget/9.6/filter.budget.golden index a7ed628c2b2..2b42bfa5b36 100644 --- a/plutus-tx-plugin/test/Budget/9.6/filter.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/filter.budget.golden @@ -1,2 +1,2 @@ -({cpu: 8747220 -| mem: 38530}) \ No newline at end of file +({cpu: 8171220 +| mem: 34930}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/filter.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/filter.uplc.golden index 72304b4ad4e..450f74c3ad3 100644 --- a/plutus-tx-plugin/test/Budget/9.6/filter.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/filter.uplc.golden @@ -1,11 +1,10 @@ (program 1.1.0 - ((\s -> - s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 0 [])) , (\x xs -> delay @@ -16,7 +15,7 @@ (equalsInteger 0 (modInteger x 2)) (delay (delay (constr 1 [x, xs]))) (delay (delay xs))))) - (s s xs))) ])) + (rec xs))) ])) (constr 1 [ 1 , (constr 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/findCheap.budget.golden b/plutus-tx-plugin/test/Budget/9.6/findCheap.budget.golden index e3158b829b5..40451c28217 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findCheap.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findCheap.budget.golden @@ -1,2 +1,2 @@ -({cpu: 951986 -| mem: 5302}) \ No newline at end of file +({cpu: 855986 +| mem: 4702}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findCheap.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/findCheap.uplc.golden index d905d620a00..737e96a30da 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findCheap.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findCheap.uplc.golden @@ -1,11 +1,10 @@ (program 1.1.0 - ((\s -> - s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 1 [])) , (\x xs -> delay @@ -13,7 +12,7 @@ (force (force ifThenElse (lessThanEqualsInteger 10 x) - (delay (delay (s s xs))) + (delay (delay (rec xs))) (delay (delay (constr 0 [x]))))))) ])) (constr 1 [ 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/findEmptyList.budget.golden b/plutus-tx-plugin/test/Budget/9.6/findEmptyList.budget.golden index 258148cc9b3..9e30b07f7cd 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findEmptyList.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findEmptyList.budget.golden @@ -1,2 +1,2 @@ -({cpu: 224100 -| mem: 1500}) \ No newline at end of file +({cpu: 128100 +| mem: 900}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findEmptyList.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/findEmptyList.uplc.golden index eebdf7cdfb4..f3a2a705e98 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findEmptyList.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findEmptyList.uplc.golden @@ -1,10 +1,10 @@ (program 1.1.0 - ((\s -> s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 1 [])) , (\x xs -> delay @@ -12,6 +12,6 @@ (force (force ifThenElse (lessThanEqualsInteger 1 x) - (delay (delay (s s xs))) + (delay (delay (rec xs))) (delay (delay (constr 0 [x]))))))) ])) (constr 0 []))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findExpensive.budget.golden b/plutus-tx-plugin/test/Budget/9.6/findExpensive.budget.golden index 0fcf3e05164..746a99a31fb 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findExpensive.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findExpensive.budget.golden @@ -1,2 +1,2 @@ -({cpu: 6062960 -| mem: 30520}) \ No newline at end of file +({cpu: 5486960 +| mem: 26920}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findExpensive.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/findExpensive.uplc.golden index 1182f5d3ca5..cf7833f28c7 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findExpensive.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findExpensive.uplc.golden @@ -1,11 +1,10 @@ (program 1.1.0 - ((\s -> - s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 1 [])) , (\x xs -> delay @@ -13,7 +12,7 @@ (force (force ifThenElse (lessThanEqualsInteger 1 x) - (delay (delay (s s xs))) + (delay (delay (rec xs))) (delay (delay (constr 0 [x]))))))) ])) (constr 1 [ 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.budget.golden b/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.budget.golden index 8c7f896e465..85d86df088d 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.budget.golden @@ -1,2 +1,2 @@ -({cpu: 999986 -| mem: 5602}) \ No newline at end of file +({cpu: 903986 +| mem: 5002}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.uplc.golden index 360bcd0e178..1164d6c1a45 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findIndexCheap.uplc.golden @@ -1,8 +1,7 @@ (program 1.1.0 - ((\s -> - s s) - (\s i ds -> + ((fix rec. + \x ds -> force (case ds @@ -13,9 +12,8 @@ (force (force ifThenElse (lessThanEqualsInteger 10 x) - (delay - (delay ((\x -> s s x) (addInteger 1 i) xs))) - (delay (delay (constr 0 [i]))))))) ])) + (delay (delay (rec (addInteger 1 x) xs))) + (delay (delay (constr 0 [x]))))))) ])) 0 (constr 1 [ 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.budget.golden b/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.budget.golden index f801b7f3733..c8a31d1d728 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.budget.golden @@ -1,2 +1,2 @@ -({cpu: 272100 -| mem: 1800}) \ No newline at end of file +({cpu: 176100 +| mem: 1200}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.uplc.golden index 4ab11b04206..8df7032324d 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findIndexEmptyList.uplc.golden @@ -1,7 +1,7 @@ (program 1.1.0 - ((\s -> s s) - (\s i ds -> + ((fix rec. + \x ds -> force (case ds @@ -12,8 +12,7 @@ (force (force ifThenElse (lessThanEqualsInteger 1 x) - (delay - (delay ((\x -> s s x) (addInteger 1 i) xs))) - (delay (delay (constr 0 [i]))))))) ])) + (delay (delay (rec (addInteger 1 x) xs))) + (delay (delay (constr 0 [x]))))))) ])) 0 (constr 0 []))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.budget.golden b/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.budget.golden index 8372dd64ca3..80e405a12d8 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.budget.golden @@ -1,2 +1,2 @@ -({cpu: 8723040 -| mem: 40840}) \ No newline at end of file +({cpu: 7667040 +| mem: 34240}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.uplc.golden index ae2f5416988..4d0ec5d9f6f 100644 --- a/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/findIndexExpensive.uplc.golden @@ -1,8 +1,7 @@ (program 1.1.0 - ((\s -> - s s) - (\s i ds -> + ((fix rec. + \x ds -> force (case ds @@ -13,9 +12,8 @@ (force (force ifThenElse (lessThanEqualsInteger 1 x) - (delay - (delay ((\x -> s s x) (addInteger 1 i) xs))) - (delay (delay (constr 0 [i]))))))) ])) + (delay (delay (rec (addInteger 1 x) xs))) + (delay (delay (constr 0 [x]))))))) ])) 0 (constr 1 [ 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/gte0.budget.golden b/plutus-tx-plugin/test/Budget/9.6/gte0.budget.golden index 913ba9ca007..09472f0059c 100644 --- a/plutus-tx-plugin/test/Budget/9.6/gte0.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/gte0.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1399400986 -| mem: 6611402}) \ No newline at end of file +({cpu: 1303304986 +| mem: 6010802}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/gte0.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/gte0.uplc.golden index b13cb2e381f..5831e3c9bd3 100644 --- a/plutus-tx-plugin/test/Budget/9.6/gte0.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/gte0.uplc.golden @@ -25,4 +25,4 @@ (delay (delay (constr 1 [0, (go (subtractInteger n 1))])))))) 1000)) - (\f -> (\s -> s s) (\s -> f (\x -> s s x))))) \ No newline at end of file + (\f -> fix rec. \x -> f rec x))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/listIndexing.budget.golden b/plutus-tx-plugin/test/Budget/9.6/listIndexing.budget.golden index b1b2cfdc66c..1ebab96c799 100644 --- a/plutus-tx-plugin/test/Budget/9.6/listIndexing.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/listIndexing.budget.golden @@ -1,2 +1,2 @@ -({cpu: 6684432 -| mem: 33922}) \ No newline at end of file +({cpu: 6108432 +| mem: 30322}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/listIndexing.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/listIndexing.uplc.golden index 842a6a8312b..111265abd77 100644 --- a/plutus-tx-plugin/test/Budget/9.6/listIndexing.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/listIndexing.uplc.golden @@ -1,21 +1,19 @@ (program 1.1.0 ((\go xs -> go 5 xs) - ((\s -> s s) - (\s ds ds -> - force - (case - ds - [ (delay error) - , (\x xs -> - delay - (force - (force - (force ifThenElse - (equalsInteger 0 ds) - (delay (delay x)) - (delay - (delay - ((\x -> s s x) - (subtractInteger ds 1) - xs))))))) ]))))) \ No newline at end of file + (fix rec. + \x ds -> + force + (case + ds + [ (delay error) + , (\x xs -> + delay + (force + (force + (force ifThenElse + (equalsInteger 0 x) + (delay (delay x)) + (delay + (delay + (rec (subtractInteger x 1) xs))))))) ])))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/lte0.budget.golden b/plutus-tx-plugin/test/Budget/9.6/lte0.budget.golden index 08800d00a36..cecb994b948 100644 --- a/plutus-tx-plugin/test/Budget/9.6/lte0.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/lte0.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1397947986 -| mem: 6611402}) \ No newline at end of file +({cpu: 1301851986 +| mem: 6010802}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/lte0.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/lte0.uplc.golden index 5698af36e16..ac42d3a3ea2 100644 --- a/plutus-tx-plugin/test/Budget/9.6/lte0.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/lte0.uplc.golden @@ -25,4 +25,4 @@ (delay (delay (constr 1 [0, (go (subtractInteger n 1))])))))) 1000)) - (\f -> (\s -> s s) (\s -> f (\x -> s s x))))) \ No newline at end of file + (\f -> fix rec. \x -> f rec x))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/map1-budget.budget.golden b/plutus-tx-plugin/test/Budget/9.6/map1-budget.budget.golden index bf692a3a26a..14bde1fe6a5 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map1-budget.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/map1-budget.budget.golden @@ -1,2 +1,2 @@ -({cpu: 279348667 -| mem: 788158}) \ No newline at end of file +({cpu: 273252667 +| mem: 750058}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/map1.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/map1.uplc.golden index 1967a9214ca..9fdc4d72999 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map1.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/map1.uplc.golden @@ -171,4 +171,4 @@ (addInteger 1 x) lim) ]))) (delay (delay (constr 0 [])))))))) - (\f -> (\s -> s s) (\s -> f (\x -> s s x))))) \ No newline at end of file + (\f -> fix rec. \x -> f rec x))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/map2-budget.budget.golden b/plutus-tx-plugin/test/Budget/9.6/map2-budget.budget.golden index c13a0f75dc8..49f22306934 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map2-budget.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/map2-budget.budget.golden @@ -1,2 +1,2 @@ -({cpu: 134696515 -| mem: 446782}) \ No newline at end of file +({cpu: 130808515 +| mem: 422482}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/map2.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/map2.uplc.golden index 3be003ef59a..4db2ec64b63 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map2.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/map2.uplc.golden @@ -229,4 +229,4 @@ xs (delay z) (delay (f (force headList xs) (force tailList xs)))))) - (\f -> (\s -> s s) (\s -> f (\x -> s s x))))) \ No newline at end of file + (\f -> fix rec. \x -> f rec x))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/map3-budget.budget.golden b/plutus-tx-plugin/test/Budget/9.6/map3-budget.budget.golden index c13a0f75dc8..49f22306934 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map3-budget.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/map3-budget.budget.golden @@ -1,2 +1,2 @@ -({cpu: 134696515 -| mem: 446782}) \ No newline at end of file +({cpu: 130808515 +| mem: 422482}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/map3.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/map3.uplc.golden index 3be003ef59a..4db2ec64b63 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map3.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/map3.uplc.golden @@ -229,4 +229,4 @@ xs (delay z) (delay (f (force headList xs) (force tailList xs)))))) - (\f -> (\s -> s s) (\s -> f (\x -> s s x))))) \ No newline at end of file + (\f -> fix rec. \x -> f rec x))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/notElemCheap.budget.golden b/plutus-tx-plugin/test/Budget/9.6/notElemCheap.budget.golden index 78391dbcf1a..a0fffd703f9 100644 --- a/plutus-tx-plugin/test/Budget/9.6/notElemCheap.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/notElemCheap.budget.golden @@ -1,2 +1,2 @@ -({cpu: 944482 -| mem: 5202}) \ No newline at end of file +({cpu: 848482 +| mem: 4602}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/notElemCheap.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/notElemCheap.uplc.golden index db9fda02a2b..8896035efad 100644 --- a/plutus-tx-plugin/test/Budget/9.6/notElemCheap.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/notElemCheap.uplc.golden @@ -1,11 +1,10 @@ (program 1.1.0 - ((\s -> - s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 0 [])) , (\x xs -> delay @@ -14,7 +13,7 @@ (force ifThenElse (equalsInteger 1 x) (delay (delay (constr 1 []))) - (delay (delay (s s xs))))))) ])) + (delay (delay (rec xs))))))) ])) (constr 1 [ 1 , (constr 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/notElemExpensive.budget.golden b/plutus-tx-plugin/test/Budget/9.6/notElemExpensive.budget.golden index 524d1d54703..5251888478c 100644 --- a/plutus-tx-plugin/test/Budget/9.6/notElemExpensive.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/notElemExpensive.budget.golden @@ -1,2 +1,2 @@ -({cpu: 6147920 -| mem: 30520}) \ No newline at end of file +({cpu: 5571920 +| mem: 26920}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/notElemExpensive.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/notElemExpensive.uplc.golden index 05dd8338af8..c46e5e7cc43 100644 --- a/plutus-tx-plugin/test/Budget/9.6/notElemExpensive.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/notElemExpensive.uplc.golden @@ -1,11 +1,10 @@ (program 1.1.0 - ((\s -> - s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 0 [])) , (\x xs -> delay @@ -14,7 +13,7 @@ (force ifThenElse (equalsInteger 0 x) (delay (delay (constr 1 []))) - (delay (delay (s s xs))))))) ])) + (delay (delay (rec xs))))))) ])) (constr 1 [ 1 , (constr 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/orCheap.budget.golden b/plutus-tx-plugin/test/Budget/9.6/orCheap.budget.golden index e39875df9fc..286bb49bbaf 100644 --- a/plutus-tx-plugin/test/Budget/9.6/orCheap.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/orCheap.budget.golden @@ -1,2 +1,2 @@ -({cpu: 640100 -| mem: 4100}) \ No newline at end of file +({cpu: 544100 +| mem: 3500}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/orCheap.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/orCheap.uplc.golden index 22714ff32ac..4d22b8c601b 100644 --- a/plutus-tx-plugin/test/Budget/9.6/orCheap.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/orCheap.uplc.golden @@ -1,16 +1,15 @@ (program 1.1.0 - ((\s -> - s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 1 [])) , (\x xs -> delay (force - (case x [(delay (constr 0 [])), (delay (s s xs))]))) ])) + (case x [(delay (constr 0 [])), (delay (rec xs))]))) ])) (constr 1 [ (constr 0 []) , (constr 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/orExpensive.budget.golden b/plutus-tx-plugin/test/Budget/9.6/orExpensive.budget.golden index 3d610c2a12c..27d23332232 100644 --- a/plutus-tx-plugin/test/Budget/9.6/orExpensive.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/orExpensive.budget.golden @@ -1,2 +1,2 @@ -({cpu: 3104100 -| mem: 19500}) \ No newline at end of file +({cpu: 2528100 +| mem: 15900}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/orExpensive.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/orExpensive.uplc.golden index 12afb874897..0d35180924b 100644 --- a/plutus-tx-plugin/test/Budget/9.6/orExpensive.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/orExpensive.uplc.golden @@ -1,16 +1,15 @@ (program 1.1.0 - ((\s -> - s s) - (\s ds -> + ((fix rec. + \x -> force (case - ds + x [ (delay (constr 1 [])) , (\x xs -> delay (force - (case x [(delay (constr 0 [])), (delay (s s xs))]))) ])) + (case x [(delay (constr 0 [])), (delay (rec xs))]))) ])) (constr 1 [ (constr 1 []) , (constr 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.budget.golden b/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.budget.golden index 5460f9a981d..129793a7e0c 100644 --- a/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1575672986 -| mem: 7713102}) \ No newline at end of file +({cpu: 1479576986 +| mem: 7112502}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.uplc.golden index dfe8b48b92d..59f8e961ffc 100644 --- a/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/recursiveGte0.uplc.golden @@ -43,4 +43,4 @@ (delay (delay (constr 1 [0, (go (subtractInteger n 1))])))))))) - (\f -> (\s -> s s) (\s -> f (\x -> s s x))))) \ No newline at end of file + (\f -> fix rec. \x -> f rec x))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/recursiveLte0.budget.golden b/plutus-tx-plugin/test/Budget/9.6/recursiveLte0.budget.golden index 5da3ded8162..3d441eb134e 100644 --- a/plutus-tx-plugin/test/Budget/9.6/recursiveLte0.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/recursiveLte0.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1574219986 -| mem: 7713102}) \ No newline at end of file +({cpu: 1478123986 +| mem: 7112502}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/recursiveLte0.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/recursiveLte0.uplc.golden index 97d380b65ff..b475f189702 100644 --- a/plutus-tx-plugin/test/Budget/9.6/recursiveLte0.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/recursiveLte0.uplc.golden @@ -43,4 +43,4 @@ (delay (delay (constr 1 [0, (go (subtractInteger n 1))])))))))) - (\f -> (\s -> s s) (\s -> f (\x -> s s x))))) \ No newline at end of file + (\f -> fix rec. \x -> f rec x))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/show.budget.golden b/plutus-tx-plugin/test/Budget/9.6/show.budget.golden index 6c908cc9bcc..072a99c1f32 100644 --- a/plutus-tx-plugin/test/Budget/9.6/show.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/show.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1612656718 -| mem: 7416190}) \ No newline at end of file +({cpu: 1556592718 +| mem: 7065790}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/show.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/show.uplc.golden index ef9ba5eb081..b6663f1dcab 100644 --- a/plutus-tx-plugin/test/Budget/9.6/show.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/show.uplc.golden @@ -507,4 +507,4 @@ (constr 1 [(remainderInteger n 10), acc]) x)))))) (quotientInteger n 10)))) - (\f -> (\s -> s s) (\s -> f (\x -> s s x))))) \ No newline at end of file + (\f -> fix rec. \x -> f rec x))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/sum.budget.golden b/plutus-tx-plugin/test/Budget/9.6/sum.budget.golden index 88a83179671..83ca68558ea 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sum.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/sum.budget.golden @@ -1,2 +1,2 @@ -({cpu: 5476180 -| mem: 28020}) \ No newline at end of file +({cpu: 4900180 +| mem: 24420}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/sum.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/sum.uplc.golden index b7b1aaf24e0..cc81ecbe31a 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sum.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/sum.uplc.golden @@ -4,10 +4,10 @@ (\f -> (\z -> (\go eta -> go eta) - ((\s -> s s) - (\s ds -> - force - (case ds [(delay z), (\x xs -> delay (f x (s s xs)))])))) + (fix rec. + \x -> + force + (case x [(delay z), (\x xs -> delay (f x (rec xs)))]))) (case `$dAdditiveMonoid` [(\v v -> v)])) (case `$dAdditiveMonoid` [(\v v -> v)]) (constr 1 diff --git a/plutus-tx-plugin/test/Budget/9.6/sumL.budget.golden b/plutus-tx-plugin/test/Budget/9.6/sumL.budget.golden index a53a72b01d3..8242ac467d7 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sumL.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/sumL.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1299461986 -| mem: 6112602}) \ No newline at end of file +({cpu: 1203365986 +| mem: 5512002}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/sumL.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/sumL.uplc.golden index ac95726d0d2..210a87e4236 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sumL.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/sumL.uplc.golden @@ -26,4 +26,4 @@ ds [ (delay acc) , (\x xs -> delay (go (addInteger acc x) xs)) ])))) - (\f -> (\s -> s s) (\s -> f (\x -> s s x))))) \ No newline at end of file + (\f -> fix rec. \x -> f rec x))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/sumR.budget.golden b/plutus-tx-plugin/test/Budget/9.6/sumR.budget.golden index f63c965f6b6..45d1b2606b9 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sumR.budget.golden +++ b/plutus-tx-plugin/test/Budget/9.6/sumR.budget.golden @@ -1,2 +1,2 @@ -({cpu: 1251317986 -| mem: 5811702}) \ No newline at end of file +({cpu: 1155221986 +| mem: 5211102}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/sumR.uplc.golden b/plutus-tx-plugin/test/Budget/9.6/sumR.uplc.golden index ba7ce15ffce..a2cdbdbb28a 100644 --- a/plutus-tx-plugin/test/Budget/9.6/sumR.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/sumR.uplc.golden @@ -21,4 +21,4 @@ (delay (delay (constr 0 [])))))) 1 1000)) - (\f -> (\s -> s s) (\s -> f (\x -> s s x))))) \ No newline at end of file + (\f -> fix rec. \x -> f rec x))) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Data/9.6/recursive/sameEmptyRose.uplc.golden b/plutus-tx-plugin/test/Plugin/Data/9.6/recursive/sameEmptyRose.uplc.golden index b59ff296098..4891fc5c0cf 100644 --- a/plutus-tx-plugin/test/Plugin/Data/9.6/recursive/sameEmptyRose.uplc.golden +++ b/plutus-tx-plugin/test/Plugin/Data/9.6/recursive/sameEmptyRose.uplc.golden @@ -139,11 +139,7 @@ program (\x -> delay (\case_Nil case_Cons -> case x [case_Nil, case_Cons])))) - (delay - (delay - (\f -> - force (delay (\s -> s s)) - (\s -> f (\x -> force (delay (\s -> s s)) s x)))))) + (delay (delay (\f -> fix rec. \x -> f rec x)))) (delay (delay (delay @@ -163,13 +159,7 @@ program f)))))))) (delay (\by -> - force - (force - (delay - (delay - (\f -> - force (delay (\s -> s s)) - (\s -> f (\x -> force (delay (\s -> s s)) s x)))))) + force (force (delay (delay (\f -> fix rec. \x -> f rec x)))) (\rec h -> delay (\fr -> diff --git a/plutus-tx-plugin/test/size/Golden/Rational/Additive/minus.size.golden b/plutus-tx-plugin/test/size/Golden/Rational/Additive/minus.size.golden index 9f728587959..c147342cbef 100644 --- a/plutus-tx-plugin/test/size/Golden/Rational/Additive/minus.size.golden +++ b/plutus-tx-plugin/test/size/Golden/Rational/Additive/minus.size.golden @@ -1 +1 @@ -88 \ No newline at end of file +81 \ No newline at end of file diff --git a/plutus-tx-plugin/test/size/Golden/Rational/Additive/plus.size.golden b/plutus-tx-plugin/test/size/Golden/Rational/Additive/plus.size.golden index 9f728587959..c147342cbef 100644 --- a/plutus-tx-plugin/test/size/Golden/Rational/Additive/plus.size.golden +++ b/plutus-tx-plugin/test/size/Golden/Rational/Additive/plus.size.golden @@ -1 +1 @@ -88 \ No newline at end of file +81 \ No newline at end of file diff --git a/plutus-tx-plugin/test/size/Golden/Rational/Construction/ratio.size.golden b/plutus-tx-plugin/test/size/Golden/Rational/Construction/ratio.size.golden index 66321c084ca..cd004727f24 100644 --- a/plutus-tx-plugin/test/size/Golden/Rational/Construction/ratio.size.golden +++ b/plutus-tx-plugin/test/size/Golden/Rational/Construction/ratio.size.golden @@ -1 +1 @@ -189 \ No newline at end of file +182 \ No newline at end of file diff --git a/plutus-tx-plugin/test/size/Golden/Rational/Construction/unsafeRatio.size.golden b/plutus-tx-plugin/test/size/Golden/Rational/Construction/unsafeRatio.size.golden index 176fdebf1bd..d25720879e9 100644 --- a/plutus-tx-plugin/test/size/Golden/Rational/Construction/unsafeRatio.size.golden +++ b/plutus-tx-plugin/test/size/Golden/Rational/Construction/unsafeRatio.size.golden @@ -1 +1 @@ -119 \ No newline at end of file +112 \ No newline at end of file diff --git a/plutus-tx-plugin/test/size/Golden/Rational/Multiplicative/scale.size.golden b/plutus-tx-plugin/test/size/Golden/Rational/Multiplicative/scale.size.golden index 8c0474e3239..b2412e34dff 100644 --- a/plutus-tx-plugin/test/size/Golden/Rational/Multiplicative/scale.size.golden +++ b/plutus-tx-plugin/test/size/Golden/Rational/Multiplicative/scale.size.golden @@ -1 +1 @@ -69 \ No newline at end of file +62 \ No newline at end of file diff --git a/plutus-tx-plugin/test/size/Golden/Rational/Multiplicative/times.size.golden b/plutus-tx-plugin/test/size/Golden/Rational/Multiplicative/times.size.golden index e3f1e9b791c..e77a96349c0 100644 --- a/plutus-tx-plugin/test/size/Golden/Rational/Multiplicative/times.size.golden +++ b/plutus-tx-plugin/test/size/Golden/Rational/Multiplicative/times.size.golden @@ -1 +1 @@ -80 \ No newline at end of file +73 \ No newline at end of file diff --git a/plutus-tx-plugin/test/size/Golden/Rational/Other/round.size.golden b/plutus-tx-plugin/test/size/Golden/Rational/Other/round.size.golden index f3a5e81bae4..74de09f2e7a 100644 --- a/plutus-tx-plugin/test/size/Golden/Rational/Other/round.size.golden +++ b/plutus-tx-plugin/test/size/Golden/Rational/Other/round.size.golden @@ -1 +1 @@ -281 \ No newline at end of file +274 \ No newline at end of file diff --git a/plutus-tx-plugin/test/size/Golden/Rational/Serialization/fromBuiltinData.size.golden b/plutus-tx-plugin/test/size/Golden/Rational/Serialization/fromBuiltinData.size.golden index 0a1b63de8b7..387c46fdec8 100644 --- a/plutus-tx-plugin/test/size/Golden/Rational/Serialization/fromBuiltinData.size.golden +++ b/plutus-tx-plugin/test/size/Golden/Rational/Serialization/fromBuiltinData.size.golden @@ -1 +1 @@ -353 \ No newline at end of file +346 \ No newline at end of file diff --git a/plutus-tx-plugin/test/size/Golden/Rational/Serialization/unsafeFromBuiltinData.size.golden b/plutus-tx-plugin/test/size/Golden/Rational/Serialization/unsafeFromBuiltinData.size.golden index 8e24a69a053..946b551d71c 100644 --- a/plutus-tx-plugin/test/size/Golden/Rational/Serialization/unsafeFromBuiltinData.size.golden +++ b/plutus-tx-plugin/test/size/Golden/Rational/Serialization/unsafeFromBuiltinData.size.golden @@ -1 +1 @@ -198 \ No newline at end of file +191 \ No newline at end of file