Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keep ServerOutput type at the api boundary #1849

Closed
wants to merge 9 commits into from
Closed

Keep ServerOutput type at the api boundary #1849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a0b296c
Remap ServerOutput to StateChanged
v0d1ch Feb 6, 2025
edc1b10
Golden files shuffling
v0d1ch Feb 11, 2025
64ec6fa
Tackle logs and api schema changes, some field renaming
v0d1ch Feb 11, 2025
ff9075a
Use both pendingDeposit and pendingDeposits map in CommitRecorded
v0d1ch Feb 12, 2025
d8f8b61
Keep ServerOutput type
v0d1ch Feb 12, 2025
45b60e9
Keep same golden files
v0d1ch Feb 12, 2025
0735022
Keep old constructor names for StateChanged and only add new ones
v0d1ch Feb 12, 2025
7b7f3df
Rename StateEvent field to stateChanged
v0d1ch Feb 13, 2025
715f689
Use RecordWildCards to simplify ServerOutput field update
v0d1ch Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
855 changes: 855 additions & 0 deletions hydra-node/golden/StateChanged/CommandFailed.json
View file
Open in desktop

Large diffs are not rendered by default.

417 changes: 417 additions & 0 deletions hydra-node/golden/StateChanged/CommitApproved.json
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions hydra-node/golden/StateChanged/CommitFinalized.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"samples": [
{
"depositTxId": "4e03bf2634ed40f0a6436cd48d71402be0c4c1a4b4edaf848010cb394cdbb943",
"newVersion": 4,
"depositTxId": "9161163cd4680fd0ca3e6e0716b5329ba862547ee2069a881f97dec6623d315f",
"headId": "88840f0ede47616347670d2e1e160112",
"newVersion": 5,
"tag": "CommitFinalized"
}
],
Expand Down
2,450 changes: 2,450 additions & 0 deletions hydra-node/golden/StateChanged/CommitIgnored.json
View file
Open in desktop

Large diffs are not rendered by default.

21,848 changes: 10,461 additions & 11,387 deletions hydra-node/golden/StateChanged/CommitRecorded.json
View file
Open in desktop

Large diffs are not rendered by default.

1,180 changes: 508 additions & 672 deletions hydra-node/golden/StateChanged/CommitRecovered.json
View file
Open in desktop

Large diffs are not rendered by default.

1,986 changes: 1,986 additions & 0 deletions hydra-node/golden/StateChanged/Committed.json
View file
Open in desktop

Large diffs are not rendered by default.

982 changes: 612 additions & 370 deletions hydra-node/golden/StateChanged/CommittedUTxO.json
View file
Open in desktop

Large diffs are not rendered by default.

91 changes: 91 additions & 0 deletions hydra-node/golden/StateChanged/DecommitApproved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
{
"samples": [
{
"decommitTxId": "251201bcc2a3f7a34f81b614fc8b7e660d757bf157aeebcdfacde62bfb7a986a",
"headId": "08e8e9aa3852e6fb7cba86c2935a2b3d",
"tag": "DecommitApproved",
"utxoToDecommit": {
"5b75e8006fa9cd61cf9790fa7eda3dda57660e752578736b1abe9ce47dc799e2#77": {
"address": "addr_test1vrgetvreakjeddxga53fauemf4ltnurku0ntk68nwxp5utg74ezzg",
"datum": null,
"datumhash": "9ff9d430f02ec2bb195cafb7faa96b6fff2832c924e0da587a04d23fc5afcb77",
"inlineDatum": null,
"inlineDatumRaw": null,
"referenceScript": {
"script": {
"cborHex": "484701000022220011",
"description": "",
"type": "PlutusScriptV1"
},
"scriptLanguage": "PlutusScriptLanguage PlutusScriptV1"
},
"value": {
"d184216c424bc16f9fb1e9cb29c3fe1fd08779dafef1853cbd943549": {
"f400a88de848d18a7fd8f6": 2
},
"lovelace": 1
}
},
"5ff14c139078f70bf3e40330906d087a2c0c7b0cbe13cbed456f35d5d104e602#43": {
"address": "addr1q8cevh2wd2a94ntla62up7s8mh35hqfckzwm6y44dlafeecmhstt5kayt5u493jj5u537ehrtj8mjpjan40wssx6rv6ss3ty9s",
"datum": null,
"datumhash": "dca010ce0883de20bd1486522e7912049178eba5d56b330fa3a829d6d3e8364a",
"inlineDatum": null,
"inlineDatumRaw": null,
"referenceScript": null,
"value": {
"f6794913473a2d02ce40017ea9e1f045f0744099b5081f094017719d": {
"6368e8": 3
},
"lovelace": 8633174846636841551
}
},
"90d0f76fba96d6302ad635905ad210643f83c6a00b6791542db38542834a6a1a#67": {
"address": "addr_test1xqte333zvu08wvhxt77rs65hh3xugkuu9r7al4ews4sxnat8xh0tahaemvcfsk8n2me27y2fpq20w9f7cadyawtnl36qh6gn89",
"datum": null,
"datumhash": "88b74e295169c748df121482b93a6c5e67d9d629dae69e02eeef88dd3b1f5531",
"inlineDatum": null,
"inlineDatumRaw": null,
"referenceScript": {
"script": {
"cborHex": "83030182830302828201818200581cd7bcc8d275393bcc521a6aa90b58777c971a1efd03db3cea06b67f80830300838200581c2c304a215ab93793f1ca25eed65fac6c2a6509b6f89ffe655c3369a38200581c1c61d5a412a6b8ed02c34fd1626fb3901b81bab6c49cb828dc7626698200581c7d659f97ab319d87fbb6972ac3cfc8cd5c6a854205dcc73b3e80a605820182830301828200581c317f81005bfdd0142f5ba78b3baa2be278b384ef018d2b45bde16c058200581cbb68c166a954cd3cb0d70d725abb24795acdb52d5751f43fd2a3a4c3830300848200581c43508d8a9470edbc9384385dc3073368e0f64e1e5484253d4ca9d6008200581c84388e91cb6f90e13297d298119e55c2a0fddd9b16e487cf142e642e8200581c195fd575c162de5d1d62e27c158bce04c814129d860408a38a78062e8200581c3bb410c1d8ca6a7986ded5065b26951ab46c8cdeee024e264151cb27",
"description": "",
"type": "SimpleScript"
},
"scriptLanguage": "SimpleScriptLanguage"
},
"value": {
"380a83323a05e93d5de258aa53e4da9a4e3e12fa944d791841061c9d": {
"2d8789ff524bf4837b6055bf10962acfbc0279edcd7df840a34cf8f57b3e": 213062347129370880
}
}
},
"a5dcaac0da52d3bb51f39df1c618e95123cf44cbf99b3bccd4a3c9c1a60e4e17#64": {
"address": "2RhQhCGqYPDnpFi6XuwgSxAQwVcgQgs3ohQoy77cEYEcP53Aab9jK9uw5kg46cGk142vqBejrdrq7L9bVCsSXvzVE2ruC5U394DB1u48RxwBf6",
"datum": null,
"datumhash": null,
"inlineDatum": null,
"inlineDatumRaw": null,
"referenceScript": {
"script": {
"cborHex": "82041a00bc7abd",
"description": "",
"type": "SimpleScript"
},
"scriptLanguage": "SimpleScriptLanguage"
},
"value": {
"2e12c5e499e0521b13837391beed1248a2e36117370662ee75918b56": {
"be7e": 1
},
"86a388a023a7d2fc5ddc5715d1741ba2e87fbb149be5cf3f92d9b481": {
"33": 1524754030665878465
},
"lovelace": 5521479939099670023
}
}
}
}
],
"seed": 1305023446
}
4 changes: 3 additions & 1 deletion hydra-node/golden/StateChanged/DecommitFinalized.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"samples": [
{
"newVersion": 24,
"decommitTxId": "20c2c7240ebc512b05abbf7f915993d19a64ecc95397cd2ae5d7d4e58d47ae54",
"headId": "1656832656ae5589a4cd69a9423f1ac8",
"newVersion": 2,
"tag": "DecommitFinalized"
}
],
Expand Down
19 changes: 19 additions & 0 deletions hydra-node/golden/StateChanged/DecommitInvalid.json
View file
Open in desktop

Large diffs are not rendered by default.

1,838 changes: 1,838 additions & 0 deletions hydra-node/golden/StateChanged/DecommitRequested.json
View file
Open in desktop

Large diffs are not rendered by default.

185 changes: 185 additions & 0 deletions hydra-node/golden/StateChanged/GetUTxOResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
{
"samples": [
{
"headId": "f1bad3f0a97aed1c663fc16c0bdc008d",
"tag": "GetUTxOResponse",
"utxo": {
"1621d9309133dfea7f45b8a4e1e1f78923fd161a68da0f4476e4bcc51856ef3b#50": {
"address": "addr1zyr3ed2kgrkgw6ldadv8gyuu6d8hkfn5ukmvj5faq7xex2lpfj09j3mwflc96nyl4w38d8ywf6x7x5lvf3s40fkfc88spmwnn8",
"datum": null,
"datumhash": null,
"inlineDatum": null,
"inlineDatumRaw": null,
"referenceScript": {
"script": {
"cborHex": "8202828200581c1685b42564f4008607002fa64187bf65318c280eef20b12682553de3820282830302828200581cabe985d741567e546c9733dc67aeb3dd8d25408c0bf076f88efb856c8200581c332d543ed39007d8f0e471d4574dad26fa3bab01d96369c0f0c13a40830300818200581c087a06604a44841f63257f1a8895fb59811128343ff287eb0056ac3f",
"description": "",
"type": "SimpleScript"
},
"scriptLanguage": "SimpleScriptLanguage"
},
"value": {
"71d9ef9c68abdaebfbf2e1e5384f53b23013b87e29d7d15155c1fe9d": {
"c6aab516e4a0": 2
},
"ed8900e7a7b6ef74ff8a1ba49d21eec178648ee50758529fe533470c": {
"bd17d7aede9346d5e05b28ee45796b026085": 4720908415332003322
},
"lovelace": 2
}
},
"1af7e842fec23e5b2c48491a2b8a1c5cb6a22547e1c0a7ddbb4c40283667a659#50": {
"address": "addr1qxkdcgk3cmnelxyh603gs7d7nqgx0zdppq9psa9dc00ty0jhd0k0qkxgupmjtph2eeh8ythfusdna2m7auu708rkrkdq09txwj",
"datum": null,
"datumhash": "925ca588d44f5e7e56c0cee9113577a47bacb57c77dc03e0a08963fdb41303a9",
"inlineDatum": null,
"inlineDatumRaw": null,
"referenceScript": {
"script": {
"cborHex": "8200581c8c95468d4af6323d15bad76bc76149a329345ceed7a22f512a229b1f",
"description": "",
"type": "SimpleScript"
},
"scriptLanguage": "SimpleScriptLanguage"
},
"value": {
"4d50a11e297e7783383bf06dd6e4e481230323bd96cd8b8d9ee3888d": {
"34": 3146285839724365364
},
"bf46de6d595e3b295c6f7b0ce380cfe8df86c6466cbbb7c32aa6adea": {
"8a0f3175ae7dfd99ff36e7": 4064529708558460823
},
"lovelace": 2651258589199375346
}
},
"7ce5f94edbd5a51436c10456b4b52fe0aeee873360071221f60ed90ae063a602#57": {
"address": "EqGAuA8vHnP1gLCwEWxAiMe1GFAmU4RZ7bFEWZz9jPZFoRbjJTrGEKPH8ukYB5RNCUYuNejyhPo9RL69JtSS2HjazLDTiCC8rrYJb8RkiLupRkrtU1kM1Y1",
"datum": null,
"datumhash": "c5a0f8d4544270f5f9ccf262e41e921c3c6567e179d0d628870a67361d4bbc25",
"inlineDatum": null,
"inlineDatumRaw": null,
"referenceScript": {
"script": {
"cborHex": "484701000022220011",
"description": "",
"type": "PlutusScriptV3"
},
"scriptLanguage": "PlutusScriptLanguage PlutusScriptV3"
},
"value": {
"a29713d16f4b7e4fe8d686ff7bd461034cb896cbb9897613d0522063": {
"38e3a7322c1389b637e87238910d2dcb758754fbd3cf37603bc46b4e": 7009558119246580608
},
"lovelace": 2
}
},
"8421aac6897a5d10f905712e7eaa232ffc6a2cd906470df23ceaf0cdd9a384e4#20": {
"address": "addr_test1qqn6u9ylwrj42jy5vkvfhm0hvk6ujdj8pff87ms4y6g0h745vkq4tgkhr8635gvrjxnk9ky2ltpuepgj7m3v4ynvn5qqa6vzjq",
"datum": null,
"datumhash": "fef55c1bc5c54008f15faebcb0fcc628d2ac5a759a787f06a3c4d7dd696fe564",
"inlineDatum": null,
"inlineDatumRaw": null,
"referenceScript": null,
"value": {
"b0c53e2bf180858da4b64eb5598c5615bba7d723d2b604a83b7f9165": {
"d82af141343be9": 2721759453219417470
},
"c9a6d36e2f516d9663631e1e0907dd0b9cf647630348e184b527798e": {
"0ab1eb0d": 2,
"48d210a56a1d822743e19fc0652090d0bf9249031faf7e1e064030": 4356114653584372390
},
"lovelace": 1001339314984653330
}
},
"8cba1902faff8b81e3d52352a13dca75bd80480da822c09831be0548054c9bc4#21": {
"address": "addr_test1qpu6vkgxf2t7qf8rfwuz5tlgceaqa9magrudk74jmv63dh2ty7v2pjqg88fgkn8cky0rnyxwchd367rqx8lwf9zqzysqrxfrlf",
"datum": null,
"datumhash": null,
"inlineDatum": null,
"inlineDatumRaw": null,
"referenceScript": null,
"value": {
"105a8f1bb56444cacc86378c95421aceeb326b0fb7743e493eb82fd5": {
"16bfe7b78fdf7901": 5342805929955502780,
"38": 328300256120159662
},
"898d4ba3e3fba10327a395cc113c4508c7dddde6eeaa4999ff85b5d3": {
"35": 7872149229578297010
},
"lovelace": 6668419429976474172
}
},
"8fc195c89093237a7bae491d59c9fe8ccf6dcd2d01d3b951ef1c4763cb9f0c0e#67": {
"address": "addr1qyhvrlckccs89rndz0xnz2qwrsfk82twlg9spr3dgv9rpjdlrc2hv7t6cldv8pf0g7zkazfg0gwyfx2w38k4p7lrfcjszxtxx4",
"datum": null,
"inlineDatum": {
"bytes": "7a6f"
},
"inlineDatumRaw": "427a6f",
"inlineDatumhash": "692f65d6232010faec5ea07e7a169db185136065a48fc06c0fd56038f8c1684b",
"referenceScript": {
"script": {
"cborHex": "8202848201818201848200581cdad34734aebd9a256f570a3527d73162aaf1b8a77ea7767d6b3c21e28200581ca68fa812bdf9a5468f986ac56eade4fd1d73f954bdaf9faf04bf30ca8200581cf670f78ee9aa614af81ca79200d0409decb81fdee67c30ff5f2ef7f68200581c901d33b8c29935c439907d880f64590b2f0e7c8fb5f2bf47177e0500820281830302838200581c5caf193bdd6e36da83f98d046435a6184332297ba9b5318369a1b2208200581c91468ce7d9db0ca3ce33cdab43865f50dc0d3ea04ea7e107b86ae9e88200581c655db7d0430148dac3ca19a07bddcf69cd15b0ca8af373819bf83762830302828200581cfe92885a7ef5827b8c534d32d9b065d714daf86701130b6b669890098200581c6aefba2d2cdec59f063a99dd228a73abee813f3a44370263d570c16f820284830300818200581c930e44fea133bcbe3a3f435931d765a0563926587432a97e1d81cc2a8201838200581ca3eeddf5a378ed4ec1f03312e362fc70243a114f4a282bd64a8fb17e8200581c7a43d90af4b7fcde2c8be0f51e867e790f28d129f163c2194dc03d2e8200581c6338ce8a6a179acf4f9359028ae1eaa583a28b977a83a4b6a36048cd830302848200581cbbdb38531ba6904a135ad6744ddc021a6935ca0cb6e31d09ab89b9048200581cecb9b8ec94054ff65be6204dc79f80e672589b6ea2b2679d0587c7508200581c819e0c1e9854b959996d6c3eceb961934f8ba4df5336edf3ac06fdca8200581c124af04871003ad24b99107839d777b16c04d1d6f4fa978d5ef507908201838200581c916400b6db46b80c6f14b8d79592d930f2fe67c13f3f56954ab3a1198200581c04559f2d48d4d7fc8df20bd6617ac4a91c7f60b5cffe598a75d8d9c28200581cce5601ae57e89ab8954914a8a96d7ffe6818bb931caf19ecfc73cb79",
"description": "",
"type": "SimpleScript"
},
"scriptLanguage": "SimpleScriptLanguage"
},
"value": {
"2d725128406dc832eb74c4709aca0512499b3c7b17e00d7cb2e6d1b1": {
"0f745c5eb8ee7768f1ccbfef9f164c70fd66d0efb9aa8472d14843": 1
},
"2e12c5e499e0521b13837391beed1248a2e36117370662ee75918b56": {
"fff1c292ae6fb06a298c765dd67a3b7d8fbdf334e089e6e7bf91": 2
},
"lovelace": 3848300240801964655
}
},
"bf3873e5baac18c637e2d2a1108a5163f89f22d8c5b9cc3bef485b16e3f81b8e#76": {
"address": "addr1qys9amyspjl4a0xptyjd4tq3pplanpgnh6yug2rkzgmen7aejk2ss47ca9emyay3ycs7drzagcq372n0rzcztn5x9k0qgeqc4m",
"datum": null,
"inlineDatum": {
"int": -5
},
"inlineDatumRaw": "24",
"inlineDatumhash": "f63498b4ae65be466e4a71878971b9c524458996450b0ff8262cddf3f0d99229",
"referenceScript": {
"script": {
"cborHex": "820183830301828201828200581ce8a76e6acf78faff385a561b867d021427525759b74efaa05ecf5eed8200581cfe7e6111719ed38a3f682432f7181f7c0a086d13581c954d52a4eacb830300808202848200581cdce5b979ae9904767f883b9c753296190d8593e3432211653ff83b6b8201828200581c6f69dbe9bc71bad963fe6e4a24d6096cec8b55e0b4e879a175fbb9078200581ce3794e503a95af0a8f3d9d1b86caea251fadb66a3121e2515bf31f178201818200581c5f5da59c9776224b3e50b2d6a6cc086cd043f405a4f1f4427cd0d46a8202818200581c29f522ae836fa4fd695709bda777ac17c0d41dc84ced900e10a45733820180",
"description": "",
"type": "SimpleScript"
},
"scriptLanguage": "SimpleScriptLanguage"
},
"value": {
"245d5a7a06fe18358242e81281cd5ba9e6abe4efc54e7b659f25abae": {
"3a0bcc9bab3ca94a4e": 7085781057183396202
},
"b0c53e2bf180858da4b64eb5598c5615bba7d723d2b604a83b7f9165": {
"17eca0746d67b719ca7dd6a5d99d7de54a43a72849": 2
},
"lovelace": 6053993466545866348
}
},
"e17f72510be96b5484b9b10c82fe62685524b3c6c2dc6a9c839ea5ffbd8167ab#13": {
"address": "addr_test1yr2sr2jf08skwlyj6zqkytl54ukre9cmxmqgcvjgtwawd4ee7w2sggdg5qztgdr2em9t2j3rp6nsxf73ayvtsw6aafmsy287kt",
"datum": null,
"datumhash": null,
"inlineDatum": null,
"inlineDatumRaw": null,
"referenceScript": null,
"value": {
"2d725128406dc832eb74c4709aca0512499b3c7b17e00d7cb2e6d1b1": {
"62363bea8925b84a4958b38dbedc99b0b3e33339732b5bdc49a4ee": 3
},
"6b827b125c0da750e3079718f61fbbe450bcfcfb6b4aed94b78bbb04": {
"e7dfcdeb00a588ad268632b6f37439c7784d8df6dbdd60cd": 2429756689394068970
},
"lovelace": 1
}
}
}
}
],
"seed": 594399146
}
Loading
Loading