Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions hydra-cluster/test/Test/BlockfrostChainSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import Hydra.Options (
ChainConfig (..),
defaultBlockfrostOptions,
)
import Hydra.Tx.Accumulator qualified as Accumulator
import Hydra.Tx.BlueprintTx (CommitBlueprintTx (..))
import Hydra.Tx.Crypto (aggregate, sign)
import Hydra.Tx.HeadParameters (HeadParameters (..))
Expand Down Expand Up @@ -103,6 +104,7 @@ spec = around (onlyWithBlockfrostProjectFile . showLogsOnFailure "BlockfrostChai
aliceChain `observesInTime'` OnCollectComTx{headId}

let snapshotVersion = 0
let accumulator = Accumulator.buildFromUTxO someUTxO
let snapshot =
Snapshot
{ headId
Expand All @@ -112,6 +114,7 @@ spec = around (onlyWithBlockfrostProjectFile . showLogsOnFailure "BlockfrostChai
, utxoToCommit = Nothing
, utxoToDecommit = Nothing
, version = snapshotVersion
, accumulator
}

postTx $ CloseTx headId headParameters snapshotVersion (ConfirmedSnapshot{snapshot, signatures = aggregate [sign aliceSk snapshot]})
Expand Down
6 changes: 6 additions & 0 deletions hydra-cluster/test/Test/DirectChainSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ import Hydra.Cluster.Util (chainConfigFor, keysFor, modifyConfig, readConfigFile
import Hydra.Ledger.Cardano (Tx)
import Hydra.Logging (Tracer, nullTracer, showLogsOnFailure)
import Hydra.Options (CardanoChainConfig (..), ChainBackendOptions (..), ChainConfig (..), DirectOptions (..), toArgNetworkId)
import Hydra.Tx.Accumulator qualified as Accumulator
import Hydra.Tx.BlueprintTx (CommitBlueprintTx (..))
import Hydra.Tx.Crypto (aggregate, sign)
import Hydra.Tx.HeadId (HeadId, HeadSeed (..))
Expand Down Expand Up @@ -312,6 +313,7 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
aliceChain `observesInTime` OnCollectComTx{headId}
let v = 0
let snapshotVersion = 0
accumulator = Accumulator.buildFromUTxO someUTxO
let snapshot =
Snapshot
{ headId
Expand All @@ -321,6 +323,7 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
, utxoToCommit = Just someUTxOToCommit
, utxoToDecommit = Nothing
, version = snapshotVersion
, accumulator
}

postTx $ CloseTx headId headParameters snapshotVersion (ConfirmedSnapshot{snapshot, signatures = aggregate [sign aliceSk snapshot]})
Expand Down Expand Up @@ -459,6 +462,7 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
_ -> Nothing
let (inHead, toDecommit) = splitUTxO someUTxO
-- Alice contests with some snapshot U1 -> successful
let accumulator = Accumulator.buildFromUTxO inHead
let snapshot1 =
Snapshot
{ headId
Expand All @@ -468,6 +472,7 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
, utxoToCommit = Nothing
, utxoToDecommit = Just toDecommit
, version = 0
, accumulator
}
postTx $
ContestTx
Expand All @@ -492,6 +497,7 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
, utxoToCommit = Nothing
, utxoToDecommit = Just toDecommit
, version = 1
, accumulator
}
let contestAgain =
postTx $
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,7 @@
]
},
"snapshot": {
"accumulator": "a3582084515835003d028191841d54d567d5da2df181376e0d395a0c7e6e5e6ae089e682581c0b49ae4525d794eb55ee812e8139b39849970a1295e98556cb1176e7015820d4b363a442c482b128cdee62cf2410813501d2601373b8bedad209e67f793f9d82581ce6091b16a1a57da72bc4b39231ab626962768fac72f5f18696b56f4e015820e80d334a11effc8d9f129b14ffd9594703099a2a21724ea5eb3cdcb419e7eba482581c4c4a57aed99de24d5bc4d780784e5d3b443453819a71bffeeb38452201",
"confirmed": [],
"headId": "03080408040003000308080600010301",
"number": 6,
Expand Down Expand Up @@ -1717,6 +1718,7 @@
]
},
"snapshot": {
"accumulator": "a358201f0b7a86c619e46bec59aaa27ccdf7fc2d8ad19b7deda64d50b87c07aed65d0f82581c132e336aad09c6b8b309dc0bba056a0c489afc6fe7823a84104290470158203ff4c7ee614d9cbdc6a0ba193ac8c8b1eb4afb4fd43a12655b43215a18eaec4c82581c2b92ea98effd08fb4cf01c7f5a2e4f004263a7272845576079e76b7a015820d2bfbe0cc74bba79983008d4d0923990511a33493c11b54c45318992c902d7a582581c6e4cfa216f0e530811bebc27d7d983a33329d84d4f7b71b1b886aa9601",
"confirmed": [],
"headId": "06030508050400020102050002010306",
"number": 2,
Expand Down Expand Up @@ -2661,6 +2663,7 @@
]
},
"snapshot": {
"accumulator": "a358201803c9b56776fdc5f2d10b0d22440bd333dccd1636800f71ad1e66642b3bf68c82581c14bb453bd888853ad5a119c04f05c3ae9daabcca768c042e06507c3d01582054df1e4a7e7f85be9bcab6bed9b8aa1fc1bc6082af4043d361bfd334e7e1b58982581c30d2d259780dfcdd6a78b31a9d4886ff9b8dfa9deece4d000d19100b015820f5c81af839b34da8d099f85504db54ff9f7514a53db33c15476006bffb8c123682581cbb31d3e5728a33e864c199a54a18393991bd60217dc1a3de5f69d4f801",
"confirmed": [],
"headId": "00000100040400000107040607070305",
"number": 3,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2902,10 +2902,11 @@
"confirmedSnapshot": {
"signatures": {
"multiSignature": [
"5cb95ba0038502e3ed8bee612ccedb7acefc5d1b52b866e38a9f831152847ed0bff8bcc5cf2357cbaa3987f76e10e18036690289cde8c52b5be608f3e4f0c602"
"1f0c460085994c29d74e8c68d0826e7d5ef994e8047e69a97e9df188c126060b7228724aa89c88ab5bff13c875e96bff1f246e2a1169950821cd358f50185b0f"
]
},
"snapshot": {
"accumulator": "a3582043a805dbb86daf398b82eb7f996e3537e967a7e70bec1dba79c13307b7ef590a82581c318b54c2361673d5617391e33bfbe287b281234f79d6a258a9f3bb730158207a34c25496a8a857afd4e5e5fd8293176e53c4367be179a0e627750af447893e82581c22543e669942c4a7348c46ac4355e146510f558c09e437bf899165dc0158207e2236c8c06858fb11b08cff397cd83f06e7c7610329f1e229668e351c5b006082581c09a8dc990411be144b70af7cb9ebb0ff3934dd0810a2eaaec34ac67001",
"confirmed": [],
"headId": "06080501070708060306050606040100",
"number": 7,
Expand Down Expand Up @@ -5183,14 +5184,15 @@
"confirmedSnapshot": {
"signatures": {
"multiSignature": [
"a381b6316a73b0fd855e78b638538c19c3036e6a390a2f8b2c86a0327a1588aa5d9f0eaec130da3be30b826fa8f9ab6faa0d6418ba5d508256b4a83ec1e63d0e",
"292e4e82e3e7ab8fd165b0863b8e7edfcd3a86c33aac65f99f12c30511b06707875d68d41e02361a121ec06aef43575936de23e6c68234b3b050cbdae5494504",
"ce51f0e6214d4785024917157934e00e5dd753c1f99dc5c236786d7b4aec6ed23a9c5b171b98f854f45b0c3e5c2fa1e64646b168724c5fd0a2a5cea239642a0f",
"7da85f8608d0722eb450d72f1957508f8d4cc4aa14f09cb9665f225fa52aa9f6d5ebbd9c15d7fae667f1ef6e627a26db8fd59ae4483dc2db4e3eeb6e23967e01",
"aa81f4481de94bde5bd7cc336451418922e580aa2995cdbff50cf1cf69c7969edbad5b2e9bccdbf2750e9b118467e5b8b90b538de32c1ba8f32aec82fe412401"
"e127ed1af6205ea77d9dbdfe7e4b1288878c30344c04071c640c8c584b555cb41d5edc040dca61536d1466cc7a0c7e274311e1687ebee727cf3b7ed0cae0cd00",
"a76e95317152d42a783140a3764d78e0df5210e05999c9cced1e1f147208dc2ef9a396936f481240b45a716d73e0ef6c8a998461fd035bcff77c52ccfdbc430c",
"a679dcc81d9665de2a27e67ce10e97e2b90997735cfab3774251dee15b6162dae58733f474c6938e277f5821cab0c9baf54d48169cf8400fa40317080dcd1908",
"a7bf327a865e76cbe22551ac9fdf2c8e38891604c270f9f60e38bf61e6433e7d3fcf5f99f2c20b5314ceec5a6cf0eb32549122be7fb454b11f52a329b9f6ca08",
"462760cebfec3b22d8131a1306124c962fd84008dae02990d82d680c5418353df302d0c3d46d9d8b86da68788d7f316f1efc1f26cebe87fe0efa405d43c56a0e"
]
},
"snapshot": {
"accumulator": "a358205b65dee2b2f375db34deefe263c9da1a372f1b67f699c271a278bad90b32573382581c3098e12058f8cbe9e2826b71b96e070bfd172cbb7983d812146aaea80158205c4f86c25b29bb98a65b602ec2cfb05189895658ac3f0d973149fdba3989565882581cf4f068620c180bb62470dbfc46ee9f2690d7867d1fa9a03cf9215385015820e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b85582581c4985010f294802e79bc74861e757dfc8302c944e807306db896e2c5a01",
"confirmed": [],
"headId": "03020102080007030600080805010207",
"number": 2,
Expand Down

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion hydra-node/golden/ServerOutput/EventLogRotated.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@
"confirmedSnapshot": {
"signatures": {
"multiSignature": [
"ed3691bc9338a8193d009c4739b5ba1460d182f78bdf25dbc5058580cebdefe9be5c7e4f9ced0155a23d22cfeac52b8719e69ecbe5de096345702fae9bb8b20c"
"1667488656608aafb523467fbe6ac17d5b1381eb12a5e667c599e8255925537f8e46f00f30e7f278e997950b4178529df21540e13e38ef240c8db3cf73d7050e"
]
},
"snapshot": {
"accumulator": "a358203549689c9d5ed49e7a277dca4b109da4f84378e6a60db35738b83f25b763be5282581ce86b83bd2286f8328a0c7fd6d71287c60c9a3088e32bd6b3cd1650d6015820965117108658f1486f49e510eecd512e1a903f7da456db0109aeed5b0d5020ad82581c8f5d7a6d1bd99b848ad9d333b77e2001f37dc57870b617cc36e6ed12015820b080f6360d7112198d1361587062802c457bdadadd5111a5d90107b59c3110d882581c5deb3285c35486118c08665545e3be799704176a98799f006094b70c01",
"confirmed": [],
"headId": "01000101010000010100000001000101",
"number": 1,
Expand Down
1 change: 1 addition & 0 deletions hydra-node/golden/ServerOutput/SnapshotConfirmed.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"multiSignature": []
},
"snapshot": {
"accumulator": "a25820c876983c6d04a1a1909e20c7a73110bebd4c3dd7cfef08580f91854a11eea27282581cf5d85ca89a0826399f10e4aac902dbfa42afac1f3fdaad9ac9b1a732015820e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b85582581c4985010f294802e79bc74861e757dfc8302c944e807306db896e2c5a02",
"confirmed": [
{
"cborHex": "84ae00d90102800dd90102818258205d48378cc3a6fe0d86d32023d20e9b667b74d050ce141e4c6d44f106b7b88bb30112d901028182582019c15403dd21cf3842105e9de88d9df9af8098f436922cdf23cf3c2b42354bcd010181a400583920a1c65b3bf72a60fb764a3bac8224fc56858b7ba499c6d5874af2f2a216422d4cff91fe1b05397c6ebb62118a62606abcf37200345979ca2a01821b0008dbb291adae78a1581cd7d16f8d3d187ae3cb4074daafe6ab3d25e138246fcee6d92f202a12a144ef51389c010282005820a3808ed28a37d4ebf3652fa2a618e1f96f9e0aae443c6668c3983e05122f2a9b03d818458200820401021a000ad91b030105a1581df012101a39cdea726b41c3ffe547d3b0e9b02fd25499319dad1731633d1a0005d787080109a1581c467f58932b54910584a0e8ea25a225e06a14530b2e96e938c53a3f22a141321b1f0bcef28a3cc4a907582018312cd3dea6de1e8fd269ce8ebb986a596d942ef2796e2fde217024652bbb030f0013a18204581cfe231bcd1ef861066a0ba748e801d8f7d1879bc6659d60eb6e145780a18258201ba0a290aaa93f9160668c1924b89fb84fc07ea5d9c924bb61c85e898d2bb24b00820182783768747470733a2f2f32465a6c3834646c736865787641436c54506d71554f375135547179676c785a39494c436c444f4c312d682e636f6d58200bb42ec5bf71edc7f1b6d1c9169a6fa795e3f982b25c81f2d03c814d3aa59e16151a00047820161a00041d23a200d9010281825820832ddce5acd8e79a33e1188783de0cb6d2c494bd37562fc9bee11c3314f2ae075840f670b1b20fe618175281e323af3d85824ba4d809dbb405859f5cabbe657c9fd2873dd9aee4947bd25ee2f7ab8306a9243593db807c160a642a791d669ec26e7902d90102818458201c87a174e5857892ca222ce269cc8cb3e74243853f2ac2aa6e610abf45ffc127584086a6b101955d3ed6da8bef2e771a9f69a1314ab2f5a6193377c019097a054871b4f0150dc8be5b76a40bb0b1ab8eeaab6ed8ec5464bdfff4b2031e11ed8e133c4040f5d90103a10181820181820280",
Expand Down
1 change: 1 addition & 0 deletions hydra-node/golden/StateChanged/Checkpoint.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"multiSignature": []
},
"snapshot": {
"accumulator": "a358202a4e95de1d1ecb0f37b0dc29a5b89d219f825d200440a85f697f63290c27a98c82581c0f999a888e545ba93f8c786f4c1d3958d766f9a4b87d54dd4593daad015820c58e76e90fd82e8fba12e3dfa21c0758d714a3c38398113ef13671f0684bba9882581cf14eb5a48b5e4c193cabe1968eebc34359fe25c841a81472584d7131015820cfc8b15b762f30ba4ead0a622fa4de7163b45b1f00f7a4316cf8a037a6f4e23982581c084ea703b078cc4969ddae5d062f4f59d5235fca444cb370ddef48a401",
"confirmed": [],
"headId": "00010101010100010001010001000101",
"number": 2,
Expand Down
1 change: 1 addition & 0 deletions hydra-node/golden/StateChanged/PartySignedSnapshot.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
},
"signature": "93ccf23947af949af75057b04327c6214c1e729d4d29a1215f65774cf07d7b93d962ef626e5a0e2c3e7f8bbf1b3ffcb679389857b2876352be68d97f5f188a05",
"snapshot": {
"accumulator": "a358207d130a14b1c3dbe2a3b23ad1e0c236f4159c8fcf5d96b38ed969783c8e9b6f5d82581cc1abab5e39097ccc376f1799d3adaeeab4fdc8d97984b7c168e3d6f2015820e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b85582581c4985010f294802e79bc74861e757dfc8302c944e807306db896e2c5a015820ff1d57133266b064b5c0d05a173e85b798aff1a38893d824def61b30970b745782581c2429e09d0dd86ca2d73966545c0e901e3ae4fc11fce0b11b1eb630cc01",
"confirmed": [
{
"cborHex": "84af00d90102818258208e4e6204c37ee053257f95f68407395e86a855e20131c06145c9080ac8ed2f270012d90102818258201cb935b6c4e68013b70afbc3d82f9add5472cada0fc9cc839b59c8831835ac0900018010a400585782d818584d83581ca9a5276a03a7bede26c4986b6d9a5172b51ee842a4780db274626d2da201582258206c6f6e616f717474766d6d6e6c6a756874697669696f6b767a6d61626b78746802451a0ff7b078021adcff009101821b4ccc0f5e4dfb74d4a1581c106395182bb236642c157aa055cac946709bac865cc2f5e6b1187680a15818076d2121aa245e96ad9aa45dd7b6a124709dd08d364c8be21b23959a263f92d79e028201d818587dd87a9f9f809f0041dcffa4224323cbde2044e65c69a02002418b41639f0142f3b620ff02ff4103a49f42949b42650aff4024d8799f02ffa30042aa01240040009f447a7b1e6c0244fbce389843b70f2840ff9f0505ffa42404040040050440a2d87e9f417a244021ffa043ddf094d8799f4042cc0f20447dd047d3ffff03d818458200820280111a0006858e021a00087ee3030104d901028184108200581c51f46c4976d38e61a59597f8427bb072f2c47a5b541c1b1538d0734f1a000df78682783168747470733a2f2f646a79367a6a3941686b745267446972666768466f6a6636656344566d6c562d59554d58632e636f6d5820e194cf9b862518ba6787c64cb0c1e05678cef49c8d9f859b141765707c66b6f409a1581cc266b6c604fb3ff4804572f46789a9294fbf937ae63872cae7d9f8cda1582038cc5443fc7cb5bba4189350f76ea5af620fdd5c49362e9138d7b5445de6fdab1b29c9f2ab118e78540b582039515fab92cba992e33b1e89b159debd4e95c78a3eac721f167eec13edca01d207582021da6807edece5f5885cea79ede78f57c39764279be37e4943ebccb9bb1475bf0f0014d9010281841a00076e02581df1c2c70c55ec86db9d3b2fce97c5209ac0bf4d5cfa48d4c699cc2d7adf830582582054eb27f3fb55a850807ec3dfabfc67b0b7beb89a3dce2b72071bb33b3343679f0082826f68747470733a2f2f35622d2e636f6d58204134f8663a093c10fe1cbaea2d23066ebfbf93ad775ba04dc1bbc612870feb12f682782e68747470733a2f2f572d332e327857536c5142764137765030476847416e4167566e63576a73667241412e636f6d582071c00088ec440874a48d44f38d8015b89b2318968359ab9c6d76d3a1eeebf8f0151a00015d2016193051a201d90102818200581c4404bee063242102a35f331ca5f31f5cce670fd9d2bc535d384a49b204d9010281d87e9f42e73e04a2a09f41c7422219234384e8adff9f4435a7427924030521ff02a1a22342b54e41ef0242be5404fff5d90103a100a10040",
Expand Down
1 change: 1 addition & 0 deletions hydra-node/golden/StateChanged/SnapshotConfirmed.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"multiSignature": []
},
"snapshot": {
"accumulator": "a15820e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b85582581c4985010f294802e79bc74861e757dfc8302c944e807306db896e2c5a03",
"confirmed": [],
"headId": "00010000000001010001000101010101",
"number": 0,
Expand Down
Loading
Loading