From 3f8a0dd5986fdcade18443afa63b7d9ae3637273 Mon Sep 17 00:00:00 2001 From: Sasha Bogicevic Date: Tue, 16 Apr 2024 12:07:48 +0200 Subject: [PATCH] Golden file for DraftCommitTxRequest and format the code --- ...DraftCommitTxRequest (Tx BabbageEra)).json | 1054 +++++++++++------ .../test/Hydra/Chain/Direct/Contract/Check.hs | 6 +- .../test/Hydra/Chain/Direct/ContractSpec.hs | 2 +- .../test/Hydra/Chain/Direct/StateSpec.hs | 2 +- 4 files changed, 681 insertions(+), 383 deletions(-) diff --git a/hydra-node/golden/ReasonablySized (DraftCommitTxRequest (Tx BabbageEra)).json b/hydra-node/golden/ReasonablySized (DraftCommitTxRequest (Tx BabbageEra)).json index d8fe0a3ae00..f97639a17be 100644 --- a/hydra-node/golden/ReasonablySized (DraftCommitTxRequest (Tx BabbageEra)).json +++ b/hydra-node/golden/ReasonablySized (DraftCommitTxRequest (Tx BabbageEra)).json @@ -1,414 +1,687 @@ { "samples": [ { - "0408040001060501000701050003050605070508080601030304040806070707#77": { - "address": "addr_test1wzgzpjplkmcsh6hkx0hjggk9frpggazkkr6jgg0gvwfjftserq3sm", - "datum": null, - "datumhash": "bb2672ab68ca309f3e92994d15bc8da2e50a11040d088c3a7001998ff81870f0", - "inlineDatum": null, - "referenceScript": null, - "value": { - "lovelace": 161777137293141776 - }, - "witness": { - "datum": "9f40ff", - "plutusV2Script": { - "cborHex": "46010200050605", - "description": "", - "type": "PlutusScriptV2" - }, - "redeemer": "80" - } - }, - "0507030007000000070303080502080308040404030500030307080602000305#99": { - "address": "addr_test1xpfv6fqykty6r3tpuqza2tj3z43jhmcp6ugpyqp3sldda4h06k7j25gsy62ua8tzukancxeavptjp4kezcplqfxdtgeqpd0ttu", + "0103030708040808080206010506010105010404030406080205060402060406#98": { + "address": "addr1q8va4hat34z4y84tklmljt7fz2njt23yep83s480de4rn0juvaeegyzeru7dv450906vj0z8rp7xek3mzqtgdf070ywqcdd84s", "datum": null, "inlineDatum": { - "constructor": 5, + "constructor": 2, "fields": [ { - "bytes": "23556c" - }, - { - "list": [] - }, - { - "constructor": 0, + "constructor": 2, "fields": [ { - "bytes": "f46d3468" + "constructor": 3, + "fields": [ + { + "bytes": "e52a" + } + ] }, { - "map": [ - { - "k": { - "bytes": "e799" - }, - "v": { - "bytes": "2b" - } - }, - { - "k": { - "bytes": "" - }, - "v": { - "bytes": "649b4054" - } - }, + "bytes": "" + }, + { + "constructor": 2, + "fields": [ { - "k": { - "int": 2 - }, - "v": { - "int": 1 - } + "bytes": "5b" } ] + }, + { + "bytes": "77cda6" + }, + { + "bytes": "e87fb8" } ] }, { - "list": [ - { - "constructor": 0, - "fields": [] - }, + "map": [ { - "int": 5 + "k": { + "constructor": 1, + "fields": [] + }, + "v": { + "bytes": "" + } }, { - "int": 3 + "k": { + "list": [ + { + "int": 0 + }, + { + "bytes": "6d" + }, + { + "bytes": "6e" + }, + { + "bytes": "" + }, + { + "bytes": "b4" + } + ] + }, + "v": { + "int": -3 + } } ] - }, - { - "int": 3 } ] }, - "inlineDatumhash": "bf7cc85eb167b06fb321d1f3d58bebd57a838c2b902a9456997b9518346fa01e", + "inlineDatumhash": "3d066e89ad6cbe7019184e588a734a47b322ebf6c2e4a43a284481812c8d87c9", "referenceScript": null, "value": { - "lovelace": 7168756688860419297 - }, - "witness": { - "datum": null, - "plutusV2Script": { - "cborHex": "46060607040502", - "description": "", - "type": "PlutusScriptV2" - }, - "redeemer": "40" + "700ccc9d5ee36e47fd6e2a2b13831aee1f4c6b836b81f463ddf880ec": { + "35": 1 + } } }, - "0701040700070402020801010105080408030608060500030301010305080506#10": { - "address": "addr_test1zpnm8ttw586n40evcjjjdhvhj4dhztmrapluakh4n6ct06adfgfnkme3pwzutvnzh3h93475qhr8tspnuw6v692shycqcjdzm7", + "0205000502080304030202040705000006070604080807050808050705000104#35": { + "address": "addr1zxfwh7ehakjnu2tsfgufq2tlsj9fg820thg49yp2x26fkv7ju08fslkje4xvjq8advpexjp7t20y2cfcvh079nezudmqr22nx6", "datum": null, - "datumhash": "3f42377d71c7d0f3063ebb958f6be3f51cdcf395deac1b510e280dee52d76122", - "inlineDatum": null, + "inlineDatum": { + "map": [ + { + "k": { + "int": 0 + }, + "v": { + "list": [] + } + }, + { + "k": { + "constructor": 1, + "fields": [ + { + "bytes": "cf9c1f71" + }, + { + "int": 2 + }, + { + "int": 0 + }, + { + "map": [ + { + "k": { + "bytes": "" + }, + "v": { + "int": -2 + } + }, + { + "k": { + "bytes": "5f2c" + }, + "v": { + "int": -3 + } + }, + { + "k": { + "bytes": "4cb8" + }, + "v": { + "int": -5 + } + } + ] + } + ] + }, + "v": { + "map": [ + { + "k": { + "constructor": 3, + "fields": [ + { + "int": -1 + }, + { + "int": 0 + }, + { + "bytes": "8bfac2f6" + }, + { + "bytes": "c366" + } + ] + }, + "v": { + "int": 4 + } + }, + { + "k": { + "bytes": "34cf1e" + }, + "v": { + "map": [ + { + "k": { + "bytes": "2e72f6" + }, + "v": { + "int": -1 + } + } + ] + } + }, + { + "k": { + "map": [ + { + "k": { + "bytes": "db" + }, + "v": { + "int": -5 + } + } + ] + }, + "v": { + "constructor": 5, + "fields": [ + { + "bytes": "d36e4695" + }, + { + "bytes": "80a7d9" + }, + { + "bytes": "e49f" + }, + { + "bytes": "71d79f" + }, + { + "bytes": "2bd1c9f0" + } + ] + } + } + ] + } + }, + { + "k": { + "map": [] + }, + "v": { + "bytes": "1c75c177" + } + }, + { + "k": { + "bytes": "17be43" + }, + "v": { + "bytes": "51" + } + } + ] + }, + "inlineDatumhash": "77ed7ed47a123918ddfdead03503899007e3d48b7c7f07b5b0eb70668f5adb60", "referenceScript": null, "value": { - "lovelace": 5204095253784175078 - }, - "witness": { - "datum": null, - "plutusV2Script": { - "cborHex": "46020308040308", - "description": "", - "type": "PlutusScriptV2" + "89ef4ec2f32af5703bd4f2be331b1f06466ebd76e18a41d3b0bcf3e5": { + "5ae592846df35902aa": 5675497201616615523 }, - "redeemer": "4100" + "lovelace": 3601972019525104427 } }, - "0704080306050104040506070706040408050007000200060806040508050105#51": { - "address": "addr_test1zrk2nux9elchu3rvy9vw5t6j6n7kfd3v7lws38tru83mhng3xtn0299atcfytflk79l0n2sl4le83mtqx8xy92gqcngs8ceqmk", + "0300000206060204060707050205010802070406060506020508030207040208#42": { + "address": "addr_test1zp7kxsagqslyltx6p9kdx3lhlqfasy4frntzhdqv2e9f6uzkvk0a7f0vl5jqgczmj9kn0rmj8f2sguzyp97se6a9fc7qv0j9zw", "datum": null, - "datumhash": "4053094762ac8103a634f1c1ac6a802797284fd60277b666b6ef0aadf8e79b18", + "datumhash": null, "inlineDatum": null, - "referenceScript": null, - "value": { - "lovelace": 8635212330638838499 - }, - "witness": { - "datum": "4100", - "plutusV2Script": { - "cborHex": "4103", + "referenceScript": { + "script": { + "cborHex": "46450100002261", "description": "", - "type": "PlutusScriptV2" + "type": "PlutusScriptV1" }, - "redeemer": "420101" - } - }, - "0804070704030601080506040406010608040003050403010704040504020603#73": { - "address": "addr_test1yzfju8t0achc8qhyxz7nkvkrkzu2p6vg7f9yvt672nvyhsgyxqq6nh4nmupeywvjkuee4gqxs6y5ydma39j38x28ymms3n8p8j", - "datum": null, - "inlineDatum": { - "map": [] + "scriptLanguage": "PlutusScriptLanguage PlutusScriptV1" }, - "inlineDatumhash": "d36a2619a672494604e11bb447cbcf5231e9f2ba25c2169177edc941bd50ad6c", - "referenceScript": null, "value": { - "97c123a1e55c30c5a8ad7ba5eeee92f9a6685ad5883d30f1cbb87e75": { - "1f38f38498864eb230850a09b213a592": 6925299155115781699 - }, - "lovelace": 1345124535162132722 - }, - "witness": { - "datum": null, - "plutusV2Script": { - "cborHex": "43080802", - "description": "", - "type": "PlutusScriptV2" + "d6eaf905ce0cb03d6c24aa5664b6da8d451bdf49b367cdeb12a05d3c": { + "37bd": 1 }, - "redeemer": "43000100" + "lovelace": 5247759364583205505 } - } - }, - { - "0102060100070708010507030404040200010404050806050704060704070407#36": { - "address": "addr_test1qqwppdma6z05gtt8dlme0gu3h7g6dp7ltu02hmd9rfam7ar5lduvk5gqg3d73plfvd52fhszg7ew5qmsp7hdleqjgrxszygu6g", + }, + "0403060306000304040004030808030807000805020103040800020501040608#78": { + "address": "addr_test12p37gt4nja3spwggdw7k26y4ace3fdpsttm77hedgkrfwscxqczs9nvwwz", "datum": null, "datumhash": null, "inlineDatum": null, - "referenceScript": null, - "value": { - "072a4796db5469ee7b3824bc7314bbc978aaf168d7d5c561ff1bfd0e": { - "5aa154a37ccb63803f3d65160a27d9777094fb75c15117b9888b62dbb11c": 7082452847606764205 - }, - "lovelace": 7002024969193393855 - }, - "witness": { - "datum": "9f00d87a80ff", - "plutusV2Script": { - "cborHex": "40", + "referenceScript": { + "script": { + "cborHex": "82018482050b820284830302828200581c65fc709a5e019b8aba76f6977c1c8770e4b36fa76f434efc588747b78200581c76e607db2a31c9a2c32761d2431a186a550cc321f79cd8d6a82b29b88201828200581c76e607db2a31c9a2c32761d2431a186a550cc321f79cd8d6a82b29b88200581cb5ae663aaea8e500157bdf4baafd6f5ba0ce5759f7cd4101fc132f548202838200581cbd039f956f4b302f3ab6fc7c4bac3350a540f44af81a8492194dd2c28200581c65fc709a5e019b8aba76f6977c1c8770e4b36fa76f434efc588747b78200581c58e1b65718531b42494610c506cef10ff031fa817a8ff75c0ab180e7830304858200581c4acf2773917c7b547c576a7ff110d2ba5733c1f1ca9cdc659aea3a568200581c58e1b65718531b42494610c506cef10ff031fa817a8ff75c0ab180e78200581c4acf2773917c7b547c576a7ff110d2ba5733c1f1ca9cdc659aea3a568200581c3542acb3a64d80c29302260d62c3b87a742ad14abf855ebc6733081e8200581cb16b56f5ec064be6ac3cab6035efae86b366cc3dc4a0d571603d70e58204038201828204108201838200581c76e607db2a31c9a2c32761d2431a186a550cc321f79cd8d6a82b29b88200581cb5ae663aaea8e500157bdf4baafd6f5ba0ce5759f7cd4101fc132f548200581ce0a714319812c3f773ba04ec5d6b3ffcd5aad85006805b047b082541", "description": "", - "type": "PlutusScriptV2" + "type": "SimpleScript" }, - "redeemer": "420001" - } - }, - "0104060605020407040607000405080606070206010304080407000207020608#7": { - "address": "addr_test1zpd85v5jpjwvrldfnq56n04c5rh75wq9rst6pmq0j6n9h6c8k8tl86lg2plkq86n90aq88spp78sh902zv590s9njwkqztpk4j", - "datum": null, - "inlineDatum": { - "int": 3 + "scriptLanguage": "SimpleScriptLanguage" }, - "inlineDatumhash": "e88bd757ad5b9bedf372d8d3f0cf6c962a469db61a265f6418e1ffed86da29ec", - "referenceScript": null, "value": { - "8f461954fe2f18fee1dca233f358907e643ff839ed1f995e4bf325e3": { - "fec3fd5636189def39": 7526447698726176993 + "9e24f8a2a18a108390b9a0ecfb6aca1ff4e66867b995c11ba9d96bc7": { + "37": 1 }, - "lovelace": 4471064148471550567 - }, - "witness": { - "datum": "420002", - "plutusV2Script": { - "cborHex": "4103", - "description": "", - "type": "PlutusScriptV2" - }, - "redeemer": "d8799f4100a1d8798040a18080ff" + "lovelace": 2119842977817854865 } }, - "0505040505000806000602070304080305070304050006040403080104050001#23": { - "address": "addr_test1ypm8kr8cqddxvettp8jey0uxneq2gzy2uaulx9j7ctdrywwfepu0za733y9kv0tny5t9e6leua6wkskupl9cgghtqf3suufpws", + "0605060103000503080006050306050703060000050105020808080806000300#69": { + "address": "addr1x8c7mf57utayw8vnhmd5zvd9wqd57aqglra5c0kjh8gfgs6mygehcql5mahdskqhg2t4qds7s4le3vm4n94v35dcz32qthjzeh", "datum": null, - "datumhash": null, + "datumhash": "7afd04806608632ceaa2384c668e99bd2895acc1c24c8632ae92d072e63e3c3a", "inlineDatum": null, "referenceScript": null, "value": { - "lovelace": 5584395409911584208 + "fef91098d6feeaf11a3c301de39e00cf653d37f49db690f422e39937": { + "c4b08bf247496acb57b47f9679fbea": 2222597395007839854 + } } - }, - "0707050508050104030004060203020603020503000605070204030605050606#64": { - "address": "addr_test1qr9xzyf3kpprk3y8p64vt3cg6ycm4xyhcuh40nhncjutmnhwcfkrd38pqpsrhq5hm67an9atet6dq0nmu4xyp6aev5zs8d9cr6", + } + }, + { + "0108010806040708030808030604040005030301040603070700050803020602#6": { + "address": "addr1zyzte92v2s4u2z0avzg9t8hn0hugh4w803wpds42lwkc6k764uwdxl0wmumqyjr2lt993w3gr2nmsl89y55vusr3huks8e4s09", "datum": null, - "datumhash": "97330eaf6f895efce34ef3dafda9eacc37723941d6b5df625f5bc0bcc2f2c659", + "datumhash": "3aa954ab240423867ba8426fb9cf7031d552998628e1fbd1bf2cd044d7373d9f", "inlineDatum": null, - "referenceScript": null, - "value": { - "3adfb8ec617bef5de5bcf0025c5224126a5bf748ea5e4e9016d881e7": { - "c406604d83d1a1f80ae5ed5b65f3353ea09b18bc5f": 7747395311619844201 - }, - "lovelace": 693276334491171264 - }, - "witness": { - "datum": "d87a9fd879800101ff", - "plutusV2Script": { - "cborHex": "46060808010707", + "referenceScript": { + "script": { + "cborHex": "8200581cbd039f956f4b302f3ab6fc7c4bac3350a540f44af81a8492194dd2c2", "description": "", - "type": "PlutusScriptV2" + "type": "SimpleScript" }, - "redeemer": "9fa10000a0ff" + "scriptLanguage": "SimpleScriptLanguage" + }, + "value": { + "c978e3be0d01b37fde57640fa7e047dcaf12f40d2c21c1a3f04d2d67": { + "33": 5039428953979917821 + } } }, - "0800010106010200000500070405000305030806060704080200080100080407#18": { - "address": "addr_test1wp9mjm90smyx8792gxwqgmctlpc6gl5xn3c0rkysnspdvzszh5rt0", + "0400070105070805080801000107000007010708050304080300040400050102#86": { + "address": "addr1z9lvz9lg0wxw8l4jaljcptd03ap3kq4ftc8y7ts6pzhcle6d5c5mrqsry7ywkamrpttmzwwhj0qjygu9s5qpz0xrzudsc6g9ed", "datum": null, - "datumhash": "849e7aa93b023c29308ee0c91fdc4d6c0a1393599672ee64b3f232d080e25265", + "datumhash": "46d21152941afe6bbb85319745aa72a76af1a721f653076c09049b56feb54521", "inlineDatum": null, "referenceScript": null, "value": { - "2db8410d969b6ad6b6969703c77ebf6c44061aa51c5d6ceba46557e2": { - "b57db5802d6cc234bc527ff94a": 3598652961404124270 + "bfcddec5bb6d3bbabebf06639ffd3a8a49228b4442fc0416ccbf8814": { + "218e396ccbf2d0ca04150b0d538b504c70bd9384": 1 }, - "lovelace": 6633079461205696672 - }, - "witness": { - "datum": "43010101", - "plutusV2Script": { - "cborHex": "43060702", - "description": "", - "type": "PlutusScriptV2" - }, - "redeemer": "420000" + "lovelace": 1612728224243880708 } }, - "0802010302080306010802050405030705070401040208060406080707070300#11": { - "address": "addr_test1vp4wvv3rkxdqn9jf6sfg78alq5kx76uszsa78ych9dnsraqwe6fwe", + "0601010303060403000300000208070700010808040503070705070106040808#16": { + "address": "addr1zxu26at4xsvc4ut4shp4hne6wnkhh2sk06p8w864qjjzru9rnf0qjmh78h7e5ugmwcprchrwxxcdxywem9z0tewhvdesc9m7yn", "datum": null, - "datumhash": "cf23e4ce7db809e363df5abdc2e90fb741b2beeb40b3423bb51b5e9148adcce6", + "datumhash": null, "inlineDatum": null, - "referenceScript": null, - "value": { - "lovelace": 8468718031792502556 - }, - "witness": { - "datum": "d87b9f20ff", - "plutusV2Script": { - "cborHex": "46080506000406", + "referenceScript": { + "script": { + "cborHex": "82050d", "description": "", - "type": "PlutusScriptV2" + "type": "SimpleScript" }, - "redeemer": "22" - } - } - }, - { - "0101010000040005050106030704000302010003000506040301010703020203#15": { - "address": "addr_test1xzuhpfwz4h59q2z0drujl2tvyg5ra9zrypd9ku2js8zfj7cfz62qqgm0d67kxx4htyj27ndt7esk9c8845nnwksx4d6s2gh3v5", - "datum": null, - "datumhash": "05012bb0448cddbc55f4f0e947fd69f330264d32d10d088446d6de596ba881d7", - "inlineDatum": null, - "referenceScript": null, - "value": { - "lovelace": 641966023422547031 + "scriptLanguage": "SimpleScriptLanguage" }, - "witness": { - "datum": "d87a9fd87a809f40ffd87a80ff", - "plutusV2Script": { - "cborHex": "450607020701", - "description": "", - "type": "PlutusScriptV2" + "value": { + "ac8d5150293afecfe5f39741e7b64e96b580d3b5a82bb29c77ca52f5": { + "2f6cc7e50ee0d249ec2975602e87ad88ddafb64f2dbf": 8368921626681574220 }, - "redeemer": "d87a9fa0d87a9fa0ff4100ff" + "lovelace": 5372186911364879546 } }, - "0104070104080305010600020008080201070700040302030004000101070301#59": { - "address": "addr_test1zzzfkqsnu30rwasyx4mfmquc745tpd36cgtn9ylc97rrnvkke45maz4uyuxx4wmz3a7ea2j2m0ml22nn3sr4c2e3rc6qzzfyu4", + "0603030800050201000108010208020507010705080106000200000806040506#91": { + "address": "2RhQhCGqYPDmimLy4p9dC9jawhiPzKMxpLw3Pybzz1RcK9Fz7geeKk2fEHoGsmNk3xfrBdLWUmjzapmc35GzHMDVvYAyU2w2V9q3F5qDefRf7V", "datum": null, - "datumhash": "9067fef4cb1093f77135baf15a7d0f14a145645c8890403eb044a8f616c65cb8", - "inlineDatum": null, + "inlineDatum": { + "bytes": "b0" + }, + "inlineDatumhash": "5deac6e1ed5e764dffe204d608cb9d43483c752730a71eb197cb356edefb04fe", "referenceScript": null, "value": { - "lovelace": 2581030569813074538 + "4a1c412d8e2b3015a7fb7d382808fb7cb721bf93a56e8bb6661cdebe": { + "cfa8d2af4f7a2ed11b4d44a4ce2894788235da": 2 + } } }, - "0803000506030604030205040306060102020204030807050107080708010401#33": { - "address": "addr_test1xz4luu8qnj2kfkzxmk82g4wqahffavn4qt4quj7fg08xs0qk7d07w2jxt9vmu9t0avsm6a90jpeex3u2q4ygxjl6ye5sqhaggr", + "0604010208000602030504000603060501040106050006050303060707060805#18": { + "address": "addr1z9n2f6rd82xtsm67w3z4kjwtk02jm2kmd9nefafvd8mx0tttsynyp4kpum4wpqzruk59wl6p4djx6w6cgp0kykk2rdjqghmn2x", "datum": null, - "datumhash": "f5a7894a7793bebee491a02c3106b1f940db41afda884dc29b389cfdda92e741", - "inlineDatum": null, + "inlineDatum": { + "map": [ + { + "k": { + "bytes": "" + }, + "v": { + "int": -3 + } + }, + { + "k": { + "map": [ + { + "k": { + "constructor": 1, + "fields": [ + { + "int": -5 + }, + { + "int": -4 + } + ] + }, + "v": { + "bytes": "f9be" + } + }, + { + "k": { + "int": -4 + }, + "v": { + "map": [] + } + } + ] + }, + "v": { + "constructor": 0, + "fields": [ + { + "constructor": 2, + "fields": [ + { + "int": 0 + }, + { + "bytes": "67bb037d" + }, + { + "int": -2 + }, + { + "int": -1 + }, + { + "int": 0 + } + ] + }, + { + "map": [ + { + "k": { + "int": 5 + }, + "v": { + "bytes": "66f98e" + } + }, + { + "k": { + "bytes": "1f2d95c2" + }, + "v": { + "int": -3 + } + }, + { + "k": { + "int": -1 + }, + "v": { + "int": -1 + } + } + ] + }, + { + "bytes": "" + }, + { + "constructor": 5, + "fields": [ + { + "bytes": "" + } + ] + }, + { + "constructor": 3, + "fields": [] + } + ] + } + }, + { + "k": { + "constructor": 5, + "fields": [ + { + "bytes": "011a" + }, + { + "list": [ + { + "int": 0 + } + ] + } + ] + }, + "v": { + "bytes": "8037" + } + }, + { + "k": { + "bytes": "65024a" + }, + "v": { + "bytes": "67" + } + }, + { + "k": { + "list": [ + { + "constructor": 5, + "fields": [] + }, + { + "bytes": "656ab9" + }, + { + "constructor": 1, + "fields": [ + { + "int": 1 + }, + { + "int": 3 + }, + { + "int": 0 + }, + { + "bytes": "811e" + }, + { + "int": -5 + } + ] + }, + { + "constructor": 3, + "fields": [ + { + "bytes": "52e6" + }, + { + "bytes": "db1e" + }, + { + "int": -2 + }, + { + "bytes": "" + }, + { + "bytes": "" + } + ] + } + ] + }, + "v": { + "map": [ + { + "k": { + "int": -2 + }, + "v": { + "bytes": "3c" + } + }, + { + "k": { + "map": [ + { + "k": { + "int": 1 + }, + "v": { + "int": 3 + } + } + ] + }, + "v": { + "list": [ + { + "int": -1 + }, + { + "bytes": "" + }, + { + "bytes": "26ed8e83" + }, + { + "int": 2 + }, + { + "int": 5 + } + ] + } + } + ] + } + } + ] + }, + "inlineDatumhash": "f4e57802c7368970e194d42fb7298160aeb8ceb74545c3f2fcd0a806faa38284", "referenceScript": null, "value": { - "lovelace": 1599957305510962495 - }, - "witness": { - "datum": null, - "plutusV2Script": { - "cborHex": "420201", - "description": "", - "type": "PlutusScriptV2" + "105a8f1bb56444cacc86378c95421aceeb326b0fb7743e493eb82fd5": { + "02c7cf174a3a08fd55db4b4ad835": 2 }, - "redeemer": "9fa180d8798000ff" + "lovelace": 5591405365557491808 } - } - }, - { - "0003030502050406010303010200030404060605050802080104070207010704#65": { - "address": "addr_test1wzjnt7paw6qzh4c5u555lmmh99cju0z36dq3g4cjvupjh8gpu5gxe", + }, + "0604010704050001000606000503060003060700000300070006030502030701#80": { + "address": "EqGAuA8vHnNjywupMK5tiTd8GDJJFpuqcHXptRb3r9USxyyUDry8iD76yzNo1MiBqqJZSGsc6By9YKRRGKQ4g2dpVeYKPCHdkeB6qn3BUXK9fBmM6SBVdoS", "datum": null, "inlineDatum": { - "list": [ + "constructor": 2, + "fields": [ { - "int": 3 + "bytes": "bf" }, { - "list": [ + "map": [ { - "map": [] - }, + "k": { + "int": 3 + }, + "v": { + "int": -4 + } + } + ] + }, + { + "int": -2 + }, + { + "list": [ { "map": [ { "k": { - "int": 5 + "int": -1 }, "v": { - "bytes": "a6" + "bytes": "e7" } }, { "k": { - "bytes": "124f" + "bytes": "7de4" }, "v": { - "int": 4 + "int": 0 } }, { "k": { - "bytes": "9084" + "bytes": "a87f5d" }, "v": { - "int": 3 + "bytes": "0f0513" } - } - ] - }, - { - "bytes": "a3" - }, - { - "int": 4 - } - ] - }, - { - "constructor": 0, - "fields": [ - { - "map": [ + }, { "k": { - "int": -5 + "int": -4 }, "v": { - "bytes": "f0c0ec" + "int": -5 } } ] }, { - "constructor": 4, - "fields": [ + "list": [ { - "int": -4 + "int": 2 }, { - "int": -2 + "bytes": "8a4128" }, { "int": -2 @@ -416,135 +689,160 @@ ] }, { - "int": 1 + "bytes": "7e68ad4a" + }, + { + "constructor": 3, + "fields": [ + { + "int": -2 + }, + { + "bytes": "bbdea19c" + }, + { + "bytes": "30a17e" + } + ] + }, + { + "bytes": "53" } ] }, { - "int": -4 - }, - { - "int": -2 + "int": 3 } ] }, - "inlineDatumhash": "75cc9e6003afbc7d76f95ddbb4c5b30010d1232aff711e205747c63aa4b2d54a", - "referenceScript": null, + "inlineDatumhash": "4e6fe1b0d0a73c5b818d054f91fe9985d76f7ad492e7bc66cf24706e36c0ff01", + "referenceScript": { + "script": { + "cborHex": "8200581cb5ae663aaea8e500157bdf4baafd6f5ba0ce5759f7cd4101fc132f54", + "description": "", + "type": "SimpleScript" + }, + "scriptLanguage": "SimpleScriptLanguage" + }, "value": { - "lovelace": 2322041380280110763 + "4db2d10d7a192810c07a414aa07718d49ed17d1a27df10cf98cc15d2": { + "fcba6c84dcc17b1608bac24c6941c90954053720a68ce1234de5cafa7ffde1": 2 + }, + "lovelace": 3155843221276811965 + } + } + }, + { + "0107000206060500050101060206020305080302060602050608060105010207#49": { + "address": "addr1q8fw9k3t5xwmh8888mmvw4m8fa36sue5fud4hqk3vjvdpkg8grs7frxah5zp0fsfzguy9up8lfczl4u97tyd3mc52d0s9mg54l", + "datum": null, + "inlineDatum": { + "int": 0 }, - "witness": { - "datum": "43020202", - "plutusV2Script": { - "cborHex": "450100050007", + "inlineDatumhash": "03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314", + "referenceScript": { + "script": { + "cborHex": "820409", "description": "", - "type": "PlutusScriptV2" + "type": "SimpleScript" + }, + "scriptLanguage": "SimpleScriptLanguage" + }, + "value": { + "2db8410d969b6ad6b6969703c77ebf6c44061aa51c5d6ceba46557e2": { + "4c3ac4b8ae22d78574a471": 3252627476648027334 }, - "redeemer": "40" + "lovelace": 802727441781211751 } }, - "0103070101010104060808010502030207060604030608000703020203070700#43": { - "address": "addr_test1qpzljpzpt2t2k8ccjvn0t2v5079vx0u2p2wslxsvgz3aqd9cf85at2c50lxmj826aumj4fc460p3s87ykz630nkwwnkslla2jk", + "0306060606010602050804040600000008010406000606010502020405000003#64": { + "address": "addr_test1qzp0uwngkq6ev9y2rah94p6gch3c9xetg2fhqzqf9jszth96fxrhc2xswvnfghtey0rkp2dr7gdmv8qar5tz4u6zt58qjp0cgu", "datum": null, - "datumhash": "5a13137b39952fd037885f8178f628688d76c45acb9c8fc422dba834f8e73abe", + "datumhash": "c7eb1e39e64aa0fff288fb086350cdc1582999140a0827373a016882b4ebe7ff", "inlineDatum": null, - "referenceScript": null, + "referenceScript": { + "script": { + "cborHex": "4746010000220011", + "description": "", + "type": "PlutusScriptV1" + }, + "scriptLanguage": "PlutusScriptLanguage PlutusScriptV1" + }, "value": { - "lovelace": 1119537756963686208 + "467f58932b54910584a0e8ea25a225e06a14530b2e96e938c53a3f22": { + "33": 8171274763688114280 + } } }, - "0205030703050607070803000806070408070104010005040002010307000006#17": { - "address": "addr_test1zrwkjg9m56hkxxegjf2vtypqjfleqnrj9838mk95tax2gvdnfkhcz6u8eme02ws5akpfl5lxgkf3ga0ummpu3nynf9dq25eqsf", + "0403050008070704010007010004040705000200030604040601070002060404#3": { + "address": "addr_test1xqlght27whxk6xslcljvcnm9c29l8y4mqqlgak8w5pak4yqs6czlyn43g26cvtw7d30p0u02e73aawh4wwx7mx56j90qkd2r4v", "datum": null, - "datumhash": null, + "datumhash": "69e754d808d5050231024b3a85fb17cd625f6daa0d3089e525362444b8b375f3", "inlineDatum": null, - "referenceScript": null, + "referenceScript": { + "script": { + "cborHex": "8201858201828200581ca646474b8f5431261506b6c273d307c7569a4eb6c96b42dd4a29520a8201838200581cb16b56f5ec064be6ac3cab6035efae86b366cc3dc4a0d571603d70e58200581cb16b56f5ec064be6ac3cab6035efae86b366cc3dc4a0d571603d70e58200581c65fc709a5e019b8aba76f6977c1c8770e4b36fa76f434efc588747b782018282040983030080830302828202858200581ca646474b8f5431261506b6c273d307c7569a4eb6c96b42dd4a29520a8200581ca646474b8f5431261506b6c273d307c7569a4eb6c96b42dd4a29520a8200581c58e1b65718531b42494610c506cef10ff031fa817a8ff75c0ab180e78200581cb16b56f5ec064be6ac3cab6035efae86b366cc3dc4a0d571603d70e58200581cbd039f956f4b302f3ab6fc7c4bac3350a540f44af81a8492194dd2c28200581cbd039f956f4b302f3ab6fc7c4bac3350a540f44af81a8492194dd2c28202858205058201808201858200581cb5ae663aaea8e500157bdf4baafd6f5ba0ce5759f7cd4101fc132f548200581c76e607db2a31c9a2c32761d2431a186a550cc321f79cd8d6a82b29b88200581c4acf2773917c7b547c576a7ff110d2ba5733c1f1ca9cdc659aea3a568200581c3542acb3a64d80c29302260d62c3b87a742ad14abf855ebc6733081e8200581ca646474b8f5431261506b6c273d307c7569a4eb6c96b42dd4a29520a8205048201818200581cb16b56f5ec064be6ac3cab6035efae86b366cc3dc4a0d571603d70e58200581c0d94e174732ef9aae73f395ab44507bfa983d65023c11a951f0c32e4", + "description": "", + "type": "SimpleScript" + }, + "scriptLanguage": "SimpleScriptLanguage" + }, "value": { - "lovelace": 722504041032752508 + "2db8410d969b6ad6b6969703c77ebf6c44061aa51c5d6ceba46557e2": { + "39": 1 + } } }, - "0800030305050608030104040707010602080505070704000701070405030000#20": { - "address": "addr_test1yrauceg9jy0ju25w5vrds4yvy8fvkfqc44ukrpmfpfdpkx6xhn6dwxm0qsvqxg4sw0xtedl38s00hku7rygqaxcxqqsqnrtadr", + "0502020106030505000006060405020501040304010304010002020308050206#9": { + "address": "addr_test1wrf760yv690hr6gy7x5z7xldlv7ctxvmu9h4sc6hk6yp02clxnzg9", "datum": null, - "datumhash": null, - "inlineDatum": null, - "referenceScript": null, - "value": { - "lovelace": 2220537541968540510 + "inlineDatum": { + "bytes": "e7" }, - "witness": { - "datum": null, - "plutusV2Script": { - "cborHex": "46040602020805", + "inlineDatumhash": "366b5af863f9330c1e697af71560b3cb4ae2a72f89ea60091d141d4226ca2ded", + "referenceScript": { + "script": { + "cborHex": "82040d", "description": "", - "type": "PlutusScriptV2" + "type": "SimpleScript" }, - "redeemer": "d87a9fd87a80d87a8040ff" - } - }, - "0808050604030501080705040804050003080703010100020105060704070600#66": { - "address": "addr_test1yraq6t6spcj6gue2ewvw83s4ukwnmt9axdzc86y49p6sv07rl7v0ky89t2lsy4avk3x5fv7ccdm2p7zy5nu984wmyl7sk6wmen", - "datum": null, - "datumhash": "2b1bfcafc5478d0dad2e23883b159b9a4c0a4f593b9b765496b72241cbf03dff", - "inlineDatum": null, - "referenceScript": null, + "scriptLanguage": "SimpleScriptLanguage" + }, "value": { - "4b23d8bbbaacb30fa91270d19043d014b7cb6483c72a15c7bebc4126": { - "8942db600767f1f0c32dcea69c9535694e8d23f3b8129562071933ec": 3341256643509928663 - }, - "lovelace": 518482064320134531 + "2db8410d969b6ad6b6969703c77ebf6c44061aa51c5d6ceba46557e2": { + "38": 1 + } } } }, + {}, { - "0001070703030307070407040308000203080302040704040300020705040601#87": { - "address": "addr_test1zr5zk27jqw48emqufjdq4nwkqhz06j2yl5daxfpgtg5d9vmgs3w7clgxq5u6p09ma9qctkfl7ynmrtw48fkfru54c0sqfzwyd5", - "datum": null, - "datumhash": "952e2c99ffca66dc4f34bee5c02545c29f943e14cce879ba6e56aabd17fa78e6", - "inlineDatum": null, - "referenceScript": null, - "value": { - "lovelace": 1552573957901903928 - } + "blueprintTx": { + "cborHex": "84ab00818258206a680b5268d5d4fa35646cbe8b950fc8ff893200ed911d3ef0202ac20a1b6e240b0181a400583921723fc52e62468988ed24670cf10c0b319981b754b77c1ede4cd98bda7c7c8014b8978a16c6b2425914d36e34792bc0de4930019382e6c2cb018200a1581c2db8410d969b6ad6b6969703c77ebf6c44061aa51c5d6ceba46557e2a149a6a500dd40b089074d1b639a5d1448c22110028201d8184d9fd87c9fd87e9f4040ffff04ff03d8184a8202474601000022001110a4005839003d23fb802eeea2069ce33d2c127d5ca0e9b2be22d1960a18065abfc22cc43e009329859bb0996c199d41da3d8ce30af071610a7fd1390bb4018200a1581c3b54651d1d57e502b5866a52158cc5a23c900324e1dfea032b1158d3a141341b5403644dc827fb3902820058208c1559be875555a6b2a4986a4978f9cb80c2ab69788fbd34bf79f66d1118cbc103d818458200820506021a0001255e04868304581c255148304ff826ddb0abbc5e8f43eb641e0f28d8caf5f194b22cabee028304581c8b877632ed521cae938f804a0afcc834edec774e1ed1a79deb38528b0a82018201581c00cab54aa82b180cd99c689cc8cd70e9004c61b8b4b107806a7eb7a782068201a38200581c7aaf21cc6418e43a45c39f30feeddfcf38ebee7065335b96f05717901a000f1f128200581c7ef8775f41538241aba7d4cd2601907b7640dfd3e67a4468272b00f83a0001dd408200581ca628bab394852154ace133cbf55ce1577463db6d2d1387aba20506803a000142158304581c05bad8a483b209b70f1e6ed7e8a4eb1bd6e5f71891981d0b6e1596dc0e82018201581cef078d2ac33fec7ce07f791f47f6c9060c0146d9cf45f4d865eb8be405a6581df044c060a5600a561e527e92aebb486f48851c9101e7764be81c9b20be1a000497e5581de0459c9f8a1427dfe228bb07cec9f8b5e5918405aea5566afe66c9e8791a000a45e4581df1b03a1003c2f7d117122a481b02b949d681fb5f54878060ddd9bf0bf919a961581df1f5375108450776b8cd3a33676efd23985fcb27a0fa74c6c10238c2ef1a0006f9df581de1bd91c1569c64927f23f6a6e6fcb174b26ae1ac0d2366ac57f20a59261a00033947581de1f8b470d74ea631da45fc3d1119f0e24785ae8acf5919a13e5b0c78111a0005059d08040e85581c2cab970ed95ebeb110c286c13982f834b43ed447fd0ea3549a0c287a581c2ccffaf7565317e858debbd6fc19e4c651c6580877a1de1dd5129590581c33d7f48cd19e3a2111206565b2d32bcf12409635d6a5960594375aa7581c626c7dbee79548091358454ae45abfedbd62a5614c55eda6db8ad611581c73b984c3055f3f551583324bddcf5d563bac9c97b2d9ef4d8dfc4d6809a1581c2d32344cff305cd943ae9661114a968667836ef26387bc1be22c24a6a141391b635c9db406047b64075820326b0350ca3a7c0d1678c7a6bcc480635bc301ce84793778863bd8de9090cdae0f00a30084825820425858d4c9b3fbf4eaf373657ff48b102eb60184819d1b66cc75b4828158b8c8584086f38b7f3b454145555435c889cc9c44ae1e0d480d688b6cda1644268b01d0c2b076304437e4e91d2b611928fff4f3c1e7dc821ca79675210b6a33d2e986f3d7825820da2ae99063b6b980c1fe1a525279e2c8be9d0e53a50a0e4a54e70db7408756b35840602d33fa28b0fdb9f157bac577888ac6961e50602b797f2644d69ce48bc9a6b2f2de6d6257e0325fe9c67572c0e782fd72a868cde13d67af02cd569c03e8c5488258206bd7f6e7065f5065e08dd482c6d0941f76224450e2f12726d14a3e1f33f7931b58406df1961a2126138a08980c6b6e2b3191cb57dbd8cc6bee1213602507e272fa96172bc74759800eca8ee666e05429f4ef596ce8462ef68cbbf1828e5df600d7c58258203e718bb6ca2d784d6b44e0c7c5c96dd0d190bd7614326697152e614fd1d9e6e8584066a4afd983bd4dbc084debf4aa4e252b944fab892cb75a6184a5a7e5a0abdbdc569229e0b64bed04d9f617ba05f489f85f177d05d3e9db69b22d0dc5210986f504819fa120a14042a088d87e9fa44454e2bf8d05054040034358dfed20d87c9f04ffff24427cec43f8062bff0581840107a30243b54d97d87b9fd8799f20040242e270ff431a98ead87b80ff208005821b6bb75a9f798019371b5cb0725442de00c9f5f6", + "description": "", + "txId": "1b624e3638fecc7a4f547e4e0e1b71bc46c02bfe0a02bc0eef38ef79be964a96", + "type": "Tx BabbageEra" }, - "0008080100010700070601060704000708000203080304080106070407020808#58": { - "address": "addr_test1zrk8h05e05sy6j3hwspwxyk2gdsfnly0qgz77spc2w4j4xw7rqxts4msfgy37rtzgxqkaegsxur6qme3xde7qcl544mqq2m0mz", - "datum": null, - "datumhash": null, - "inlineDatum": null, - "referenceScript": null, - "value": { - "lovelace": 8353507006040297895 - }, - "witness": { + "utxo": { + "0707080105000302030305010005080505070402080205010001010101050400#41": { + "address": "addr1qyxdjakrzzjezr24awcpxgczr0zvvnw6x8nuph4ng02zzxx9twytg8xx5pxg64x25n7qged96txm6vksdzkm28t7rahq6kg3t9", "datum": null, - "plutusV2Script": { - "cborHex": "43070101", - "description": "", - "type": "PlutusScriptV2" - }, - "redeemer": "d8799fa0ff" - } - }, - "0301070400050605040504060802040007080605060400050302080808050306#20": { - "address": "addr_test1qqjxma6670x23w4nk35c2vm3yjy5c59qwt4uhs45r2d5nzlau9ujnzwp9elm82ux24mpw2xu4r00tp4je2qn9956rcfqy93czv", - "datum": null, - "inlineDatum": { - "bytes": "2b" - }, - "inlineDatumhash": "93731cbd30b156243d4c623d96df8fb4f47c672467e6e35e3354141c6c250706", - "referenceScript": null, - "value": { - "lovelace": 161489348527668654 - }, - "witness": { - "datum": "9f4040d87a9f00ffff", - "plutusV2Script": { - "cborHex": "43020800", - "description": "", - "type": "PlutusScriptV2" + "datumhash": null, + "inlineDatum": null, + "referenceScript": { + "script": { + "cborHex": "8200581c0d94e174732ef9aae73f395ab44507bfa983d65023c11a951f0c32e4", + "description": "", + "type": "SimpleScript" + }, + "scriptLanguage": "SimpleScriptLanguage" }, - "redeemer": "a38000d87980019f00ff4100" + "value": { + "4a1c412d8e2b3015a7fb7d382808fb7cb721bf93a56e8bb6661cdebe": { + "b55c5fbef99a09cff2f553": 2525071571567660025 + }, + "lovelace": 823353035918019402 + } } } } diff --git a/hydra-node/test/Hydra/Chain/Direct/Contract/Check.hs b/hydra-node/test/Hydra/Chain/Direct/Contract/Check.hs index f91133b3706..654a13589ed 100644 --- a/hydra-node/test/Hydra/Chain/Direct/Contract/Check.hs +++ b/hydra-node/test/Hydra/Chain/Direct/Contract/Check.hs @@ -2,11 +2,11 @@ module Hydra.Chain.Direct.Contract.Check where import Hydra.Prelude +import Data.Map.Strict qualified as Map import Hydra.Cardano.Api (Tx, UTxO) -import Test.QuickCheck (Property, property, counterexample) -import Hydra.Ledger.Cardano.Evaluate (evaluateTx) import Hydra.Cardano.Api.Pretty (renderTxWithUTxO) -import qualified Data.Map.Strict as Map +import Hydra.Ledger.Cardano.Evaluate (evaluateTx) +import Test.QuickCheck (Property, counterexample, property) -- | Expect a given 'Tx' and 'UTxO' to pass evaluation. propTransactionEvaluates :: (Tx, UTxO) -> Property diff --git a/hydra-node/test/Hydra/Chain/Direct/ContractSpec.hs b/hydra-node/test/Hydra/Chain/Direct/ContractSpec.hs index c14c13427fa..28d073e9eca 100644 --- a/hydra-node/test/Hydra/Chain/Direct/ContractSpec.hs +++ b/hydra-node/test/Hydra/Chain/Direct/ContractSpec.hs @@ -20,6 +20,7 @@ import Hydra.Cardano.Api ( ) import Hydra.Cardano.Api.Network (networkIdToNetwork) import Hydra.Chain.Direct.Contract.Abort (genAbortMutation, healthyAbortTx, propHasCommit, propHasInitial) +import Hydra.Chain.Direct.Contract.Check (propTransactionEvaluates) import Hydra.Chain.Direct.Contract.Close (genCloseInitialMutation, genCloseMutation, healthyCloseInitialTx, healthyCloseTx) import Hydra.Chain.Direct.Contract.CollectCom (genCollectComMutation, healthyCollectComTx) import Hydra.Chain.Direct.Contract.Commit (genCommitMutation, healthyCommitTx) @@ -63,7 +64,6 @@ import Test.QuickCheck ( (==>), ) import Test.QuickCheck.Instances () -import Hydra.Chain.Direct.Contract.Check (propTransactionEvaluates) spec :: Spec spec = parallel $ do diff --git a/hydra-node/test/Hydra/Chain/Direct/StateSpec.hs b/hydra-node/test/Hydra/Chain/Direct/StateSpec.hs index 6630d2458da..cfb1fa26ce2 100644 --- a/hydra-node/test/Hydra/Chain/Direct/StateSpec.hs +++ b/hydra-node/test/Hydra/Chain/Direct/StateSpec.hs @@ -39,6 +39,7 @@ import Hydra.Cardano.Api ( ) import Hydra.Cardano.Api.Pretty (renderTx) import Hydra.Chain (OnChainTx (..), PostTxError (..), maxMainnetLovelace, maximumNumberOfParties) +import Hydra.Chain.Direct.Contract.Check (propTransactionEvaluates) import Hydra.Chain.Direct.Contract.Mutation ( Mutation (..), applyMutation, @@ -146,7 +147,6 @@ import Test.QuickCheck ( ) import Test.QuickCheck.Monadic (monadicIO, monadicST, pick) import Prelude qualified -import Hydra.Chain.Direct.Contract.Check (propTransactionEvaluates) spec :: Spec spec = parallel $ do