From e2b5a963dc12769f127bd9f3322a19358b501659 Mon Sep 17 00:00:00 2001 From: Sasha Bogicevic Date: Wed, 3 Jul 2024 16:43:28 +0200 Subject: [PATCH] Fix the logs schema errors --- hydra-node/golden/Message SimpleTx.json | 5 +- ...ySized (ServerOutput (Tx BabbageEra)).json | 267 ++------ ...asonablySized (ServerOutput SimpleTx).json | 108 ++- ...d (TimedServerOutput (Tx BabbageEra)).json | 615 +++++++++++------- hydra-node/json-schemas/api.yaml | 4 + 5 files changed, 490 insertions(+), 509 deletions(-) diff --git a/hydra-node/golden/Message SimpleTx.json b/hydra-node/golden/Message SimpleTx.json index f2f8ac843fd..9dcf2ecab3b 100644 --- a/hydra-node/golden/Message SimpleTx.json +++ b/hydra-node/golden/Message SimpleTx.json @@ -73,7 +73,7 @@ } }, { - "signed": "55b5c0a76461a10c5d0796233e0282cf8d3af91a962e3c143ab3d35618d9082a97af24c5168c17184c8b0ee50b8593b03d64894e38fba07c9dc583e869ce630f", + "signed": "50f0905bb2ca9789c0203092c4be75c730ec34c62a22f5baba9183f74ae4564d0c0f90879b45fa6601af6a00bae8a48ce0aea0feb1bca23cd717d23c5a319405", "snapshotNumber": 2, "tag": "AckSn" }, @@ -146,7 +146,8 @@ 26 ] }, - "snapshotNumber": 1, + "snapshotNumber": 22, + "snapshotVersion": 11, "tag": "ReqSn", "transactionIds": [ 22, diff --git a/hydra-node/golden/ReasonablySized (ServerOutput (Tx BabbageEra)).json b/hydra-node/golden/ReasonablySized (ServerOutput (Tx BabbageEra)).json index 9fac23ba89c..ca9b6c16890 100644 --- a/hydra-node/golden/ReasonablySized (ServerOutput (Tx BabbageEra)).json +++ b/hydra-node/golden/ReasonablySized (ServerOutput (Tx BabbageEra)).json @@ -18586,225 +18586,112 @@ "postChainTx": { "confirmedSnapshot": { "signatures": { - "multiSignature": [] + "multiSignature": [ + "58cadc5dc3cb4fb4fa627ea7d332b37d4e85762f939aa0431ed7630fbffa950a4f6db93dd498192eaf25c0d01801eba191806f154c533904046684ee962be905", + "e8c3bd7d7dfd9c5748900df02dbf352e369de21e00bc7292c50263dd36f5ba6b052665be669d2870b797f55541e32af357b31b0a16ceb5166c21c71ca3ebc707" + ] }, "snapshot": { "confirmedTransactions": [], - "headId": "02070708040705050705060005000403", - "snapshotNumber": 2, + "headId": "07050405060107000702010402020101", + "snapshotNumber": 3, "utxo": { - "0104070403010000030006050003030300070301080204020601080601000004#70": { - "address": "addr1q9kc7w92la4dhspdrx4pns057tnl26uachkdtzh2fxmqqydtx8ttcl69wtym8dzcgwff8sh5pgdvuza7ddxgp25m9hsqpc3p28", - "datum": null, - "datumhash": "6799c2464a082f728da1b8e44bae60fdcfdf667ba658e0f78a005fb7c4549d48", - "inlineDatum": null, - "referenceScript": { - "script": { - "cborHex": "8200581c4acf2773917c7b547c576a7ff110d2ba5733c1f1ca9cdc659aea3a56", - "description": "", - "type": "SimpleScript" - }, - "scriptLanguage": "SimpleScriptLanguage" - }, - "value": { - "2d725128406dc832eb74c4709aca0512499b3c7b17e00d7cb2e6d1b1": { - "b4096d95": 1 - } - } - }, - "0603040502000701000405000308030701080608010005050203060003010505#19": { - "address": "addr_test1zp2mwxj20l2e33v7tyy0k4ytcd0kcvtgnu0xwpt0dn203dlddhccxhzltyp0mhl3ae45rsccg37m338dtcdrah2ma9eqr3m57c", - "datum": null, - "datumhash": null, - "inlineDatum": null, - "referenceScript": { - "script": { - "cborHex": "820402", - "description": "", - "type": "SimpleScript" - }, - "scriptLanguage": "SimpleScriptLanguage" - }, - "value": { - "2db8410d969b6ad6b6969703c77ebf6c44061aa51c5d6ceba46557e2": { - "5eed128535a5efa4a342ac45888d6b21fe": 1 - }, - "lovelace": 6947378256097424800 - } - } - }, - "utxoToDecommit": { - "0304070603070708020400010300070805020301060708050804000703080002#3": { - "address": "addr_test1zzjdes00t9lmxr3vcyakyej7gmq5trr7j7wdcx58hvry7w5x9f4smgenyftkrnd2y6rvekscv2cry9ca793hssvej7aslsacq8", - "datum": null, - "datumhash": null, - "inlineDatum": null, - "referenceScript": { - "script": { - "cborHex": "820181820505", - "description": "", - "type": "SimpleScript" - }, - "scriptLanguage": "SimpleScriptLanguage" - }, - "value": { - "d231480d2166e3d312a0ca769c2dd02985c9b34c57d9888a7e31e0c9": { - "c1e2c295aa31af5593c9": 2353946717261462612 - } - } - }, - "0406060506000703080000030102000308030205040002080408020604060008#86": { - "address": "2RhQhCGqYPDq6wxDnGiVbkuKiZMda1cSQDSLHbBvSoU7xCJBLGBnZh34nmQWeih58s7ipCwvjPAkHUUg2JdwjZWteeAsK2PgCUAwEeqriPyiML", - "datum": null, - "datumhash": null, - "inlineDatum": null, - "referenceScript": { - "script": { - "cborHex": "46450100002261", - "description": "", - "type": "PlutusScriptV1" - }, - "scriptLanguage": "PlutusScriptLanguage PlutusScriptV1" - }, - "value": { - "245d5a7a06fe18358242e81281cd5ba9e6abe4efc54e7b659f25abae": { - "38": 1 - }, - "lovelace": 2276422954729107893 - } - }, - "0500010702030105030507040306000605040100020301030702080001070708#40": { - "address": "addr1q8w24j5c7z8yg4qken26udaj9dp9r3769kkjz730nurfqyx0hqazrskxtky46dwjz7xf8lyxet4ze9a4ymj7l88mam3sj227z5", + "0306040707000600050007000505070400020708000508070300000408000207#71": { + "address": "2RhQhCGqYPDnVAspCZ6cNwhd8uG94JubRHCCsaebMtfn43W6D7Zzh58xzymitvVXh4H7mZMDNZHdwkzzdW75DYk5LQAiE3sfw36xJiJbuuYDNw", "datum": null, "inlineDatum": { - "list": [ + "constructor": 1, + "fields": [ { - "bytes": "" + "int": 1 }, { "list": [ { - "list": [ + "map": [ { - "int": -2 - } - ] - } - ] - }, - { - "bytes": "" - }, - { - "int": -4 - }, - { - "bytes": "f29d" - } - ] - }, - "inlineDatumhash": "0934f4feebf0b727c0e17983cc51a03b34dd4a93734182c6fed22423d402fe12", - "referenceScript": null, - "value": { - "099aa6443ccb809417d18d7a3a2fdfdbf25fb783c871d67438898667": { - "146360cf5effde": 6209888430955325446 - }, - "lovelace": 3127028572606125518 - } - }, - "0503050601080404080606050405020104050403040206010007050606050200#32": { - "address": "addr_test1wpgtm9p50d22ae63l2mvv23486nrwtyqcxv3u5cj3tcz5tszmjazj", - "datum": null, - "inlineDatum": { - "list": [ - { - "int": 2 - }, - { - "map": [ - { - "k": { - "list": [] - }, - "v": { - "int": 4 - } - } - ] - }, - { - "int": -2 - }, - { - "list": [ - { - "map": [] - }, - { - "list": [ + "k": { + "bytes": "11b56a" + }, + "v": { + "int": -2 + } + }, { - "int": -4 + "k": { + "int": -2 + }, + "v": { + "int": 0 + } }, { - "int": 1 + "k": { + "int": -3 + }, + "v": { + "int": -3 + } }, { - "bytes": "92" + "k": { + "bytes": "f76b" + }, + "v": { + "int": 4 + } }, { - "int": 1 + "k": { + "bytes": "" + }, + "v": { + "bytes": "" + } } ] } ] + }, + { + "bytes": "2d343a" + }, + { + "bytes": "e599" } ] }, - "inlineDatumhash": "7298419da9e39a120567830276bf8e310755a5edaecf95cfd65bfbde5d9762e8", - "referenceScript": { - "script": { - "cborHex": "83030081820507", - "description": "", - "type": "SimpleScript" - }, - "scriptLanguage": "SimpleScriptLanguage" - }, + "inlineDatumhash": "e67b33e23b5fcc887dc280234bbb27be2011af69b42d8cdb7de3587f7a082ed1", + "referenceScript": null, "value": { - "cbb5e48fc4b67c9acb094bc7a1fbdfa95b925d69cde3e68cb824a4b5": { - "32": 1 + "2d725128406dc832eb74c4709aca0512499b3c7b17e00d7cb2e6d1b1": { + "2ebe1d8c007069758861cdcf76a9d55d1a301357668433c65366fee11703": 1 } } }, - "0601030500030403020003080606060601050804050500050805080501030506#77": { - "address": "addr_test1qpm5aeyepja7ystrq0chhmmv8j2fdk5f8tqwemvw8nkx32rn8aw7um7u46agkpq0ltlhh3du0cd7l607qry0j46j2jpqdzuxf4", + "0404010403000806010702000100030000060201040305080500070603020701#79": { + "address": "addr1y97hffmz75luh4cl2mavhuppegywcm6pzm5qmywwhxhgckfak83hcazdjymz5jg3c0mfwqwlucx4y5jwk92d2vydgpsqvc6r90", "datum": null, "datumhash": null, "inlineDatum": null, "referenceScript": null, "value": { - "105a8f1bb56444cacc86378c95421aceeb326b0fb7743e493eb82fd5": { - "512fe57a": 2962741082087097555 - } + "5b49b1195ae8985e92175c62e384aa0a7475371afc2a6ca992cb215a": { + "35": 1 + }, + "lovelace": 5973585422589287442 } }, - "0801030402080708060402040207040408020306050301070608040404030300#7": { - "address": "addr1x8yd67qa8jjnrv307k0xaflyufp3wmeyxrq25zmrq6jy2xysxsca4wle7lnngpxgx0veu5hp6vn63vxhp8vfqgscdlasl0c7ac", + "0404050101070000040405020501020706010702000302020105040508020204#72": { + "address": "addr_test1xz4cs7e2f9gj5s6uatqywqqhm7uf74edvaalvszqr82w666tnsx3hegytasg6svu28jwwmg84wr9k7ew2zvssla7g57q9262m9", "datum": null, - "datumhash": null, + "datumhash": "3e0c343698a2413bc24d0831189374fa479dc5f94627faba542adf69825d18d7", "inlineDatum": null, - "referenceScript": { - "script": { - "cborHex": "8200581ca646474b8f5431261506b6c273d307c7569a4eb6c96b42dd4a29520a", - "description": "", - "type": "SimpleScript" - }, - "scriptLanguage": "SimpleScriptLanguage" - }, + "referenceScript": null, "value": { - "04ece8e11a603ee6944c2969eff1db7ac57d22c6c5300ed4b56fb4d8": { - "5ba099": 1 - }, - "lovelace": 285760193306256890 + "8f461954fe2f18fee1dca233f358907e643ff839ed1f995e4bf325e3": { + "b0246cf6d2ac601d50876c33": 1 + } } } }, @@ -18812,25 +18699,13 @@ }, "tag": "ConfirmedSnapshot" }, - "headId": "06060804070207080301040003080403", + "headId": "06060603020405080502040208050600", "headParameters": { - "contestationPeriod": 58363, - "parties": [ - { - "vkey": "ab88de71df086bddfc92e8c615ec9214e7802e5b97b0bddb977b89227ed1390d" - }, - { - "vkey": "f0af1d7eb013732936d5f0591e1df37d1f949c1aa33415dbe019c7b4e666a90f" - }, - { - "vkey": "b07bfc2be6cfbb4e4892f41546ec7c38da4375a02132054fcb2127c81bf76aeb" - }, - { - "vkey": "afc084a8ed1c4d9526d931020d160529ef2c3ac2b93a3f6fe1137da025a07006" - } - ] + "contestationPeriod": 49210, + "parties": [] }, - "tag": "ContestTx" + "tag": "ContestTx", + "version": 0 }, "postTxError": { "byronAddress": "FHnt4NL7yPY3Gt6kkNrvZjY2Y52gKZnLrmM4hj6vod9ci7Rd1n9LQy3587XmVYM", diff --git a/hydra-node/golden/ReasonablySized (ServerOutput SimpleTx).json b/hydra-node/golden/ReasonablySized (ServerOutput SimpleTx).json index ace020bfffd..984b623b651 100644 --- a/hydra-node/golden/ReasonablySized (ServerOutput SimpleTx).json +++ b/hydra-node/golden/ReasonablySized (ServerOutput SimpleTx).json @@ -288,34 +288,46 @@ "postChainTx": { "confirmedSnapshot": { "signatures": { - "multiSignature": [] + "multiSignature": [ + "27e3021885412debd91cb686f9b4cb44efe8a27da3f4b12783cc593e245e7924aadf8921f7bc3cb18e819f6cecdc941b39371af167d30066f8c17b12e994c200", + "e8bae04ad36693c9c11168293c68040c45e176d6555e453de95d7c674b66f6da0e2ab651a7112561c2d9452a12076e08212c331eb241fb3e9ef6a23bf684100f", + "62110908bce1d40bf988fdd18391d37cc7824423144dddc2c41d2d62473ad739d665454ab3d543011a033b120dcd5851466eb64f1a06522394bb2cd720dccf08" + ] }, "snapshot": { "confirmedTransactions": [], - "headId": "06080407040804030000050507000606", - "snapshotNumber": 5, + "headId": "00020600030707020806050501080305", + "snapshotNumber": 4, "utxo": [ - -4 + -2 ], "utxoToDecommit": [ + -6, + -5, -3, - 3, - 6 + 0 ], "version": 0 }, "tag": "ConfirmedSnapshot" }, - "headId": "06060003020700000006070601030402", + "headId": "05060302000701030700010402070006", "headParameters": { - "contestationPeriod": 86400, + "contestationPeriod": 43200, "parties": [ { - "vkey": "6daa70754d6c0c156b206fb59a89b51d981c16ac50ab183b888f41fae6ec29ef" + "vkey": "23711cbc95f54c05a5381fd70dc124092dcddb687aa4866ab017c135421bfecd" + }, + { + "vkey": "a83e710c9c06dfd348acb194d2a5b5908be60ac5737cf77aa2eeae61440f5290" + }, + { + "vkey": "c2f68032397c7844412d69e59cb44854781de59831a6c2d5b1a39f0a17e1fa19" } ] }, - "tag": "ContestTx" + "tag": "ContestTx", + "version": 0 }, "postTxError": { "headUTxO": [ @@ -681,38 +693,19 @@ { "postChainTx": { "confirmedSnapshot": { - "signatures": { - "multiSignature": [] - }, - "snapshot": { - "confirmedTransactions": [], - "headId": "06030101010805010506030208010405", - "snapshotNumber": 2, - "utxo": [ - -5, - -1, - 0, - 2, - 5, - 6 - ], - "utxoToDecommit": [ - -2 - ], - "version": 0 - }, - "tag": "ConfirmedSnapshot" + "headId": "08000606030308040406030101010306", + "initialUTxO": [ + 3 + ], + "tag": "InitialSnapshot" }, - "headId": "00010706080606040503040002070102", + "headId": "02070802020402070007080701030405", "headParameters": { - "contestationPeriod": 49815, - "parties": [ - { - "vkey": "bef463cc229564cee4cd84e61579f5d8c85fa1f19eb648ad0e4e16063466a363" - } - ] + "contestationPeriod": 31536000, + "parties": [] }, - "tag": "ContestTx" + "tag": "ContestTx", + "version": 0 }, "postTxError": { "headUTxO": [ @@ -1030,39 +1023,38 @@ "confirmedSnapshot": { "signatures": { "multiSignature": [ - "6c14d2f7e5d67ae356fb7275949b0a7083902a9ec37b9119895f8d78b9fe8e9d0deda3b71190ce4b4766b51f9e77c52e517ad7200d0e0367b73066e5b969040a", - "d08e5e4ffc91dbbd85b7a7b3f70ff0a6bcc76c14e2ee93728964e267085883a842cc1e333596d680068946a9bec2f72fd0b6ece14ec144cc65616940a398d109" + "646444d31367deae9284026537398271414e6b4d05e48d004018722dd9d06fead10b3966288271e63cd1eef553b30176529530595825ec1bff494844475fdb0c", + "5f6c2e6006fb902e88d36257d8eacc0e6b617ddf45c5ea0b3d476c9697081fd292faae5202d65ec66560fbb7709d80129945f9924584ae8a3a4df80a855aaf05", + "462b4cc47583073cab2a52cd8113b0ea69a167974365d7b28e6d1f8254a2c73798658b042328199806cc45813ca52b443075bd2c3da8b549acfdaae9cc120307", + "68b95e5fd6ab43f82d396752620d033ccc47b685ec57eb4d5463752775a7361b6760d51e1b9bce790a90690ddd22da958fdb5a3ab25ed91079f2ba26ef434a0f", + "dbef51f0f3f2be7beb3234b73730e1c2a26939af9e45160f471f65ba9d3818f7e625e5b600e97dfc687729c74c0a5b204ff54f0d163df4a8112a47e0f6f0550e" ] }, "snapshot": { "confirmedTransactions": [], - "headId": "00000803010206060200050708050503", - "snapshotNumber": 2, + "headId": "07020504060102070602040602060305", + "snapshotNumber": 6, "utxo": [ - -5, - 0, - 4, - 5, - 6 + -1 ], "utxoToDecommit": [ - -3, - -2 + -6, + -1, + 1, + 4, + 5 ], "version": 0 }, "tag": "ConfirmedSnapshot" }, - "headId": "03040001080508020702050503020301", + "headId": "05030006080408040206080101030404", "headParameters": { - "contestationPeriod": 2592000, - "parties": [ - { - "vkey": "3796f41d802169b71968f880ad7b73efe90fa551a9e3b496aa36bc933ffa7ca5" - } - ] + "contestationPeriod": 604800, + "parties": [] }, - "tag": "ContestTx" + "tag": "ContestTx", + "version": 2 }, "postTxError": { "chainState": { diff --git a/hydra-node/golden/ReasonablySized (TimedServerOutput (Tx BabbageEra)).json b/hydra-node/golden/ReasonablySized (TimedServerOutput (Tx BabbageEra)).json index 25c82bfbeff..eaaac4a6fab 100644 --- a/hydra-node/golden/ReasonablySized (TimedServerOutput (Tx BabbageEra)).json +++ b/hydra-node/golden/ReasonablySized (TimedServerOutput (Tx BabbageEra)).json @@ -2569,237 +2569,223 @@ { "postChainTx": { "confirmedSnapshot": { - "signatures": { - "multiSignature": [ - "48ae99b7b9143b98f50203af8953578762b53e74d1a9e9a75f1e0d49c60576b9706ecc51aaaddcc113178986402463ba2ef34485a9b8a90b7952186b35248e01", - "b095e1fed30eab3a24cd0951b086e9c4d4134f7bd3a586e03859e2c20fdc3cb3a007a24d38a19885eac7f6989fd48c99bdc362f6dfddefd74ceba02d96792c0a", - "698750d6132aa28fbe1e2930cb4724c7c3ea827e24a607fb830b991c7377df81522f61da4467150d34480313feba40e4495a75b549bf1b578455652f8a467c09", - "37c6592a8d0e4c697d2d0553877823a65cafa02995062a1b4973680cef3f20b9ef919985aafefbb276e980d1c856e86e72a4e46795618c1c4400aeb6170c710f", - "fa66fedb50565185030acdfa54a3a86cf2e646a61e596e6a62709be2b52005850a984b754de7e6d5faeef4a8af78bdbbaa0ed20ecfb7bcc6091a993f73ea7808" - ] - }, - "snapshot": { - "confirmedTransactions": [], - "headId": "00040804000706060307050604040207", - "snapshotNumber": 3, - "utxo": { - "0003020006060406080606060404040600080500000805070406070104010406#4": { - "address": "addr1zxpqvjxvx8rgylh2jmwfnjzwx22d9jprxee8dd4lhhkgmfl8xrs3n6xx7lzgmq8hpqcmr8s6verv9mtaamtlmfce4z5sf2er4h", - "datum": null, - "datumhash": null, - "inlineDatum": null, - "referenceScript": null, - "value": { - "825ae7fb418e5b279e4af5a81ea83f1235f2776731757fbf1d9d8ea6": { - "ef30ba": 337000312982219572 - } - } - }, - "0106070701030003030006000703060102080608010304000002050107030400#10": { - "address": "Ae2tdPwUPEZBe6WUf8XV9C5XVG5bwcoyyRD3UUbrjBNiJHeFaYVPA56d1ov", - "datum": null, - "datumhash": "0dfd8386be1a297660779ae2fa8515f9518511678fc1fb8684a7cc718371ca82", - "inlineDatum": null, - "referenceScript": null, - "value": { - "56ef2b56e62a6c01b7722b4aa2a4b1653fd7828546169f55489a4e2c": { - "34": 1 - }, - "lovelace": 8155060779244371472 - } + "headId": "00070703050505050000030702000204", + "initialUTxO": { + "0003040500070000050204070204000501010305010004060201020708060000#41": { + "address": "2RhQhCGqYPDmtApkFRLKHfYCamvCiyktojvQwSzdUr6AniqPUK46xgnCpaEJt4E4ruaM5WX83Zrwj3Mpmc15sCBAeHLavtq9TqhB3vSVpchv3o", + "datum": null, + "datumhash": "953f3234905b3f4090429e80da4b509823dcf5b19dd5de0c736798e03fcb1422", + "inlineDatum": null, + "referenceScript": { + "script": { + "cborHex": "8303028582050782040782050c8205018200581cb5ae663aaea8e500157bdf4baafd6f5ba0ce5759f7cd4101fc132f54", + "description": "", + "type": "SimpleScript" + }, + "scriptLanguage": "SimpleScriptLanguage" }, - "0400010603060107040204070200080505050103080007000606060206030007#46": { - "address": "addr1zx0zefyttd27w96kt5ekzv8hjspkt27750p807ncfh6mmmtpjv6vd3r3krg5eqy9k8v7la9gze9x3lw2un7a0835q3qqr482np", - "datum": null, - "inlineDatum": { - "int": 3 + "value": { + "9e9688da9165a6870430fc1f57f918f52f4a6beb32c861dcc341c4f3": { + "31": 1 }, - "inlineDatumhash": "e88bd757ad5b9bedf372d8d3f0cf6c962a469db61a265f6418e1ffed86da29ec", - "referenceScript": { - "script": { - "cborHex": "8200581ce0a714319812c3f773ba04ec5d6b3ffcd5aad85006805b047b082541", - "description": "", - "type": "SimpleScript" - }, - "scriptLanguage": "SimpleScriptLanguage" + "lovelace": 4538270056861823024 + } + }, + "0005070500030307060306060202020501030103030702060207020807010200#12": { + "address": "addr_test1zpdxt2kzjn8c6gzek75svmlmdx6wg03urqvwweyywcc4xwdfcen3z7esnceyya5sr6n6pruk4pmtld3meywc7xjgndpqvstchz", + "datum": null, + "datumhash": "9f5d1ffb85da5e501c64a6466e82d8ef4072c5b76e6269f6939c96192c68aeb3", + "inlineDatum": null, + "referenceScript": { + "script": { + "cborHex": "820182830303848202808200581c3542acb3a64d80c29302260d62c3b87a742ad14abf855ebc6733081e82040f8202828200581ce0a714319812c3f773ba04ec5d6b3ffcd5aad85006805b047b0825418200581ca646474b8f5431261506b6c273d307c7569a4eb6c96b42dd4a29520a82050e", + "description": "", + "type": "SimpleScript" }, - "value": { - "2db8410d969b6ad6b6969703c77ebf6c44061aa51c5d6ceba46557e2": { - "6e3e1f7d79cc6ed28d41d5335016ecf2c5809e4372e2": 549788100745657056 + "scriptLanguage": "SimpleScriptLanguage" + }, + "value": { + "971f947fc54fbd6f300d083e93f5d3958486e3567306a477e226193a": { + "f5099897e7aded4ae93f009595fbd9df25": 7603652860149999876 + } + } + }, + "0202070705070600020604040506070800040404050406020107060507080000#48": { + "address": "addr_test1zrcqvc0ka9dt55v55yy0ne03xq0rrewu6seu558fwxcztwtwkmjl798t3kf2t4ywyn8rudqdndah2q0df7y4qhtxhdesd694sa", + "datum": null, + "inlineDatum": { + "constructor": 3, + "fields": [ + { + "bytes": "127961" + }, + { + "bytes": "68" + }, + { + "int": -5 + }, + { + "list": [ + { + "int": 4 + }, + { + "list": [] + }, + { + "map": [ + { + "k": { + "int": 0 + }, + "v": { + "bytes": "53a11c2b" + } + }, + { + "k": { + "int": 0 + }, + "v": { + "int": -2 + } + }, + { + "k": { + "int": 3 + }, + "v": { + "bytes": "4c56" + } + } + ] + } + ] } + ] + }, + "inlineDatumhash": "150e1381821a5937865c11e8450396c89e90067ee93b94fcab11a9537965cb4a", + "referenceScript": null, + "value": { + "2bc13b5a86d4ab85eaf6f6cd32835da5b8190863d201cab0dd982e51": { + "a479acce01859348970c6506c219cc": 6612250627885116270 } } }, - "utxoToDecommit": { - "0101040801060103050207050304030100010506070208030507040600040107#71": { - "address": "EqGAuA8vHnPBZihghm1JpDVvHnu7vLM4evQamfkMJQmNyHnAYD4YLh3jcVxnp4UctYxMASBi6e238rhaK2DL6gtHBvhWyRH9XKYTFNZTLiLm9VG96AzJXuR", - "datum": null, - "inlineDatum": { - "constructor": 2, - "fields": [ - { - "bytes": "" + "0303000100030305030406030408050603070401080006050101070803080207#73": { + "address": "addr_test1qrmp0jtywqjnjd63zfalxtka6fr3aw4npzu5unwcmx8lg2u94n2qxsdwe3pyg4aayvvuz2xh8np6adxf6sd7l8n5qavsh5c4yq", + "datum": null, + "datumhash": "29d1b01110ce2248e4056af7da2647f1cd55848c301f37c245c0b0a0b41a6f78", + "inlineDatum": null, + "referenceScript": { + "script": { + "cborHex": "8200581c4acf2773917c7b547c576a7ff110d2ba5733c1f1ca9cdc659aea3a56", + "description": "", + "type": "SimpleScript" + }, + "scriptLanguage": "SimpleScriptLanguage" + }, + "value": { + "0bbba6217fcc970ba2864bcf4a20ff23e14a693d280b4f4d2e59ed4d": { + "154cf70dd818f76a5b": 1 + }, + "lovelace": 3999021022379403047 + } + }, + "0500060504050807010305040403080605060006050405040403010706050802#9": { + "address": "addr_test1zzkaenp27dwgpdps9e3uv3amvagz3n23pp778klmq8y8sxm8elpkat3yqxzqq4w8d0tnns3z2lfx24lfsl209v8mxhgskfpxhf", + "datum": null, + "inlineDatum": { + "map": [ + { + "k": { + "bytes": "7726" }, - { - "constructor": 4, - "fields": [] + "v": { + "bytes": "dbdc" + } + }, + { + "k": { + "bytes": "d57f2c" }, - { + "v": { + "bytes": "9a" + } + }, + { + "k": { "map": [ { "k": { - "int": -2 + "int": -4 }, "v": { - "bytes": "e0" + "map": [ + { + "k": { + "int": 5 + }, + "v": { + "int": -4 + } + }, + { + "k": { + "int": 0 + }, + "v": { + "bytes": "e4b5c9" + } + }, + { + "k": { + "int": -4 + }, + "v": { + "bytes": "" + } + }, + { + "k": { + "bytes": "c1" + }, + "v": { + "int": -3 + } + } + ] } }, { "k": { - "bytes": "00" + "int": -3 }, "v": { - "list": [] + "bytes": "76c4" } }, { "k": { - "map": [] - }, - "v": { - "map": [] - } - } - ] - }, - { - "int": -3 - }, - { - "map": [ - { - "k": { - "int": 5 + "bytes": "7a" }, "v": { - "bytes": "474da9" - } - } - ] - } - ] - }, - "inlineDatumhash": "1e35b92f53f8029fa5d90a5540444da87fce271f850d5767fbe8d9e6e5825540", - "referenceScript": { - "script": { - "cborHex": "83030080", - "description": "", - "type": "SimpleScript" - }, - "scriptLanguage": "SimpleScriptLanguage" - }, - "value": { - "6cdae4e2eebfef9448ea56a4aa491bb9d9f7fd3be4bf3393abb6f3ed": { - "33": 7352079821855945386 - }, - "lovelace": 9027903009909515824 - } - }, - "0102040804030304050407050701060702060604000500020102040801050201#65": { - "address": "addr_test1vzxcsz49hchyhcgrzx4kylg8jv2ukqetgcwe6yp924ssw0ccugyl3", - "datum": null, - "inlineDatum": { - "bytes": "3c7221" - }, - "inlineDatumhash": "1eb4709ca09555422fbc292ba958313ae3478f8cde2628cfb5310473ca9fc120", - "referenceScript": { - "script": { - "cborHex": "46450100002601", - "description": "", - "type": "PlutusScriptV1" - }, - "scriptLanguage": "PlutusScriptLanguage PlutusScriptV1" - }, - "value": { - "2db8410d969b6ad6b6969703c77ebf6c44061aa51c5d6ceba46557e2": { - "35": 8156246210119411950 - }, - "lovelace": 8765359461829842708 - } - }, - "0107030708070503040501070208000502060403050201040108070304050204#35": { - "address": "addr1qyv7jnmqt98fug3vg20v3jcrqrg8gjc6kqnqlf5yz4dyxa3yfs5mmcqna7v0vapn24z60x7lay6l2ajsqp8m30ezw5zqxqn5xf", - "datum": null, - "datumhash": "280150a80f2b0c1224a469c2750f5a852371b8ef05b94f562c77d168959007e9", - "inlineDatum": null, - "referenceScript": null, - "value": { - "4e45dfc5e20bdf6fae44ad69b9cf9c409b9369c44c3eac44735d8139": { - "38": 2 - }, - "lovelace": 8954567369538655436 - } - }, - "0505070002030503050005080806080607060004040706010606060803040404#4": { - "address": "addr1q8pn7hdngrd7mevgq5dw5v5xdfpxjk7j2kz73ea8xdt0hak0yvxxzqs5a0wvg2hy5hewajrthakjwctw4reca50ed7qqrmqhg5", - "datum": null, - "datumhash": null, - "inlineDatum": null, - "referenceScript": { - "script": { - "cborHex": "830300818202858202848200581cbd039f956f4b302f3ab6fc7c4bac3350a540f44af81a8492194dd2c28200581cb5ae663aaea8e500157bdf4baafd6f5ba0ce5759f7cd4101fc132f548200581c3542acb3a64d80c29302260d62c3b87a742ad14abf855ebc6733081e8200581cb16b56f5ec064be6ac3cab6035efae86b366cc3dc4a0d571603d70e5820406830302858200581c76e607db2a31c9a2c32761d2431a186a550cc321f79cd8d6a82b29b88200581c3542acb3a64d80c29302260d62c3b87a742ad14abf855ebc6733081e8200581cb16b56f5ec064be6ac3cab6035efae86b366cc3dc4a0d571603d70e58200581c76e607db2a31c9a2c32761d2431a186a550cc321f79cd8d6a82b29b88200581c76e607db2a31c9a2c32761d2431a186a550cc321f79cd8d6a82b29b882040b820280", - "description": "", - "type": "SimpleScript" - }, - "scriptLanguage": "SimpleScriptLanguage" - }, - "value": { - "b0c53e2bf180858da4b64eb5598c5615bba7d723d2b604a83b7f9165": { - "f1ded02fa7ced0e20d62db960f1ed39f": 1 - } - } - }, - "0600050606040704040805020301040306010401000506050600030200000005#44": { - "address": "addr_test1xpypyhnuccfmlkj7mvwv3atdj9qdnf0lyj6mlxgernyyujpv6nh2z5h4enmv6dwe2nescq6a05pkndav6zx66qlg22rqxwurrq", - "datum": null, - "inlineDatum": { - "list": [ - { - "map": [ - { - "k": { - "int": 2 - }, - "v": { - "constructor": 0, - "fields": [ - { - "bytes": "170548" - }, - { - "bytes": "" - } - ] + "list": [] } }, { "k": { - "list": [] + "bytes": "d57641" }, "v": { - "constructor": 0, + "constructor": 1, "fields": [ { - "int": -5 - }, - { - "bytes": "627652b7" - }, - { - "int": -3 + "bytes": "" }, { - "bytes": "90a818" + "bytes": "" }, { "int": 3 @@ -2809,64 +2795,94 @@ } ] }, - { - "bytes": "" - }, - { - "bytes": "f8e3" - }, - { - "int": -2 + "v": { + "constructor": 2, + "fields": [ + { + "bytes": "" + }, + { + "int": 0 + }, + { + "bytes": "313b89" + }, + { + "bytes": "22225d" + } + ] + } + }, + { + "k": { + "bytes": "b657" }, - { - "constructor": 5, - "fields": [] + "v": { + "constructor": 2, + "fields": [ + { + "list": [ + { + "bytes": "" + }, + { + "int": 2 + } + ] + }, + { + "list": [] + } + ] } - ] - }, - "inlineDatumhash": "351fa5aee9196820b9c54f291d8abfae5c35825a67a98d2601b013ce04ec107a", - "referenceScript": null, - "value": { - "8f461954fe2f18fee1dca233f358907e643ff839ed1f995e4bf325e3": { - "ad33538fbc": 6523940312337733228 } - } + ] }, - "0602060501070002000707040304010305050603080201000100030305000300#74": { - "address": "addr1v8rpc3xz8ufmqgdfxdcm2503yjxt62sgzxrz20eymx7z4mg768qtr", - "datum": null, - "datumhash": "7fc6b7074bf9e74314ce49ac650bcae15478879f0d393c3f512e92eb7b25224f", - "inlineDatum": null, - "referenceScript": { - "script": { - "cborHex": "82050a", - "description": "", - "type": "SimpleScript" - }, - "scriptLanguage": "SimpleScriptLanguage" + "inlineDatumhash": "c02e04810872310819a8b3506cfc313865d6654d1baff32fe70885582b801b89", + "referenceScript": { + "script": { + "cborHex": "46450100002601", + "description": "", + "type": "PlutusScriptV2" }, - "value": { - "995c8f6a9eb871b3241dc1f7c046d2044b04a907924df46fbe122dd2": { - "73b10039e161dc9aaf89b9f5eca7e540ac0eedc5c61b8ea1e704bfab": 1360753262888429598 - }, - "lovelace": 1701134887524646057 + "scriptLanguage": "PlutusScriptLanguage PlutusScriptV2" + }, + "value": { + "12a6c21e1892c73c57d28c4bc03d58febb81047d64f4512276c51eaf": { + "053637960bd9712f8bc30dc27fdeaf40ee16f5f979ec9092f23e0dcf61070822": 1 } } }, - "version": 0 + "0607070305080407060208050705020802050408020403030404070803080406#60": { + "address": "2cWKMJemoBaiPUZv7dDh6LMREPQdrkWQ4wFWrbX8zBBkwxz2fbnXWZ6EooBYBwuRK5J7M", + "datum": null, + "datumhash": null, + "inlineDatum": null, + "referenceScript": { + "script": { + "cborHex": "820405", + "description": "", + "type": "SimpleScript" + }, + "scriptLanguage": "SimpleScriptLanguage" + }, + "value": { + "94b0ad4b84c8e5cba49d544ff7dabfeca916fe966b4cfe5240084b70": { + "38": 1 + }, + "lovelace": 846632259129145604 + } + } }, - "tag": "ConfirmedSnapshot" + "tag": "InitialSnapshot" }, - "headId": "07070807030108000604010501040004", + "headId": "04080103020603080808010600000003", "headParameters": { - "contestationPeriod": 43200, - "parties": [ - { - "vkey": "355259fd0d28f24a75ba691b1d412bcbf1ee3bdec4be55c915f539f95c49c306" - } - ] + "contestationPeriod": 604800, + "parties": [] }, - "tag": "ContestTx" + "tag": "ContestTx", + "version": 5 }, "postTxError": { "tag": "FailedToConstructCloseTx" @@ -8319,33 +8335,126 @@ "postChainTx": { "confirmedSnapshot": { "signatures": { - "multiSignature": [ - "2b06c7852e939b48fa8d075200f5351b7e2475145d42fde9f3f3072c743679bce4d4f09683f823496e1c4c7767ccf5c56a46ab1e7ebd5ff4ae1673cc833bfd09", - "11bfb411f922ce3ce67a1f36acdada00f9f092129a967109e583b4e2ceb6677db2037269bf620e83d36e9dafe093d45c81934e595309d81164ebdfd7ba3edb0b" - ] + "multiSignature": [] }, "snapshot": { "confirmedTransactions": [], - "headId": "00080004080208050806080700080603", - "snapshotNumber": 6, - "utxo": {}, + "headId": "01020205010405010808040504040206", + "snapshotNumber": 4, + "utxo": { + "0003080504020107020604000305020802060302060001040400060705060501#42": { + "address": "addr1y9c6uenfduq789ydf3ex5z8mgw2xyegac5fpqhmj844prlhhkgl6dqq2rj345g0yhr6u7eqvmdhsvwt4a6ucwxntw9qq8hfj5t", + "datum": null, + "datumhash": null, + "inlineDatum": null, + "referenceScript": null, + "value": { + "976c0e714368ad6f7e136ce6bdc1472339c6edd36841435c7f2926d5": { + "32": 8031223952519475805 + }, + "lovelace": 4666435879103891027 + } + }, + "0407010404040506010808050104010705050600050605010305020601000108#40": { + "address": "addr1v8ugcrn23vc3ud385da4rfgt3kgnw5ap0wmava3shtnde7clu49me", + "datum": null, + "inlineDatum": { + "int": -1 + }, + "inlineDatumhash": "ae85d245a3d00bfde01f59f3c4fe0b4bfae1cb37e9cf91929eadcea4985711de", + "referenceScript": { + "script": { + "cborHex": "8202848201858202818200581cb16b56f5ec064be6ac3cab6035efae86b366cc3dc4a0d571603d70e582050a82040982050c8200581c65fc709a5e019b8aba76f6977c1c8770e4b36fa76f434efc588747b78200581c58e1b65718531b42494610c506cef10ff031fa817a8ff75c0ab180e7820184830302848200581c76e607db2a31c9a2c32761d2431a186a550cc321f79cd8d6a82b29b88200581ce0a714319812c3f773ba04ec5d6b3ffcd5aad85006805b047b0825418200581c0d94e174732ef9aae73f395ab44507bfa983d65023c11a951f0c32e48200581ce0a714319812c3f773ba04ec5d6b3ffcd5aad85006805b047b082541830302838200581c76e607db2a31c9a2c32761d2431a186a550cc321f79cd8d6a82b29b88200581c3542acb3a64d80c29302260d62c3b87a742ad14abf855ebc6733081e8200581c3542acb3a64d80c29302260d62c3b87a742ad14abf855ebc6733081e8200581c65fc709a5e019b8aba76f6977c1c8770e4b36fa76f434efc588747b78202858200581c76e607db2a31c9a2c32761d2431a186a550cc321f79cd8d6a82b29b88200581c4acf2773917c7b547c576a7ff110d2ba5733c1f1ca9cdc659aea3a568200581cbd039f956f4b302f3ab6fc7c4bac3350a540f44af81a8492194dd2c28200581c76e607db2a31c9a2c32761d2431a186a550cc321f79cd8d6a82b29b88200581c4acf2773917c7b547c576a7ff110d2ba5733c1f1ca9cdc659aea3a56830300828202838200581c76e607db2a31c9a2c32761d2431a186a550cc321f79cd8d6a82b29b88200581c65fc709a5e019b8aba76f6977c1c8770e4b36fa76f434efc588747b78200581ca646474b8f5431261506b6c273d307c7569a4eb6c96b42dd4a29520a8202828200581cb16b56f5ec064be6ac3cab6035efae86b366cc3dc4a0d571603d70e58200581cb16b56f5ec064be6ac3cab6035efae86b366cc3dc4a0d571603d70e5", + "description": "", + "type": "SimpleScript" + }, + "scriptLanguage": "SimpleScriptLanguage" + }, + "value": { + "a9fa8ca0a96cebc0bba5c3a42f83b13c119a7041ad7e75178a36a0ce": { + "14ae43d02b": 1 + }, + "lovelace": 841105194231662014 + } + }, + "0502060300000305000200050005000207000706030107010100020405000804#63": { + "address": "addr1v8c3zwnxzs2de5rqvgfzs2hqnsvl4905alv3eljpu4u8faqjlsv20", + "datum": null, + "datumhash": null, + "inlineDatum": null, + "referenceScript": null, + "value": { + "571705918c1711e266996d5f121151e11772c566bb315c5c0676bead": { + "41f1d445": 1 + } + } + }, + "0503050606080404000308050604060508060102000208000505040200020006#41": { + "address": "addr_test1xp7h53pake24svrwl3ja0ay7zs7qgze70ja8yuayw0zr84gdp4ylhf5557ddlaxeuukpjvjtzt3jg6j5e49ve6gp0pas5xtmyf", + "datum": null, + "datumhash": "5e69509ff1634edc13fe777e2069b8b396910146b111e2321ccdf0f789004a14", + "inlineDatum": null, + "referenceScript": { + "script": { + "cborHex": "820410", + "description": "", + "type": "SimpleScript" + }, + "scriptLanguage": "SimpleScriptLanguage" + }, + "value": { + "2db8410d969b6ad6b6969703c77ebf6c44061aa51c5d6ceba46557e2": { + "9e2f96de866861213910d7f6": 1 + } + } + } + }, + "utxoToDecommit": { + "0403010307060705050602030502020605020502000008000202020804040707#63": { + "address": "addr1yyuz2hdfxl5ft77rxma36hc76elahf8heq0cz5dett5sfygmxe8ms9derlxmrxu70rnv66uqp0m7ca3urexpttyyg47q5f2lfa", + "datum": null, + "datumhash": null, + "inlineDatum": null, + "referenceScript": { + "script": { + "cborHex": "8303038482040f82018282040e830301848200581ca646474b8f5431261506b6c273d307c7569a4eb6c96b42dd4a29520a8200581c58e1b65718531b42494610c506cef10ff031fa817a8ff75c0ab180e78200581ca646474b8f5431261506b6c273d307c7569a4eb6c96b42dd4a29520a8200581c3542acb3a64d80c29302260d62c3b87a742ad14abf855ebc6733081e8201828200581cb16b56f5ec064be6ac3cab6035efae86b366cc3dc4a0d571603d70e58204048200581cb16b56f5ec064be6ac3cab6035efae86b366cc3dc4a0d571603d70e5", + "description": "", + "type": "SimpleScript" + }, + "scriptLanguage": "SimpleScriptLanguage" + }, + "value": { + "105a8f1bb56444cacc86378c95421aceeb326b0fb7743e493eb82fd5": { + "aee012223fa0ef116205d05badbbe005165f8c2543c50dc8": 6088809051394947451 + }, + "lovelace": 5452964025258867396 + } + } + }, "version": 0 }, "tag": "ConfirmedSnapshot" }, - "headId": "00060407020101030002020206020400", + "headId": "03080104040100020801070808010304", "headParameters": { - "contestationPeriod": 12818, + "contestationPeriod": 64749, "parties": [ { - "vkey": "b21d5658c34f1258526bd3c74f41e8198c44256917e79d4d808f49932b2d2d1f" + "vkey": "682cda78640ba4b4f7ad5f832ea56e46d0db16b5ddcecbb861f837335f1bad22" + }, + { + "vkey": "268a98e3a563a65ba62011bcfaff9afcf286257ba04cb9a2d14fd300d97debf2" }, { - "vkey": "b14e7fad6b294375c9c19d927dba1554bb1e427df0c4716a07115ffe24c1525a" + "vkey": "4401e936a8f61291e0c29c98e77cc7c03012f61a8430c3485fede07b3dc45305" + }, + { + "vkey": "f3ff0ecde74ed78f40e5f5c67730cc5f814eb64caf979741f435f09d5c1391f3" } ] }, - "tag": "ContestTx" + "tag": "ContestTx", + "version": 2 }, "postTxError": { "tag": "NotEnoughFuel" diff --git a/hydra-node/json-schemas/api.yaml b/hydra-node/json-schemas/api.yaml index 33f2de1ca73..e59e0e170ac 100644 --- a/hydra-node/json-schemas/api.yaml +++ b/hydra-node/json-schemas/api.yaml @@ -1601,6 +1601,7 @@ components: - headId - headParameters - confirmedSnapshot + - version description: | Contest a previously posted snapshot (from a Close or Contest transaction) with a newer snapshot. @@ -1614,6 +1615,9 @@ components: $ref: "api.yaml#/components/schemas/HeadParameters" confirmedSnapshot: $ref: "api.yaml#/components/schemas/ConfirmedSnapshot" + version: + $ref: "api.yaml#/components/schemas/SnapshotVersion" + - title: FanoutTx type: object additionalProperties: false