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 6d3b616d676..cd987c736d3 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: 286368915 -| mem: 1412765}) \ No newline at end of file +({cpu: 286144915 +| mem: 1411365}) \ 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 cf3eec7f8c6..f50851e1157 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: 405208478 -| mem: 1736828}) \ No newline at end of file +({cpu: 404984478 +| mem: 1735428}) \ 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 f758e7d1c92..5720beb2a5d 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: 970537702 -| mem: 5008618}) \ No newline at end of file +({cpu: 970025702 +| mem: 5005418}) \ 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 e20b3d835ce..25f17695952 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: 733922042 -| mem: 3417793}) \ No newline at end of file +({cpu: 733346042 +| mem: 3414193}) \ 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 d943c5f6f29..125fda07b20 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: 838937402 -| mem: 2443132}) \ No newline at end of file +({cpu: 838521402 +| mem: 2440532}) \ 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 ef7fabefa96..3b79fbb52ee 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: 267131370 -| mem: 1324923}) \ No newline at end of file +({cpu: 266907370 +| mem: 1323523}) \ 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 f9c649332f2..cfce6546c05 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: 725985759 -| mem: 3518170}) \ No newline at end of file +({cpu: 725441759 +| mem: 3514770}) \ 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 2480f7c63f7..9e0cef20e0b 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: 709557036 -| mem: 3530929}) \ No newline at end of file +({cpu: 708917036 +| mem: 3526929}) \ 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 751a3beb143..ba0ab0c83db 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: 675453323 -| mem: 3208963}) \ No newline at end of file +({cpu: 674717323 +| mem: 3204363}) \ 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 321a90913ed..bbf58fd78b6 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: 996521658 -| mem: 4564793}) \ No newline at end of file +({cpu: 994825658 +| mem: 4554193}) \ 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 8193b03507b..e67a83576d3 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: 973269329 -| mem: 4195846}) \ No newline at end of file +({cpu: 971605329 +| mem: 4185446}) \ 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 c868079c958..505161449a2 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: 956663047 -| mem: 4745859}) \ No newline at end of file +({cpu: 955927047 +| mem: 4741259}) \ 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 e66381a12c6..3cb0aa69eb6 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: 1058013394 -| mem: 5200161}) \ No newline at end of file +({cpu: 1056957394 +| mem: 5193561}) \ 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 fe3f6fa6878..35c5c3c7596 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: 1295958269 -| mem: 6273810}) \ No newline at end of file +({cpu: 1294902269 +| mem: 6267210}) \ 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 18275692324..6ca233ed8ea 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: 432269686 -| mem: 2164683}) \ No newline at end of file +({cpu: 431885686 +| mem: 2162283}) \ 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 0fdc6b64055..7c39c2553f7 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: 684942441 -| mem: 3343811}) \ No newline at end of file +({cpu: 684366441 +| mem: 3340211}) \ 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 83a8a567aeb..051bb129d5b 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: 449900894 -| mem: 2243375}) \ No newline at end of file +({cpu: 449420894 +| mem: 2240375}) \ 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 a0c5bafa4e9..ab0a8cf66f3 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: 687598636 -| mem: 3403683}) \ No newline at end of file +({cpu: 687086636 +| mem: 3400483}) \ 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 38bd3631a1f..f6b783dffd2 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: 269577310 -| mem: 1331225}) \ No newline at end of file +({cpu: 269353310 +| mem: 1329825}) \ 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 bbb8c0b8e49..18024912e64 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: 857490084 -| mem: 4115952}) \ No newline at end of file +({cpu: 857074084 +| mem: 4113352}) \ 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 f558bcd6039..3b3dabe41a6 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: 706612042 -| mem: 3208409}) \ No newline at end of file +({cpu: 705876042 +| mem: 3203809}) \ 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 8a6f20d5a29..5808fad6357 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: 269631868 -| mem: 1331225}) \ No newline at end of file +({cpu: 269407868 +| mem: 1329825}) \ 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 8947c2f868c..b194c56b716 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: 955492104 -| mem: 1271754}) \ No newline at end of file +({cpu: 955332104 +| mem: 1270754}) \ 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 af0fd1ef0ca..7793070f4d7 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: 3865994919 -| mem: 1679986}) \ No newline at end of file +({cpu: 3865674919 +| mem: 1677986}) \ 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 cae40bdfcbe..899aae11ced 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: 325668681 -| mem: 1594950}) \ No newline at end of file +({cpu: 325508681 +| mem: 1593950}) \ 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 ef7fabefa96..3b79fbb52ee 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: 267131370 -| mem: 1324923}) \ No newline at end of file +({cpu: 266907370 +| mem: 1323523}) \ 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 11d4f1cdd5c..19776d9d22a 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: 503750002 -| mem: 2555502}) \ No newline at end of file +({cpu: 503494002 +| mem: 2553902}) \ 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 da297e9251b..54de08e9405 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: 1755170702 -| mem: 1682606}) \ No newline at end of file +({cpu: 1754786702 +| mem: 1680206}) \ 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 6fc03c2232b..4d0c43a1ca0 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: 842791320 -| mem: 3172552}) \ No newline at end of file +({cpu: 841735320 +| mem: 3165952}) \ 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 dd10885aa88..b46f0cc1a35 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: 718213728 -| mem: 3579895}) \ No newline at end of file +({cpu: 717573728 +| mem: 3575895}) \ 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 573799f345f..9888b08a277 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: 713157245 -| mem: 3316064}) \ No newline at end of file +({cpu: 712741245 +| mem: 3313464}) \ 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 d228e5c5069..53595531417 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: 1079801807 -| mem: 5468076}) \ No newline at end of file +({cpu: 1079129807 +| mem: 5463876}) \ 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 38bd3631a1f..f6b783dffd2 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: 269577310 -| mem: 1331225}) \ No newline at end of file +({cpu: 269353310 +| mem: 1329825}) \ 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 cbab5ce7d77..17d91714819 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: 420000222 -| mem: 2104367}) \ No newline at end of file +({cpu: 419616222 +| mem: 2101967}) \ 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 c12b6a07e6e..c5a9cf4e2d9 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: 573408620 -| mem: 2884088}) \ No newline at end of file +({cpu: 573056620 +| mem: 2881888}) \ 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 8e68068ca2b..f224f0d94e6 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: 692309597 -| mem: 3361636}) \ No newline at end of file +({cpu: 691765597 +| mem: 3358236}) \ 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 ef7fabefa96..3b79fbb52ee 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: 267131370 -| mem: 1324923}) \ No newline at end of file +({cpu: 266907370 +| mem: 1323523}) \ 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 c44f2321e28..3baf5996950 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: 749931900 -| mem: 3556344}) \ No newline at end of file +({cpu: 749259900 +| mem: 3552144}) \ 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 ef7fabefa96..3b79fbb52ee 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: 267131370 -| mem: 1324923}) \ No newline at end of file +({cpu: 266907370 +| mem: 1323523}) \ 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 7b2df733f5b..21b61f92f5e 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: 964439900 -| mem: 4827493}) \ No newline at end of file +({cpu: 963703900 +| mem: 4822893}) \ 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 eddad8d0619..2f2bd79f095 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: 635743703 -| mem: 3171501}) \ No newline at end of file +({cpu: 635103703 +| mem: 3167501}) \ 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 9e66b207e77..e644eabe5da 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: 364245225 -| mem: 1625192}) \ No newline at end of file +({cpu: 364085225 +| mem: 1624192}) \ 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 0b483016055..c1316263032 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: 325562631 -| mem: 1572187}) \ No newline at end of file +({cpu: 325146631 +| mem: 1569587}) \ 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 c2900077380..7f15973e17a 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: 333106133 -| mem: 1606653}) \ No newline at end of file +({cpu: 332690133 +| mem: 1604053}) \ 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 ef7fabefa96..3b79fbb52ee 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: 267131370 -| mem: 1324923}) \ No newline at end of file +({cpu: 266907370 +| mem: 1323523}) \ 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 4daccc576ff..45ca7dabf76 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: 724343997 -| mem: 3670360}) \ No newline at end of file +({cpu: 723991997 +| mem: 3668160}) \ 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 ef7fabefa96..3b79fbb52ee 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: 267131370 -| mem: 1324923}) \ No newline at end of file +({cpu: 266907370 +| mem: 1323523}) \ 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 56829533047..ca9637c18cb 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: 445008366 -| mem: 2226067}) \ No newline at end of file +({cpu: 444624366 +| mem: 2223667}) \ 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 7f588fd2b54..041be64758a 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: 972240544 -| mem: 4632067}) \ No newline at end of file +({cpu: 970928544 +| mem: 4623867}) \ 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 0f82c2bb80d..cd4cc22d864 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: 946853440 -| mem: 4643149}) \ No newline at end of file +({cpu: 945989440 +| mem: 4637749}) \ 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 9892fa854ad..51a5e1387c2 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: 474415895 -| mem: 2335605}) \ No newline at end of file +({cpu: 474031895 +| mem: 2333205}) \ 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 38bd3631a1f..f6b783dffd2 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: 269577310 -| mem: 1331225}) \ No newline at end of file +({cpu: 269353310 +| mem: 1329825}) \ 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 f1ef3b6d95e..79f10628681 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: 690477591 -| mem: 3429316}) \ No newline at end of file +({cpu: 689933591 +| mem: 3425916}) \ 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 eb64e330837..9ccf1278fbe 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: 446829536 -| mem: 2234259}) \ No newline at end of file +({cpu: 446445536 +| mem: 2231859}) \ 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 2ffb312366f..ada638d9333 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: 610345030 -| mem: 3053046}) \ No newline at end of file +({cpu: 609929030 +| mem: 3050446}) \ 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 e93fc2fa535..3d71d16e03c 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: 2142444779 -| mem: 1844890}) \ No newline at end of file +({cpu: 2142028779 +| mem: 1842290}) \ 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 2cea530be40..f48c81e4aec 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: 1189985473 -| mem: 4955330}) \ No newline at end of file +({cpu: 1188129473 +| mem: 4943730}) \ 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 56af6b5a11b..f8a48886385 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: 977689101 -| mem: 4859653}) \ No newline at end of file +({cpu: 976953101 +| mem: 4855053}) \ 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 af0fd1ef0ca..7793070f4d7 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: 3865994919 -| mem: 1679986}) \ No newline at end of file +({cpu: 3865674919 +| mem: 1677986}) \ 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 fec3da687e8..5d6adf8433d 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: 447399862 -| mem: 2232369}) \ No newline at end of file +({cpu: 447015862 +| mem: 2229969}) \ 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 156a519aede..3ea0d67eda1 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: 706558628 -| mem: 3396311}) \ No newline at end of file +({cpu: 705982628 +| mem: 3392711}) \ 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 a46570e43dc..2ae84abd69f 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: 434770184 -| mem: 2170985}) \ No newline at end of file +({cpu: 434386184 +| mem: 2168585}) \ 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 b8f048346ba..d5e58782bc3 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: 739640627 -| mem: 3668642}) \ No newline at end of file +({cpu: 739160627 +| mem: 3665642}) \ 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 1a48e8672c7..4c42892674d 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: 745214449 -| mem: 3786636}) \ No newline at end of file +({cpu: 744734449 +| mem: 3783636}) \ 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 bbf591c727c..f621e43d4b8 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: 633657451 -| mem: 3159825}) \ No newline at end of file +({cpu: 633017451 +| mem: 3155825}) \ 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 38e642f9ed5..57790b935e4 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: 449347998 -| mem: 2132906}) \ No newline at end of file +({cpu: 448931998 +| mem: 2130306}) \ 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 05580d95d0d..087712e0b05 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: 442562103 -| mem: 2127546}) \ No newline at end of file +({cpu: 442402103 +| mem: 2126546}) \ 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 3b1ba849a89..c67e92c7089 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: 1191280944 -| mem: 4897092}) \ No newline at end of file +({cpu: 1189840944 +| mem: 4888092}) \ 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 9a9d4500c52..27fad0758d7 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: 1075628029 -| mem: 5343496}) \ No newline at end of file +({cpu: 1074988029 +| mem: 5339496}) \ 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 cae40bdfcbe..899aae11ced 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: 325668681 -| mem: 1594950}) \ No newline at end of file +({cpu: 325508681 +| mem: 1593950}) \ 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 38bd3631a1f..f6b783dffd2 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: 269577310 -| mem: 1331225}) \ No newline at end of file +({cpu: 269353310 +| mem: 1329825}) \ 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 14fc8476d46..c1ce5433ff4 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: 1004863014 -| mem: 4592699}) \ No newline at end of file +({cpu: 1003167014 +| mem: 4582099}) \ 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 c2900077380..7f15973e17a 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: 333106133 -| mem: 1606653}) \ No newline at end of file +({cpu: 332690133 +| mem: 1604053}) \ 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 38e642f9ed5..57790b935e4 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: 449347998 -| mem: 2132906}) \ No newline at end of file +({cpu: 448931998 +| mem: 2130306}) \ 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 681f7192e85..31cd9c21f63 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: 598176829 -| mem: 2956470}) \ No newline at end of file +({cpu: 597824829 +| mem: 2954270}) \ 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 bd3555a9285..c0aea55916e 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: 279926329 -| mem: 1302595}) \ No newline at end of file +({cpu: 279542329 +| mem: 1300195}) \ 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 f693f85e55a..606aa07bf07 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: 533415898 -| mem: 2658402}) \ No newline at end of file +({cpu: 533063898 +| mem: 2656202}) \ 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 0f6b68d0347..fcad729f804 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: 1281408131 -| mem: 6177452}) \ No newline at end of file +({cpu: 1280352131 +| mem: 6170852}) \ 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 37884862a72..196d412b58e 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: 709550429 -| mem: 3552940}) \ No newline at end of file +({cpu: 709198429 +| mem: 3550740}) \ 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 81998c69a82..e825e077a9c 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: 888243786 -| mem: 4472436}) \ No newline at end of file +({cpu: 887667786 +| mem: 4468836}) \ 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 badc5423b9a..2049e72cd0b 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: 679317186 -| mem: 3423467}) \ No newline at end of file +({cpu: 678677186 +| mem: 3419467}) \ 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 fb2af2fd616..dfe76e5b4f4 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: 759448265 -| mem: 3792760}) \ No newline at end of file +({cpu: 758968265 +| mem: 3789760}) \ 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 6933d82c97c..860f9dbdce9 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: 948884459 -| mem: 1237410}) \ No newline at end of file +({cpu: 948724459 +| mem: 1236410}) \ 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 156762805d9..fbe1f7f81ef 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: 839764942 -| mem: 4187420}) \ No newline at end of file +({cpu: 839348942 +| mem: 4184820}) \ 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 6acc2482c44..8baddb85694 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: 788429962 -| mem: 3898392}) \ No newline at end of file +({cpu: 788045962 +| mem: 3895992}) \ 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 29f10eb021d..9fc8477a037 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: 450132618 -| mem: 2244403}) \ No newline at end of file +({cpu: 449652618 +| mem: 2241403}) \ 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 fc5f9d6ea06..f183f7dfed7 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: 17818297738 -| mem: 1108142}) \ No newline at end of file +({cpu: 17818201738 +| mem: 1107542}) \ 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 cb7ba11c0d7..62ec611cf80 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: 963942761 -| mem: 4848169}) \ No newline at end of file +({cpu: 963206761 +| mem: 4843569}) \ 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 ef7fabefa96..3b79fbb52ee 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: 267131370 -| mem: 1324923}) \ No newline at end of file +({cpu: 266907370 +| mem: 1323523}) \ 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 c9f563eec75..ef2239ec7b9 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: 422446162 -| mem: 2110669}) \ No newline at end of file +({cpu: 422062162 +| mem: 2108269}) \ 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 4ef08320a20..b2e0de3960c 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: 704775970 -| mem: 3550434}) \ No newline at end of file +({cpu: 704423970 +| mem: 3548234}) \ 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 dbd1519e03a..7a7313e1abf 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: 336058335 -| mem: 1548588}) \ No newline at end of file +({cpu: 335930335 +| mem: 1547788}) \ 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 3490c626d07..64c3dd6d278 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: 357246633 -| mem: 1760768}) \ No newline at end of file +({cpu: 357022633 +| mem: 1759368}) \ 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 38bd3631a1f..f6b783dffd2 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: 269577310 -| mem: 1331225}) \ No newline at end of file +({cpu: 269353310 +| mem: 1329825}) \ 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 84b635fe0cf..e55fdfed6c1 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: 868243409 -| mem: 2548554}) \ No newline at end of file +({cpu: 867731409 +| mem: 2545354}) \ 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 ef7fabefa96..3b79fbb52ee 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: 267131370 -| mem: 1324923}) \ No newline at end of file +({cpu: 266907370 +| mem: 1323523}) \ 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 ab986d872b6..04f42eaebeb 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: 602840691 -| mem: 2874706}) \ No newline at end of file +({cpu: 602424691 +| mem: 2872106}) \ 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 bcfabce89aa..27889db5141 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: 690460030 -| mem: 2821874}) \ No newline at end of file +({cpu: 689404030 +| mem: 2815274}) \ 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 4da216b275d..bce3f09301a 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: 3752789278 -| mem: 1184746}) \ No newline at end of file +({cpu: 3752661278 +| mem: 1183946}) \ 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 d5c86d72d84..3cfa65f40cd 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: 883331231 -| mem: 4318154}) \ No newline at end of file +({cpu: 882819231 +| mem: 4314954}) \ 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 c0dd4d3d503..8dfb48668a2 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 @@ -12187 \ No newline at end of file +12178 \ No newline at end of file diff --git a/plutus-tx-plugin/src/PlutusTx/Compiler/Builtins.hs b/plutus-tx-plugin/src/PlutusTx/Compiler/Builtins.hs index 7799bd8c604..e58d77de70a 100644 --- a/plutus-tx-plugin/src/PlutusTx/Compiler/Builtins.hs +++ b/plutus-tx-plugin/src/PlutusTx/Compiler/Builtins.hs @@ -183,6 +183,7 @@ builtinNames = [ , 'Builtins.verifyEd25519Signature + , ''Builtins.BuiltinInteger , ''Integer , 'Builtins.addInteger , 'Builtins.subtractInteger @@ -228,8 +229,6 @@ builtinNames = [ , 'Builtins.head , 'Builtins.tail , 'Builtins.chooseList - , 'Builtins.mkNilInteger - , 'Builtins.mkNilBool , 'Builtins.mkNilData , 'Builtins.mkNilPairData , 'Builtins.mkCons @@ -334,12 +333,6 @@ defineBuiltinTerms = do -- Text constant defineBuiltinTerm annMayInline 'Builtins.emptyString $ PIR.mkConstant annMayInline ("" :: Text) - -- List constants - defineBuiltinTerm annMayInline 'Builtins.mkNilInteger $ - PIR.mkConstant annMayInline ([] @Integer) - defineBuiltinTerm annMayInline 'Builtins.mkNilBool $ - PIR.mkConstant annMayInline ([] @Bool) - -- The next two constants are 48 bytes long, so in fact we may not want to inline them. defineBuiltinTerm annMayInline 'Builtins.bls12_381_G1_compressed_generator $ PIR.mkConstant annMayInline BLS12_381.G1.compressed_generator diff --git a/plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs b/plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs index 2320dda3fa7..0cf86bd0322 100644 --- a/plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs +++ b/plutus-tx-plugin/src/PlutusTx/Compiler/Expr.hs @@ -23,6 +23,7 @@ import GHC.ByteCode.Types qualified as GHC import GHC.Core qualified as GHC import GHC.Core.Class qualified as GHC import GHC.Core.Multiplicity qualified as GHC +import GHC.Core.TyCo.Rep qualified as GHC import GHC.Plugins qualified as GHC import GHC.Types.CostCentre qualified as GHC import GHC.Types.Id.Make qualified as GHC @@ -35,6 +36,7 @@ import GHC.Tc.Utils.TcType qualified as GHC import PlutusTx.Bool qualified import PlutusTx.Builtins qualified as Builtins +import PlutusTx.Builtins.Internal qualified as Builtins import PlutusTx.Compiler.Binders import PlutusTx.Compiler.Builtins import PlutusTx.Compiler.Error @@ -61,6 +63,7 @@ import PlutusIR.MkPir qualified as PIR import PlutusIR.Purity qualified as PIR import PlutusCore qualified as PLC +import PlutusCore.Data qualified as PLC import PlutusCore.MkPlc qualified as PLC import PlutusCore.Pretty qualified as PP import PlutusCore.Subst qualified as PLC @@ -679,6 +682,22 @@ compileExpr e = traceCompilation 2 ("Compiling expr:" GHC.<+> GHC.ppr e) $ do -- See Note [Scopes] CompileContext{ccScope = scope, ccNameInfo = nameInfo, ccModBreaks = maybeModBreaks, ccBuiltinsInfo = binfo} <- ask + builtinIntegerTyCon <- case Map.lookup ''Builtins.BuiltinInteger nameInfo of + Just (GHC.ATyCon builtinInteger) -> pure builtinInteger + _ -> throwPlain $ CompilationError "No info for Integer builtin" + + builtinBoolTyCon <- case Map.lookup ''Builtins.BuiltinBool nameInfo of + Just (GHC.ATyCon builtinBool) -> pure builtinBool + _ -> throwPlain $ CompilationError "No info for Bool builtin" + + builtinDataTyCon <- case Map.lookup ''Builtins.BuiltinData nameInfo of + Just (GHC.ATyCon builtinData) -> pure builtinData + _ -> throwPlain $ CompilationError "No info for Data builtin" + + builtinPairTyCon <- case Map.lookup ''Builtins.BuiltinPair nameInfo of + Just (GHC.ATyCon builtinPair) -> pure builtinPair + _ -> throwPlain $ CompilationError "No info for Pair builtin" + -- TODO: Maybe share this to avoid repeated lookups. Probably cheap, though. (stringTyName, sbsName) <- case (Map.lookup ''Builtins.BuiltinString nameInfo, Map.lookup 'Builtins.stringToBuiltinString nameInfo) of (Just t1, Just t2) -> pure (GHC.getName t1, GHC.getName t2) @@ -690,6 +709,7 @@ compileExpr e = traceCompilation 2 ("Compiling expr:" GHC.<+> GHC.ppr e) $ do useToOpaqueName <- GHC.getName <$> getThing 'Builtins.useToOpaque useFromOpaqueName <- GHC.getName <$> getThing 'Builtins.useFromOpaque + mkNilOpaqueName <- GHC.getName <$> getThing 'Builtins.mkNilOpaque boolOperatorOr <- GHC.getName <$> getThing '(PlutusTx.Bool.||) boolOperatorAnd <- GHC.getName <$> getThing '(PlutusTx.Bool.&&) case e of @@ -777,6 +797,17 @@ compileExpr e = traceCompilation 2 ("Compiling expr:" GHC.<+> GHC.ppr e) $ do -- GHC.Var (isErrorId -> True) `GHC.App` GHC.Type t `GHC.App` _ -> PIR.TyInst annMayInline <$> errorFunc <*> compileTypeNorm t + GHC.Var n `GHC.App` GHC.Type ty + | GHC.getName n == mkNilOpaqueName -> case ty of + GHC.TyConApp tyCon [] + | tyCon == GHC.integerTyCon || tyCon == builtinIntegerTyCon -> + pure $ PLC.mkConstant annMayInline ([] @Integer) + | tyCon == builtinBoolTyCon -> pure $ PLC.mkConstant annMayInline ([] @Bool) + | tyCon == builtinDataTyCon -> pure $ PLC.mkConstant annMayInline ([] @PLC.Data) + GHC.TyConApp tyCon [GHC.TyConApp tyArg1 [], GHC.TyConApp tyArg2 []] + | (tyCon, tyArg1, tyArg2) == (builtinPairTyCon, builtinDataTyCon, builtinDataTyCon) -> + pure $ PLC.mkConstant annMayInline ([] @(PLC.Data, PLC.Data)) + _ -> throwPlain $ CompilationError "'mkNil' applied to an unknown type" GHC.Var n | GHC.getName n == useToOpaqueName -> throwPlain $ UnsupportedError "It is no longer possible to use 'toBuiltin' with a script, use 'toOpaque' instead" diff --git a/plutus-tx-plugin/src/PlutusTx/Plugin.hs b/plutus-tx-plugin/src/PlutusTx/Plugin.hs index d7ffa3cfdff..70fea6b85c2 100644 --- a/plutus-tx-plugin/src/PlutusTx/Plugin.hs +++ b/plutus-tx-plugin/src/PlutusTx/Plugin.hs @@ -21,7 +21,7 @@ module PlutusTx.Plugin (plugin, plc) where import Data.Bifunctor import PlutusPrelude import PlutusTx.Bool ((&&), (||)) -import PlutusTx.Builtins.HasBuiltin (useFromOpaque, useToOpaque) +import PlutusTx.Builtins (mkNilOpaque, useFromOpaque, useToOpaque) import PlutusTx.Code import PlutusTx.Compiler.Builtins import PlutusTx.Compiler.Error @@ -408,6 +408,7 @@ compileMarkedExpr locStr codeTy origE = do , '(PlutusTx.Bool.||) , 'useToOpaque , 'useFromOpaque + , 'mkNilOpaque ] modBreaks <- asks pcModuleModBreaks let coverage = CoverageOpts . Set.fromList $ 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 69011cdaf07..5353dfad79b 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: 127713368 -| mem: 400726}) \ No newline at end of file +({cpu: 127361368 +| mem: 398526}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/map2.pir.golden b/plutus-tx-plugin/test/Budget/9.6/map2.pir.golden index fe93d2f0802..4e58549f864 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map2.pir.golden +++ b/plutus-tx-plugin/test/Budget/9.6/map2.pir.golden @@ -60,20 +60,18 @@ letrec List_match {Tuple2 data data} ds - {all dead. list (pair data data)} - (/\dead -> []) + {list (pair data data)} + [] (\(d : Tuple2 data data) (ds : List (Tuple2 data data)) -> - /\dead -> - mkCons - {pair data data} - (Tuple2_match - {data} - {data} - d - {pair data data} - (\(d : data) (d : data) -> mkPairData d d)) - (goList ds)) - {all dead. dead} + mkCons + {pair data data} + (Tuple2_match + {data} + {data} + d + {pair data data} + (\(d : data) (d : data) -> mkPairData d d)) + (goList ds)) in let !unsafeFromList : @@ -111,11 +109,7 @@ let (go xs)) {all dead. dead} in - \(eta : List (Tuple2 k a)) -> - let - !eta : List (Tuple2 data data) = go eta - in - goList eta + \(eta : List (Tuple2 k a)) -> goList (go eta) in \(n : integer) -> let 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 5e684e5e2c8..9e91a27e7d3 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map2.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/map2.uplc.golden @@ -222,15 +222,13 @@ , (go xs) ])) ]))))) (fix1 (\goList ds -> - force - (case - ds - [ (delay []) - , (\d ds -> - delay - (force mkCons - (case d [(\d d -> mkPairData d d)]) - (goList ds))) ])))) + case + ds + [ [] + , (\d ds -> + force mkCons + (case d [(\d d -> mkPairData d d)]) + (goList ds)) ]))) (fix1 (\go acc xs -> force (force chooseList) 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 69011cdaf07..5353dfad79b 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: 127713368 -| mem: 400726}) \ No newline at end of file +({cpu: 127361368 +| mem: 398526}) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Budget/9.6/map3.pir.golden b/plutus-tx-plugin/test/Budget/9.6/map3.pir.golden index fe93d2f0802..4e58549f864 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map3.pir.golden +++ b/plutus-tx-plugin/test/Budget/9.6/map3.pir.golden @@ -60,20 +60,18 @@ letrec List_match {Tuple2 data data} ds - {all dead. list (pair data data)} - (/\dead -> []) + {list (pair data data)} + [] (\(d : Tuple2 data data) (ds : List (Tuple2 data data)) -> - /\dead -> - mkCons - {pair data data} - (Tuple2_match - {data} - {data} - d - {pair data data} - (\(d : data) (d : data) -> mkPairData d d)) - (goList ds)) - {all dead. dead} + mkCons + {pair data data} + (Tuple2_match + {data} + {data} + d + {pair data data} + (\(d : data) (d : data) -> mkPairData d d)) + (goList ds)) in let !unsafeFromList : @@ -111,11 +109,7 @@ let (go xs)) {all dead. dead} in - \(eta : List (Tuple2 k a)) -> - let - !eta : List (Tuple2 data data) = go eta - in - goList eta + \(eta : List (Tuple2 k a)) -> goList (go eta) in \(n : integer) -> let 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 5e684e5e2c8..9e91a27e7d3 100644 --- a/plutus-tx-plugin/test/Budget/9.6/map3.uplc.golden +++ b/plutus-tx-plugin/test/Budget/9.6/map3.uplc.golden @@ -222,15 +222,13 @@ , (go xs) ])) ]))))) (fix1 (\goList ds -> - force - (case - ds - [ (delay []) - , (\d ds -> - delay - (force mkCons - (case d [(\d d -> mkPairData d d)]) - (goList ds))) ])))) + case + ds + [ [] + , (\d ds -> + force mkCons + (case d [(\d d -> mkPairData d d)]) + (goList ds)) ]))) (fix1 (\go acc xs -> force (force chooseList) diff --git a/plutus-tx-plugin/test/Plugin/Debug/9.6/fib.pir.golden b/plutus-tx-plugin/test/Plugin/Debug/9.6/fib.pir.golden index 53808c671c1..7be80da7b1c 100644 --- a/plutus-tx-plugin/test/Plugin/Debug/9.6/fib.pir.golden +++ b/plutus-tx-plugin/test/Plugin/Debug/9.6/fib.pir.golden @@ -9,7 +9,7 @@ (strict) (vardecl { no-src-span } - addInteger-544 + addInteger-538 (fun { no-src-span } (con { no-src-span } integer) @@ -27,7 +27,7 @@ (nonstrict) (vardecl { no-src-span } - addInteger-549 + addInteger-543 (fun { no-src-span } (con { no-src-span } integer) @@ -40,7 +40,7 @@ ) (lam { no-src-span } - x-545 + x-539 (con { no-src-span } integer) (let { no-src-span } @@ -48,12 +48,12 @@ (termbind { no-src-span } (strict) - (vardecl { no-src-span } x-547 (con { no-src-span } integer)) - { no-src-span } x-545 + (vardecl { no-src-span } x-541 (con { no-src-span } integer)) + { no-src-span } x-539 ) (lam { no-src-span } - y-546 + y-540 (con { no-src-span } integer) (let { no-src-span } @@ -61,17 +61,17 @@ (termbind { no-src-span } (strict) - (vardecl { no-src-span } y-548 (con { no-src-span } integer)) - { no-src-span } y-546 + (vardecl { no-src-span } y-542 (con { no-src-span } integer)) + { no-src-span } y-540 ) [ { no-src-span } [ { no-src-span } - { no-src-span } addInteger-544 - { no-src-span } x-547 + { no-src-span } addInteger-538 + { no-src-span } x-541 ] - { no-src-span } y-548 + { no-src-span } y-542 ] ) ) @@ -82,11 +82,11 @@ { no-src-span } (datatype { no-src-span } - (tyvardecl { no-src-span } Bool-534 ({ no-src-span } type)) + (tyvardecl { no-src-span } Bool-528 ({ no-src-span } type)) - Bool_match-537 - (vardecl { no-src-span } True-535 { no-src-span } Bool-534) - (vardecl { no-src-span } False-536 { no-src-span } Bool-534) + Bool_match-531 + (vardecl { no-src-span } True-529 { no-src-span } Bool-528) + (vardecl { no-src-span } False-530 { no-src-span } Bool-528) ) ) (termbind @@ -94,7 +94,7 @@ (strict) (vardecl { no-src-span } - equalsInteger-533 + equalsInteger-527 (fun { no-src-span } (con { no-src-span } integer) @@ -112,18 +112,18 @@ (strict) (vardecl { no-src-span } - ifThenElse-531 + ifThenElse-525 (all { no-src-span } - a-532 + a-526 ({ no-src-span } type) (fun { no-src-span } (con { no-src-span } bool) (fun { no-src-span } - { no-src-span } a-532 - (fun { no-src-span } { no-src-span } a-532 { no-src-span } a-532) + { no-src-span } a-526 + (fun { no-src-span } { no-src-span } a-526 { no-src-span } a-526) ) ) ) @@ -135,20 +135,20 @@ (nonstrict) (vardecl { no-src-span } - equalsInteger-543 + equalsInteger-537 (fun { no-src-span } (con { no-src-span } integer) (fun { no-src-span } (con { no-src-span } integer) - { no-src-span } Bool-534 + { no-src-span } Bool-528 ) ) ) (lam { no-src-span } - x-538 + x-532 (con { no-src-span } integer) (let { no-src-span } @@ -156,12 +156,12 @@ (termbind { no-src-span } (strict) - (vardecl { no-src-span } x-540 (con { no-src-span } integer)) - { no-src-span } x-538 + (vardecl { no-src-span } x-534 (con { no-src-span } integer)) + { no-src-span } x-532 ) (lam { no-src-span } - y-539 + y-533 (con { no-src-span } integer) (let { no-src-span } @@ -169,21 +169,21 @@ (termbind { no-src-span } (strict) - (vardecl { no-src-span } y-541 (con { no-src-span } integer)) - { no-src-span } y-539 + (vardecl { no-src-span } y-535 (con { no-src-span } integer)) + { no-src-span } y-533 ) (termbind { no-src-span } (strict) - (vardecl { no-src-span } b-542 (con { no-src-span } bool)) + (vardecl { no-src-span } b-536 (con { no-src-span } bool)) [ { no-src-span } [ { no-src-span } - { no-src-span } equalsInteger-533 - { no-src-span } x-540 + { no-src-span } equalsInteger-527 + { no-src-span } x-534 ] - { no-src-span } y-541 + { no-src-span } y-535 ] ) [ @@ -194,14 +194,14 @@ { no-src-span } { { no-src-span } - { no-src-span } ifThenElse-531 - { no-src-span } Bool-534 + { no-src-span } ifThenElse-525 + { no-src-span } Bool-528 } - { no-src-span } b-542 + { no-src-span } b-536 ] - { no-src-span } True-535 + { no-src-span } True-529 ] - { no-src-span } False-536 + { no-src-span } False-530 ] ) ) @@ -213,7 +213,7 @@ (strict) (vardecl { no-src-span } - subtractInteger-525 + subtractInteger-519 (fun { no-src-span } (con { no-src-span } integer) @@ -231,7 +231,7 @@ (nonstrict) (vardecl { no-src-span } - subtractInteger-530 + subtractInteger-524 (fun { no-src-span } (con { no-src-span } integer) @@ -244,7 +244,7 @@ ) (lam { no-src-span } - x-526 + x-520 (con { no-src-span } integer) (let { no-src-span } @@ -252,12 +252,12 @@ (termbind { no-src-span } (strict) - (vardecl { no-src-span } x-528 (con { no-src-span } integer)) - { no-src-span } x-526 + (vardecl { no-src-span } x-522 (con { no-src-span } integer)) + { no-src-span } x-520 ) (lam { no-src-span } - y-527 + y-521 (con { no-src-span } integer) (let { no-src-span } @@ -265,17 +265,17 @@ (termbind { no-src-span } (strict) - (vardecl { no-src-span } y-529 (con { no-src-span } integer)) - { no-src-span } y-527 + (vardecl { no-src-span } y-523 (con { no-src-span } integer)) + { no-src-span } y-521 ) [ { no-src-span } [ { no-src-span } - { no-src-span } subtractInteger-525 - { no-src-span } x-528 + { no-src-span } subtractInteger-519 + { no-src-span } x-522 ] - { no-src-span } y-529 + { no-src-span } y-523 ] ) ) @@ -290,7 +290,7 @@ (nonstrict) (vardecl { no-src-span } - fib-550 + fib-544 (fun { no-src-span } (con { no-src-span } integer) @@ -299,7 +299,7 @@ ) (lam { no-src-span } - n-551 + n-545 (con { no-src-span } integer) (let { test/Plugin/Debug/Spec.hs:46:15-55:72 } @@ -309,10 +309,10 @@ (strict) (vardecl { test/Plugin/Debug/Spec.hs:46:15-55:72 } - n-552 + n-546 (con { test/Plugin/Debug/Spec.hs:46:15-55:72 } integer) ) - { test/Plugin/Debug/Spec.hs:46:15-55:72 } n-551 + { test/Plugin/Debug/Spec.hs:46:15-55:72 } n-545 ) { { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72 } @@ -325,15 +325,15 @@ [ { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72 } { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72 } - Bool_match-537 + Bool_match-531 [ { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72 } [ { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72 } { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72 } - equalsInteger-543 + equalsInteger-537 { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:47:43-47:43 } - n-552 + n-546 ] (con { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:47:45-47:45 } @@ -344,7 +344,7 @@ ] (all { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72 } - dead-553 + dead-547 ({ test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72 } type) (con @@ -355,7 +355,7 @@ } (abs { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72 } - dead-554 + dead-548 ({ test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72 } type) (con @@ -367,7 +367,7 @@ ] (abs { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72 } - dead-555 + dead-549 ({ test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72 } type) { @@ -381,15 +381,15 @@ [ { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72 } { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72 } - Bool_match-537 + Bool_match-531 [ { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72 } [ { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72 } { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72 } - equalsInteger-543 + equalsInteger-537 { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:50:51-50:51 } - n-552 + n-546 ] (con { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:50:53-50:53 } @@ -400,7 +400,7 @@ ] (all { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72 } - dead-556 + dead-550 ({ test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72 } type) (con @@ -411,7 +411,7 @@ } (abs { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72 } - dead-557 + dead-551 ({ test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72 } type) (con @@ -423,7 +423,7 @@ ] (abs { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72 } - dead-558 + dead-552 ({ test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72 } type) [ @@ -431,19 +431,19 @@ [ { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:53:33-55:72 } { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:53:33-55:72 } - addInteger-549 + addInteger-543 [ { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:53:33-55:72, test/Plugin/Debug/Spec.hs:54:37-54:72 } { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:53:33-55:72, test/Plugin/Debug/Spec.hs:54:37-54:72 } - fib-550 + fib-544 [ { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:53:33-55:72, test/Plugin/Debug/Spec.hs:54:37-54:72, test/Plugin/Debug/Spec.hs:54:42-54:71 } [ { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:53:33-55:72, test/Plugin/Debug/Spec.hs:54:37-54:72, test/Plugin/Debug/Spec.hs:54:42-54:71 } { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:53:33-55:72, test/Plugin/Debug/Spec.hs:54:37-54:72, test/Plugin/Debug/Spec.hs:54:42-54:71 } - subtractInteger-530 + subtractInteger-524 { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:53:33-55:72, test/Plugin/Debug/Spec.hs:54:37-54:72, test/Plugin/Debug/Spec.hs:54:42-54:71, test/Plugin/Debug/Spec.hs:54:68-54:68 } - n-552 + n-546 ] (con { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:53:33-55:72, test/Plugin/Debug/Spec.hs:54:37-54:72, test/Plugin/Debug/Spec.hs:54:42-54:71, test/Plugin/Debug/Spec.hs:54:70-54:70 } @@ -456,15 +456,15 @@ [ { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:53:33-55:72, test/Plugin/Debug/Spec.hs:55:37-55:72 } { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:53:33-55:72, test/Plugin/Debug/Spec.hs:55:37-55:72 } - fib-550 + fib-544 [ { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:53:33-55:72, test/Plugin/Debug/Spec.hs:55:37-55:72, test/Plugin/Debug/Spec.hs:55:42-55:71 } [ { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:53:33-55:72, test/Plugin/Debug/Spec.hs:55:37-55:72, test/Plugin/Debug/Spec.hs:55:42-55:71 } { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:53:33-55:72, test/Plugin/Debug/Spec.hs:55:37-55:72, test/Plugin/Debug/Spec.hs:55:42-55:71 } - subtractInteger-530 + subtractInteger-524 { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:53:33-55:72, test/Plugin/Debug/Spec.hs:55:37-55:72, test/Plugin/Debug/Spec.hs:55:42-55:71, test/Plugin/Debug/Spec.hs:55:68-55:68 } - n-552 + n-546 ] (con { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72, test/Plugin/Debug/Spec.hs:53:33-55:72, test/Plugin/Debug/Spec.hs:55:37-55:72, test/Plugin/Debug/Spec.hs:55:42-55:71, test/Plugin/Debug/Spec.hs:55:70-55:70 } @@ -478,28 +478,28 @@ ] (all { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72 } - dead-559 + dead-553 ({ test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72 } type) { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72, test/Plugin/Debug/Spec.hs:50:25-55:72 } - dead-559 + dead-553 ) } ) ] (all { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72 } - dead-560 + dead-554 ({ test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72 } type) { test/Plugin/Debug/Spec.hs:46:15-55:72, test/Plugin/Debug/Spec.hs:47:17-55:72 } - dead-560 + dead-554 ) } ) ) ) - { test/Plugin/Debug/Spec.hs:45:9-57:9 } fib-550 + { test/Plugin/Debug/Spec.hs:45:9-57:9 } fib-544 ) ) ) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Debug/9.6/letFun.pir.golden b/plutus-tx-plugin/test/Plugin/Debug/9.6/letFun.pir.golden index acfa5ab236a..e3ff78c1481 100644 --- a/plutus-tx-plugin/test/Plugin/Debug/9.6/letFun.pir.golden +++ b/plutus-tx-plugin/test/Plugin/Debug/9.6/letFun.pir.golden @@ -8,11 +8,11 @@ { no-src-span } (datatype { no-src-span } - (tyvardecl { no-src-span } Bool-451 ({ no-src-span } type)) + (tyvardecl { no-src-span } Bool-445 ({ no-src-span } type)) - Bool_match-454 - (vardecl { no-src-span } True-452 { no-src-span } Bool-451) - (vardecl { no-src-span } False-453 { no-src-span } Bool-451) + Bool_match-448 + (vardecl { no-src-span } True-446 { no-src-span } Bool-445) + (vardecl { no-src-span } False-447 { no-src-span } Bool-445) ) ) (termbind @@ -20,7 +20,7 @@ (strict) (vardecl { no-src-span } - equalsInteger-450 + equalsInteger-444 (fun { no-src-span } (con { no-src-span } integer) @@ -38,18 +38,18 @@ (strict) (vardecl { no-src-span } - ifThenElse-448 + ifThenElse-442 (all { no-src-span } - a-449 + a-443 ({ no-src-span } type) (fun { no-src-span } (con { no-src-span } bool) (fun { no-src-span } - { no-src-span } a-449 - (fun { no-src-span } { no-src-span } a-449 { no-src-span } a-449) + { no-src-span } a-443 + (fun { no-src-span } { no-src-span } a-443 { no-src-span } a-443) ) ) ) @@ -61,20 +61,20 @@ (nonstrict) (vardecl { no-src-span } - equalsInteger-460 + equalsInteger-454 (fun { no-src-span } (con { no-src-span } integer) (fun { no-src-span } (con { no-src-span } integer) - { no-src-span } Bool-451 + { no-src-span } Bool-445 ) ) ) (lam { no-src-span } - x-455 + x-449 (con { no-src-span } integer) (let { no-src-span } @@ -82,12 +82,12 @@ (termbind { no-src-span } (strict) - (vardecl { no-src-span } x-457 (con { no-src-span } integer)) - { no-src-span } x-455 + (vardecl { no-src-span } x-451 (con { no-src-span } integer)) + { no-src-span } x-449 ) (lam { no-src-span } - y-456 + y-450 (con { no-src-span } integer) (let { no-src-span } @@ -95,21 +95,21 @@ (termbind { no-src-span } (strict) - (vardecl { no-src-span } y-458 (con { no-src-span } integer)) - { no-src-span } y-456 + (vardecl { no-src-span } y-452 (con { no-src-span } integer)) + { no-src-span } y-450 ) (termbind { no-src-span } (strict) - (vardecl { no-src-span } b-459 (con { no-src-span } bool)) + (vardecl { no-src-span } b-453 (con { no-src-span } bool)) [ { no-src-span } [ { no-src-span } - { no-src-span } equalsInteger-450 - { no-src-span } x-457 + { no-src-span } equalsInteger-444 + { no-src-span } x-451 ] - { no-src-span } y-458 + { no-src-span } y-452 ] ) [ @@ -120,14 +120,14 @@ { no-src-span } { { no-src-span } - { no-src-span } ifThenElse-448 - { no-src-span } Bool-451 + { no-src-span } ifThenElse-442 + { no-src-span } Bool-445 } - { no-src-span } b-459 + { no-src-span } b-453 ] - { no-src-span } True-452 + { no-src-span } True-446 ] - { no-src-span } False-453 + { no-src-span } False-447 ] ) ) @@ -136,7 +136,7 @@ ) (lam { no-src-span } - ds-461 + ds-455 (con { no-src-span } integer) (let { test/Plugin/Debug/Spec.hs:38:9-38:87 } @@ -146,14 +146,14 @@ (strict) (vardecl { test/Plugin/Debug/Spec.hs:38:9-38:87 } - ds-463 + ds-457 (con { test/Plugin/Debug/Spec.hs:38:9-38:87 } integer) ) - { test/Plugin/Debug/Spec.hs:38:9-38:87 } ds-461 + { test/Plugin/Debug/Spec.hs:38:9-38:87 } ds-455 ) (lam { no-src-span } - ds-462 + ds-456 (con { no-src-span } integer) (let { test/Plugin/Debug/Spec.hs:38:9-38:87 } @@ -163,22 +163,22 @@ (strict) (vardecl { test/Plugin/Debug/Spec.hs:38:9-38:87 } - ds-464 + ds-458 (con { test/Plugin/Debug/Spec.hs:38:9-38:87 } integer) ) - { test/Plugin/Debug/Spec.hs:38:9-38:87 } ds-462 + { test/Plugin/Debug/Spec.hs:38:9-38:87 } ds-456 ) [ { test/Plugin/Debug/Spec.hs:38:9-38:87, test/Plugin/Debug/Spec.hs:38:44-38:86, test/Plugin/Debug/Spec.hs:38:54-38:79 } [ { test/Plugin/Debug/Spec.hs:38:9-38:87, test/Plugin/Debug/Spec.hs:38:44-38:86, test/Plugin/Debug/Spec.hs:38:54-38:79 } { test/Plugin/Debug/Spec.hs:38:9-38:87, test/Plugin/Debug/Spec.hs:38:44-38:86, test/Plugin/Debug/Spec.hs:38:54-38:79 } - equalsInteger-460 + equalsInteger-454 { test/Plugin/Debug/Spec.hs:38:9-38:87, test/Plugin/Debug/Spec.hs:38:44-38:86, test/Plugin/Debug/Spec.hs:38:54-38:79, test/Plugin/Debug/Spec.hs:38:77-38:77 } - ds-463 + ds-457 ] { test/Plugin/Debug/Spec.hs:38:9-38:87, test/Plugin/Debug/Spec.hs:38:44-38:86, test/Plugin/Debug/Spec.hs:38:54-38:79, test/Plugin/Debug/Spec.hs:38:79-38:79 } - ds-464 + ds-458 ] ) ) diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/addInt.pir.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/addInt.pir.golden index d77b76dda76..b714fb429ee 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/addInt.pir.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/addInt.pir.golden @@ -13,9 +13,9 @@ program in trace {unit -> integer} - "entering addInteger-131" + "entering addInteger-129" (\(thunk : unit) -> - trace {integer} "exiting addInteger-131" (addInteger x y)) + trace {integer} "exiting addInteger-129" (addInteger x y)) () ~addInt : integer -> integer -> integer = \(x : integer) -> @@ -24,9 +24,9 @@ program in trace {unit -> integer -> integer} - "entering addInt-128" + "entering addInt-126" (\(thunk : unit) -> - trace {integer -> integer} "exiting addInt-128" (addInteger x)) + trace {integer -> integer} "exiting addInt-126" (addInteger x)) () in addInt) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/addInt3.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/addInt3.eval.golden index 66b848fa868..9bd01c9535d 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/addInt3.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/addInt3.eval.golden @@ -1 +1 @@ -[entering addInt-128, exiting addInt-128] \ No newline at end of file +[entering addInt-126, exiting addInt-126] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/argMismatch1.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/argMismatch1.eval.golden index 19f028f27ca..14e3e61691c 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/argMismatch1.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/argMismatch1.eval.golden @@ -1,6 +1,6 @@ -[ entering runIdentity-131 -, exiting runIdentity-131 -, entering newtypeFunction-139 -, exiting newtypeFunction-139 -, entering `$fFoldableIdentity`-133 -, exiting `$fFoldableIdentity`-133 ] \ No newline at end of file +[ entering runIdentity-129 +, exiting runIdentity-129 +, entering newtypeFunction-137 +, exiting newtypeFunction-137 +, entering `$fFoldableIdentity`-131 +, exiting `$fFoldableIdentity`-131 ] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/argMismatch2.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/argMismatch2.eval.golden index 866a739a4c8..b0bc86d7306 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/argMismatch2.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/argMismatch2.eval.golden @@ -1 +1 @@ -[entering obscuredFunction-129, exiting obscuredFunction-129] \ No newline at end of file +[entering obscuredFunction-127, exiting obscuredFunction-127] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/fact4.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/fact4.eval.golden index 33f55c5979c..0d688af7c21 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/fact4.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/fact4.eval.golden @@ -1,36 +1,36 @@ -[ entering fact-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering subtractInteger-152 -, exiting subtractInteger-152 -, entering fact-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering subtractInteger-152 -, exiting subtractInteger-152 -, entering fact-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering subtractInteger-152 -, exiting subtractInteger-152 -, entering fact-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering subtractInteger-152 -, exiting subtractInteger-152 -, entering fact-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, exiting fact-128 -, entering multiplyInteger-146 -, exiting multiplyInteger-146 -, exiting fact-128 -, entering multiplyInteger-146 -, exiting multiplyInteger-146 -, exiting fact-128 -, entering multiplyInteger-146 -, exiting multiplyInteger-146 -, exiting fact-128 -, entering multiplyInteger-146 -, exiting multiplyInteger-146 -, exiting fact-128 ] \ No newline at end of file +[ entering fact-126 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, entering subtractInteger-150 +, exiting subtractInteger-150 +, entering fact-126 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, entering subtractInteger-150 +, exiting subtractInteger-150 +, entering fact-126 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, entering subtractInteger-150 +, exiting subtractInteger-150 +, entering fact-126 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, entering subtractInteger-150 +, exiting subtractInteger-150 +, entering fact-126 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, exiting fact-126 +, entering multiplyInteger-144 +, exiting multiplyInteger-144 +, exiting fact-126 +, entering multiplyInteger-144 +, exiting multiplyInteger-144 +, exiting fact-126 +, entering multiplyInteger-144 +, exiting multiplyInteger-144 +, exiting fact-126 +, entering multiplyInteger-144 +, exiting multiplyInteger-144 +, exiting fact-126 ] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/fib.pir.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/fib.pir.golden index c53e980e4c4..6df2672558c 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/fib.pir.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/fib.pir.golden @@ -13,9 +13,9 @@ program in trace {unit -> integer} - "entering addInteger-150" + "entering addInteger-148" (\(thunk : unit) -> - trace {integer} "exiting addInteger-150" (addInteger x y)) + trace {integer} "exiting addInteger-148" (addInteger x y)) () data Bool | Bool_match where True : Bool @@ -33,11 +33,11 @@ program in trace {unit -> Bool} - "entering equalsInteger-135" + "entering equalsInteger-133" (\(thunk : unit) -> trace {Bool} - "exiting equalsInteger-135" + "exiting equalsInteger-133" (let !b : bool = equalsInteger x y in @@ -55,11 +55,11 @@ program in trace {unit -> integer} - "entering subtractInteger-156" + "entering subtractInteger-154" (\(thunk : unit) -> trace {integer} - "exiting subtractInteger-156" + "exiting subtractInteger-154" (subtractInteger x y)) () in @@ -71,11 +71,11 @@ program in trace {unit -> integer} - "entering fib-128" + "entering fib-126" (\(thunk : unit) -> trace {integer} - "exiting fib-128" + "exiting fib-126" (Bool_match (equalsInteger n 0) {all dead. integer} diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/fib4.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/fib4.eval.golden index 693c65f8713..dd4c4ebeacf 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/fib4.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/fib4.eval.golden @@ -1,74 +1,74 @@ -[ entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering subtractInteger-156 -, exiting subtractInteger-156 -, entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering subtractInteger-156 -, exiting subtractInteger-156 -, entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering subtractInteger-156 -, exiting subtractInteger-156 -, entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, exiting fib-128 -, entering subtractInteger-156 -, exiting subtractInteger-156 -, entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, exiting fib-128 -, entering addInteger-150 -, exiting addInteger-150 -, exiting fib-128 -, entering subtractInteger-156 -, exiting subtractInteger-156 -, entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, exiting fib-128 -, entering addInteger-150 -, exiting addInteger-150 -, exiting fib-128 -, entering subtractInteger-156 -, exiting subtractInteger-156 -, entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering subtractInteger-156 -, exiting subtractInteger-156 -, entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, exiting fib-128 -, entering subtractInteger-156 -, exiting subtractInteger-156 -, entering fib-128 -, entering equalsInteger-135 -, exiting equalsInteger-135 -, exiting fib-128 -, entering addInteger-150 -, exiting addInteger-150 -, exiting fib-128 -, entering addInteger-150 -, exiting addInteger-150 -, exiting fib-128 ] \ No newline at end of file +[ entering fib-126 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, entering subtractInteger-154 +, exiting subtractInteger-154 +, entering fib-126 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, entering subtractInteger-154 +, exiting subtractInteger-154 +, entering fib-126 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, entering subtractInteger-154 +, exiting subtractInteger-154 +, entering fib-126 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, exiting fib-126 +, entering subtractInteger-154 +, exiting subtractInteger-154 +, entering fib-126 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, exiting fib-126 +, entering addInteger-148 +, exiting addInteger-148 +, exiting fib-126 +, entering subtractInteger-154 +, exiting subtractInteger-154 +, entering fib-126 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, exiting fib-126 +, entering addInteger-148 +, exiting addInteger-148 +, exiting fib-126 +, entering subtractInteger-154 +, exiting subtractInteger-154 +, entering fib-126 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, entering subtractInteger-154 +, exiting subtractInteger-154 +, entering fib-126 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, exiting fib-126 +, entering subtractInteger-154 +, exiting subtractInteger-154 +, entering fib-126 +, entering equalsInteger-133 +, exiting equalsInteger-133 +, exiting fib-126 +, entering addInteger-148 +, exiting addInteger-148 +, exiting fib-126 +, entering addInteger-148 +, exiting addInteger-148 +, exiting fib-126 ] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/id.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/id.eval.golden index 5e31f19d924..b44a413ba8b 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/id.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/id.eval.golden @@ -1 +1 @@ -[entering id-129, exiting id-129, entering id-129, exiting id-129] \ No newline at end of file +[entering id-127, exiting id-127, entering id-127, exiting id-127] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/idCode.pir.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/idCode.pir.golden index e8874d71960..7bb5394e1a3 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/idCode.pir.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/idCode.pir.golden @@ -6,8 +6,8 @@ program \(x : a) -> trace {unit -> a} - "entering id-129" - (\(thunk : unit) -> trace {a} "exiting id-129" x) + "entering id-127" + (\(thunk : unit) -> trace {a} "exiting id-127" x) () in id {integer} (id {integer} 1)) \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/letInFun.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/letInFun.eval.golden index e598b91086d..55db6efde8c 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/letInFun.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/letInFun.eval.golden @@ -1,10 +1,10 @@ -[ entering f-140 -, entering addInteger-134 -, exiting addInteger-134 -, exiting f-140 -, entering f-140 -, entering addInteger-134 -, exiting addInteger-134 -, exiting f-140 -, entering addInteger-134 -, exiting addInteger-134 ] \ No newline at end of file +[ entering f-138 +, entering addInteger-132 +, exiting addInteger-132 +, exiting f-138 +, entering f-138 +, entering addInteger-132 +, exiting addInteger-132 +, exiting f-138 +, entering addInteger-132 +, exiting addInteger-132 ] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/letInFunMoreArg.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/letInFunMoreArg.eval.golden index 42995b25478..dcf5f62de33 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/letInFunMoreArg.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/letInFunMoreArg.eval.golden @@ -1,12 +1,12 @@ -[ entering f-142 -, entering addInteger-136 -, exiting addInteger-136 -, exiting f-142 -, entering f-142 -, entering addInteger-136 -, exiting addInteger-136 -, exiting f-142 -, entering addInteger-136 -, exiting addInteger-136 -, entering multiplyInteger-144 -, exiting multiplyInteger-144 ] \ No newline at end of file +[ entering f-140 +, entering addInteger-134 +, exiting addInteger-134 +, exiting f-140 +, entering f-140 +, entering addInteger-134 +, exiting addInteger-134 +, exiting f-140 +, entering addInteger-134 +, exiting addInteger-134 +, entering multiplyInteger-142 +, exiting multiplyInteger-142 ] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/letRecInFun.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/letRecInFun.eval.golden index dce946b6315..29dd653b9b7 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/letRecInFun.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/letRecInFun.eval.golden @@ -1,28 +1,28 @@ -[ entering f-130 -, entering equalsInteger-137 -, exiting equalsInteger-137 -, entering subtractInteger-154 -, exiting subtractInteger-154 -, entering f-130 -, entering equalsInteger-137 -, exiting equalsInteger-137 -, entering subtractInteger-154 -, exiting subtractInteger-154 -, entering f-130 -, entering equalsInteger-137 -, exiting equalsInteger-137 -, entering subtractInteger-154 -, exiting subtractInteger-154 -, entering f-130 -, entering equalsInteger-137 -, exiting equalsInteger-137 -, exiting f-130 -, entering addInteger-148 -, exiting addInteger-148 -, exiting f-130 -, entering addInteger-148 -, exiting addInteger-148 -, exiting f-130 -, entering addInteger-148 -, exiting addInteger-148 -, exiting f-130 ] \ No newline at end of file +[ entering f-128 +, entering equalsInteger-135 +, exiting equalsInteger-135 +, entering subtractInteger-152 +, exiting subtractInteger-152 +, entering f-128 +, entering equalsInteger-135 +, exiting equalsInteger-135 +, entering subtractInteger-152 +, exiting subtractInteger-152 +, entering f-128 +, entering equalsInteger-135 +, exiting equalsInteger-135 +, entering subtractInteger-152 +, exiting subtractInteger-152 +, entering f-128 +, entering equalsInteger-135 +, exiting equalsInteger-135 +, exiting f-128 +, entering addInteger-146 +, exiting addInteger-146 +, exiting f-128 +, entering addInteger-146 +, exiting addInteger-146 +, exiting f-128 +, entering addInteger-146 +, exiting addInteger-146 +, exiting f-128 ] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/swap.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/swap.eval.golden index ea3312abd43..95ccf2e19ca 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/swap.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/swap.eval.golden @@ -1 +1 @@ -[entering swap-135, exiting swap-135] \ No newline at end of file +[entering swap-133, exiting swap-133] \ No newline at end of file diff --git a/plutus-tx-plugin/test/Plugin/Profiling/9.6/typeclass.eval.golden b/plutus-tx-plugin/test/Plugin/Profiling/9.6/typeclass.eval.golden index 5698abc5173..fe995dbadbe 100644 --- a/plutus-tx-plugin/test/Plugin/Profiling/9.6/typeclass.eval.golden +++ b/plutus-tx-plugin/test/Plugin/Profiling/9.6/typeclass.eval.golden @@ -1,12 +1,12 @@ -[ entering useTypeclass-137 -, entering methodA-151 -, exiting methodA-151 -, entering addInteger-144 -, exiting addInteger-144 -, entering methodB-162 -, exiting methodB-162 -, entering subtractInteger-174 -, exiting subtractInteger-174 -, entering addInteger-144 -, exiting addInteger-144 -, exiting useTypeclass-137 ] \ No newline at end of file +[ entering useTypeclass-135 +, entering methodA-149 +, exiting methodA-149 +, entering addInteger-142 +, exiting addInteger-142 +, entering methodB-160 +, exiting methodB-160 +, entering subtractInteger-172 +, exiting subtractInteger-172 +, entering addInteger-142 +, exiting addInteger-142 +, exiting useTypeclass-135 ] \ No newline at end of file diff --git a/plutus-tx/changelog.d/20240731_145553_effectfully_add_general_mkNil.md b/plutus-tx/changelog.d/20240731_145553_effectfully_add_general_mkNil.md new file mode 100644 index 00000000000..e42441f2739 --- /dev/null +++ b/plutus-tx/changelog.d/20240731_145553_effectfully_add_general_mkNil.md @@ -0,0 +1,3 @@ +### Changed + +- In #6347 made `[] :: [Integer]`, `[] :: [Bool]`, `[] :: [Data]`, and `[(Data, Data)]` compile directly to the respective empty list via the `MkNil` type class without usage of built-in functions or `defineBuiltinTerm`. diff --git a/plutus-tx/src/PlutusTx/AssocMap.hs b/plutus-tx/src/PlutusTx/AssocMap.hs index 79c5b694eff..f962fcf9e74 100644 --- a/plutus-tx/src/PlutusTx/AssocMap.hs +++ b/plutus-tx/src/PlutusTx/AssocMap.hs @@ -93,7 +93,7 @@ instance (ToData k, ToData v) => ToData (Map k v) where mapToBuiltin = go where go :: [(k, v)] -> BI.BuiltinList (BI.BuiltinPair BI.BuiltinData BI.BuiltinData) - go [] = BI.mkNilPairData BI.unitval + go [] = P.mkNil go ((k, v) : xs) = BI.mkCons (BI.mkPairData (toBuiltinData k) (toBuiltinData v)) (go xs) -- | A hand-written transformation from 'Data' to 'Map'. Compared to 'unsafeFromBuiltinData', diff --git a/plutus-tx/src/PlutusTx/Builtins.hs b/plutus-tx/src/PlutusTx/Builtins.hs index 513d6e37587..9ff0e4d4232 100644 --- a/plutus-tx/src/PlutusTx/Builtins.hs +++ b/plutus-tx/src/PlutusTx/Builtins.hs @@ -68,6 +68,8 @@ module PlutusTx.Builtins ( -- * Pairs , pairToPair -- * Lists + , mkNil + , mkNilOpaque , null , matchList , matchList' diff --git a/plutus-tx/src/PlutusTx/Builtins/HasOpaque.hs b/plutus-tx/src/PlutusTx/Builtins/HasOpaque.hs index 13e28652e18..c8166b6824b 100644 --- a/plutus-tx/src/PlutusTx/Builtins/HasOpaque.hs +++ b/plutus-tx/src/PlutusTx/Builtins/HasOpaque.hs @@ -204,31 +204,25 @@ instance HasFromOpaque BuiltinBool Bool where fromOpaque b = ifThenElse b True False {-# INLINABLE fromOpaque #-} -instance HasToOpaque [BuiltinInteger] (BuiltinList BuiltinInteger) where +-- | The empty list of elements of the given type that gets spotted by the plugin (grep for +-- 'mkNilOpaque' in the plugin code) and replaced by the actual empty list constant for types that +-- are supported (a subset of built-in types). +mkNilOpaque :: BuiltinList a +mkNilOpaque = BuiltinList [] +{-# OPAQUE mkNilOpaque #-} + +class MkNil arep where + mkNil :: BuiltinList arep + mkNil = mkNilOpaque +instance MkNil BuiltinInteger +instance MkNil BuiltinBool +instance MkNil BuiltinData +instance MkNil (BuiltinPair BuiltinData BuiltinData) + +instance (HasToOpaque a arep, MkNil arep) => HasToOpaque [a] (BuiltinList arep) where toOpaque = goList where - goList :: [BuiltinInteger] -> BuiltinList BuiltinInteger - goList [] = mkNilInteger - goList (d:ds) = mkCons (toOpaque d) (goList ds) - {-# INLINABLE toOpaque #-} -instance HasToOpaque [Bool] (BuiltinList BuiltinBool) where - toOpaque = goList where - goList :: [Bool] -> BuiltinList BuiltinBool - goList [] = mkNilBool - goList (d:ds) = mkCons (toOpaque d) (goList ds) - {-# INLINABLE toOpaque #-} -instance HasToOpaque [BuiltinData] (BuiltinList BuiltinData) where - toOpaque = goList where - goList :: [BuiltinData] -> BuiltinList BuiltinData - goList [] = mkNilData unitval - goList (d:ds) = mkCons (toOpaque d) (goList ds) - {-# INLINABLE toOpaque #-} -instance - HasToOpaque - [(BuiltinData, BuiltinData)] - (BuiltinList (BuiltinPair BuiltinData BuiltinData)) where - toOpaque = goList where - goList :: [(BuiltinData, BuiltinData)] -> BuiltinList (BuiltinPair BuiltinData BuiltinData) - goList [] = mkNilPairData unitval + goList :: [a] -> BuiltinList arep + goList [] = mkNil goList (d:ds) = mkCons (toOpaque d) (goList ds) {-# INLINABLE toOpaque #-} instance HasFromOpaque arep a => HasFromOpaque (BuiltinList arep) [a] where diff --git a/plutus-tx/src/PlutusTx/Builtins/Internal.hs b/plutus-tx/src/PlutusTx/Builtins/Internal.hs index aed894c7a36..485c99ce045 100644 --- a/plutus-tx/src/PlutusTx/Builtins/Internal.hs +++ b/plutus-tx/src/PlutusTx/Builtins/Internal.hs @@ -403,14 +403,6 @@ chooseList :: BuiltinList a -> b -> b -> b chooseList (BuiltinList []) b1 _ = b1 chooseList (BuiltinList (_:_)) _ b2 = b2 -{-# NOINLINE mkNilInteger #-} -mkNilInteger :: BuiltinList BuiltinInteger -mkNilInteger = BuiltinList [] - -{-# NOINLINE mkNilBool #-} -mkNilBool :: BuiltinList BuiltinBool -mkNilBool = BuiltinList [] - {-# NOINLINE mkNilData #-} mkNilData :: BuiltinUnit -> BuiltinList BuiltinData mkNilData _ = BuiltinList [] diff --git a/plutus-tx/src/PlutusTx/Data/AssocMap.hs b/plutus-tx/src/PlutusTx/Data/AssocMap.hs index 5fded4753d9..20133406ad6 100644 --- a/plutus-tx/src/PlutusTx/Data/AssocMap.hs +++ b/plutus-tx/src/PlutusTx/Data/AssocMap.hs @@ -414,7 +414,7 @@ unsafeFromBuiltinList = Map {-# INLINEABLE nil #-} -- | An empty `P.BuiltinList` of key-value pairs. nil :: BI.BuiltinList (BI.BuiltinPair BuiltinData BuiltinData) -nil = BI.mkNilPairData BI.unitval +nil = P.mkNil keys' :: BI.BuiltinList (BI.BuiltinPair BuiltinData BuiltinData) @@ -424,7 +424,7 @@ keys' = go go xs = P.matchList xs - (\() -> BI.mkNilData BI.unitval) + (\() -> P.mkNil) ( \hd tl -> let k = BI.fst hd in BI.mkCons k (go tl) diff --git a/plutus-tx/src/PlutusTx/IsData/Class.hs b/plutus-tx/src/PlutusTx/IsData/Class.hs index 509d801579c..c3dfb268187 100644 --- a/plutus-tx/src/PlutusTx/IsData/Class.hs +++ b/plutus-tx/src/PlutusTx/IsData/Class.hs @@ -101,7 +101,7 @@ instance ToData a => ToData [a] where mapToBuiltin = go where go :: [a] -> BI.BuiltinList BI.BuiltinData - go [] = BI.mkNilData BI.unitval + go [] = mkNil go (x:xs) = BI.mkCons (toBuiltinData x) (go xs) instance FromData a => FromData [a] where {-# INLINABLE fromBuiltinData #-}