Merge pull request #29 from t-bast/musig2-multi-hop-locks

Update multi-hop-locks to Musig2

Author: jonasnick

md/images/multi-hop-locks.png

@@ -22,21 +22,21 @@ participant Dave
 
 == Update ==
 
-Alice->Bob  : add 2-of-2 MuSig(A,B) output with timelocked refund to A,\ncreate txB spending this to B, nonce(A,txB)
-Bob->Alice  : nonce(B,txB), psig(B,txB,(z+y0)*G)
+Alice->Bob  : add 2-of-2 MuSig(A,B) output with timelocked refund to A,\ncreate txB spending this to B
+Bob->Alice  : psig(B,txB,(z+y0)*G)
 Alice->Bob  : psig(A,txB,(z+y0)*G)
-Bob->Carol  : add 2-of-2 MuSig(B,C) output with timelocked refund to B,\ncreate txC spending this to C, nonce(B,txC)
-Carol->Bob  : nonce(C,txC), psig(C,txC,(z+y0+y1)*G)
+Bob->Carol  : add 2-of-2 MuSig(B,C) output with timelocked refund to B,\ncreate txC spending this to C
+Carol->Bob  : psig(C,txC,(z+y0+y1)*G)
 Bob->Carol  : psig(B,txC,(z+y0+y1)*G)
-Carol->Dave : add 2-of-2 MuSig(C,D) output with timelocked refund to C,\ncreate txD spending this to D, nonce(C,txD)
-Dave->Carol : nonce(D,txD), psig(D,txD,(z+y0+y1+y2)*G)
+Carol->Dave : add 2-of-2 MuSig(C,D) output with timelocked refund to C,\ncreate txD spending this to D
+Dave->Carol : psig(D,txD,(z+y0+y1+y2)*G)
 Carol->Dave : psig(C,txD,(z+y0+y1+y2)*G)
 
 == Settlement ==
 
-Dave->Dave   : create adaptor_sig(D,txD,(z+y0+y1+y2)*G),\nMuSig combine with psig(C,txD,(z+y0+y1+y2)*G),\nbroadcast txD with combined sig
-Carol->Carol : compute z+y0+y1 = adaptor_sig(D,txD,(z+y0+y1+y2)*G) - psig(D,txD,(z+y0+y1+y2)*G) - y2\nto create adaptor_sig(C,txC,(z+y0+y1)*G),\nMuSig combine with psig(B,txC,(z+y0+y1)*G),\nbroadcast txC with combined sig
-Bob->Bob     : compute z+y0 = adaptor_sig(C,txC,(z+y0+y1)*G) - psig(C,txC,(z+y0+y1)*G) - y1\nto create adaptor_sig(B,txB,(z+y0)*G),\nMuSig combine with psig(A,txB,(z+y0)*G),\nbroadcast txB with combined sig
-Alice->Alice : compute z = adaptor_sig(B,txB,(z+y0)*G) - psig(B,txB,(z+y0)*G) - y0
+Dave->Dave   : Create psig(D,txD,(z+y0+y1+y2)*G),\nsum with psig(C,txD,(z+y0+y1+y2)*G) and z+y0+y1+y2\nto create complete sig of txD and broadcast.
+Carol->Carol : Compute z+y0+y1 =\n    sig(D,txD,(z+y0+y1+y2)*G)\n    - psig(D,txD,(z+y0+y1+y2)*G)\n    - psig(C,txD,(z+y0+y1+y2)*G) \n    - y2,\nsum with psig(C,txC,(z+y0+y1)*G) and psig(B,txC,(z+y0+y1)*G)\nto create complete sig of txC and broadcast.
+Bob->Bob     : Compute z+y0 =\n    sig(C,txC,(z+y0+y1)*G)\n    - psig(C,txC,(z+y0+y1)*G)\n    - psig(B,txC,(z+y0+y1)*G)\n    - y1,\nsum with psig(B,txB,(z+y0)*G) and psig(A,txB,(z+y0)*G)\nto create complete sig of txB and broadcast.
+Alice->Alice : Compute z =\n    sig(B,txB,(z+y0)*G)\n    - psig(A,txB,(z+y0)*G)\n    - psig(B,txB,(z+y0)*G)\n    - y0.
 
 @enduml