From 88fd8ac23e050daf4ba6105b2deacfa4f2bae971 Mon Sep 17 00:00:00 2001 From: tecnovert Date: Wed, 21 Jun 2023 23:54:18 +0200 Subject: [PATCH] doc: Fix note in sequence diagrams. --- .../xmr.bidder.alt.xu.min.svg | 690 +++++++++--------- .../xmr.offerer.alt.xu.min.svg | 646 ++++++++-------- .../sequence_diagrams/xmr.bidder.alt.xu | 2 +- .../sequence_diagrams/xmr.offerer.alt.xu | 2 +- 4 files changed, 670 insertions(+), 670 deletions(-) diff --git a/basicswap/static/sequence_diagrams/xmr.bidder.alt.xu.min.svg b/basicswap/static/sequence_diagrams/xmr.bidder.alt.xu.min.svg index f279e8a..d6570a0 100644 --- a/basicswap/static/sequence_diagrams/xmr.bidder.alt.xu.min.svg +++ b/basicswap/static/sequence_diagrams/xmr.bidder.alt.xu.min.svg @@ -1,352 +1,352 @@ - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + Network - + Offerer - + Bidder - + - + - - + + Sends Offer - - + + Detects Offer - - + + Sends Bid - - + + Sends BidAccept message - - + + Sends XmrBidLockTxSigsMessage - - + + Sends XmrBidLockSpendTxMessage - - + + Sends script-coin-lock-tx - - - Wait for - - script-coin-lock-tx to - - confirm - - - Sends noscript-coin-lock-tx - - - Wait for - - noscript-coin-lock-tx to - - confirm - - - Wait for - - noscript-coin-lock-tx to - - confirm - - - Sends script-coin-lock-tx - - release message - - - Sends script-coin-lock-spend-tx - - - fail path - - - Wait for - - script-coin-lock-tx lock to - - expire - - - Sends - - script-coin-lock-pre-refund-tx - - - script-coin-lock-pre-refund-tx - - - Wait for - - pre-refund tx to confirm - - - Sends - - script-coin-lock-pre-refund-spend-tx - - - Detects script-coin-lock-pre-refund-spend-tx - - - Sends scriptless-coin-lock-recover-tx - - - bidder swipes script coin lock tx - - - Wait for - - pre-refund tx lock to expire - - - Sends script-coin-lock-pre-refund-swipe-tx + + + Wait for + + script-coin-lock-tx to + + confirm + + + Sends noscript-coin-lock-tx + + + Wait for + + noscript-coin-lock-tx to + + confirm + + + Wait for + + noscript-coin-lock-tx to + + confirm + + + Sends script-coin-lock-tx + + release message + + + Sends script-coin-lock-spend-tx + + + fail path + + + Wait for + + script-coin-lock-tx lock to + + expire + + + Sends + + script-coin-lock-pre-refund-tx + + + script-coin-lock-pre-refund-tx + + + Wait for + + pre-refund tx to confirm + + + Sends + + script-coin-lock-pre-refund-spend-tx + + + Detects script-coin-lock-pre-refund-spend-tx + + + Sends scriptless-coin-lock-recover-tx + + + bidder swipes script coin lock tx + + + Wait for + + pre-refund tx lock to expire + + + Sends script-coin-lock-pre-refund-swipe-tx Bid Sent - + User accepts bid The BidAccept message contains the pubkeys the offerer will use and @@ -364,51 +364,51 @@ msg The XmrBidLockSpendTxMessage contains the script-coin-lock-tx and - the offerer's signature for it. + proof the offerer can sign it. Bid Script coin spend tx valid Exchanged script lock spend tx msg - - Bid Script coin locked - - Bid Scriptless coin locked - - alt: success path - - The XmrBidLockReleaseMessage contains the offerer's OTVES for it. - The bidder decodes the offerer's signature - from the OTVES. When the offerer has the - plaintext signature, they can decode the bidder's noscript-coin-lock-tx - signature. - - Script coin lock released - - Script tx redeemed - - Bid Completed - - tx can be sent by either party. - - Bid Script pre-refund tx in - chain - - alt: offerer refunds script coin lock tx - - Refunds the script lock tx, with the offerer's cleartext signature - the bidder can refund the noscript lock tx. - Once the lock expires the pre-refund tx can be spent by the bidder. - - Bid Failed, refunded - - Bidder recovers the offerer's scriptless chain key-shard. - - Bid Scriptless tx recovered - - Bid Failed, refunded - - Bid Failed, swiped + + Bid Script coin locked + + Bid Scriptless coin locked + + alt: success path + + The XmrBidLockReleaseMessage contains the offerer's OTVES for it. + The bidder decodes the offerer's signature + from the OTVES. When the offerer has the + plaintext signature, they can decode the bidder's noscript-coin-lock-tx + signature. + + Script coin lock released + + Script tx redeemed + + Bid Completed + + tx can be sent by either party. + + Bid Script pre-refund tx in + chain + + alt: offerer refunds script coin lock tx + + Refunds the script lock tx, with the offerer's cleartext signature + the bidder can refund the noscript lock tx. + Once the lock expires the pre-refund tx can be spent by the bidder. + + Bid Failed, refunded + + Bidder recovers the offerer's scriptless chain key-shard. + + Bid Scriptless tx recovered + + Bid Failed, refunded + + Bid Failed, swiped diff --git a/basicswap/static/sequence_diagrams/xmr.offerer.alt.xu.min.svg b/basicswap/static/sequence_diagrams/xmr.offerer.alt.xu.min.svg index 7c9a847..9c91f8c 100644 --- a/basicswap/static/sequence_diagrams/xmr.offerer.alt.xu.min.svg +++ b/basicswap/static/sequence_diagrams/xmr.offerer.alt.xu.min.svg @@ -1,335 +1,335 @@ - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + Network - + Offerer - + Bidder - + - + - - + + Sends Offer - - + + Detects Offer - - + + Sends Bid - - + + Sends BidAccept message - - + + Sends XmrBidLockTxSigsMessage - - + + Sends script-coin-lock-tx - - + + Sends XmrBidLockSpendTxMessage - - - Wait for - - script-coin-lock-tx to - - confirm - - - Wait for - - script-coin-lock-tx to - - confirm - - - Sends noscript-coin-lock-tx - - - Wait for - - noscript-coin-lock-tx to - - confirm - - - Sends script-coin-lock-tx - - release message - - - Sends script-coin-lock-spend-tx - - - Detects script-coin-lock-spend-tx - - - Sends noscript-coin-lock-spend-tx - - - Wait for - - noscript-coin-lock-spend-tx - - to confirm - - - fail path - - - Wait for - - script-coin-lock-tx - - locktime to expire - - - Sends - - script-coin-lock-pre-refund-tx - - - script-coin-lock-pre-refund-tx - - - Wait for - - pre-refund tx to confirm - - - Sends - - script-coin-lock-pre-refund-spend-tx + + + Wait for + + script-coin-lock-tx to + + confirm + + + Wait for + + script-coin-lock-tx to + + confirm + + + Sends noscript-coin-lock-tx + + + Wait for + + noscript-coin-lock-tx to + + confirm + + + Sends script-coin-lock-tx + + release message + + + Sends script-coin-lock-spend-tx + + + Detects script-coin-lock-spend-tx + + + Sends noscript-coin-lock-spend-tx + + + Wait for + + noscript-coin-lock-spend-tx + + to confirm + + + fail path + + + Wait for + + script-coin-lock-tx + + locktime to expire + + + Sends + + script-coin-lock-pre-refund-tx + + + script-coin-lock-pre-refund-tx + + + Wait for + + pre-refund tx to confirm + + + Sends + + script-coin-lock-pre-refund-spend-tx Bid Receiving Bid Received - + User accepts bid The BidAccept message contains the pubkeys the offerer will use and a @@ -345,44 +345,44 @@ Bid Script coin spend tx valid - The XmrBidLockSpendTxMessage contains the script-coin-lock-tx and the - offerer's signature for it. + The XmrBidLockSpendTxMessage contains the script-coin-lock-tx and + proof the offerer can sign it. Exchanged script lock spend tx msg - - Bid Script coin locked - - alt: success path - - Bid Scriptless coin locked - - The XmrBidLockReleaseMessage contains the offerer's OTVES for the - script-coin-lock-tx. The bidder decodes the - offerer's signature from the OTVES. When the - offerer has the plaintext signature, they can decode the bidder's key - for the noscript-lock-tx. - - Bid Script coin lock released - - Bid Script tx redeemed - - The offerer extracts the bidder's plaintext signature and derives the - bidder's noscript-lock-tx keyhalf. - - Bid Scriptless tx redeemed - - Bid Completed - - tx can be sent by either party. - - Bid Script pre-refund tx in - chain - - Refunds the script lock tx, with the offerer's cleartext signature - the bidder can refund the noscript lock tx. - - Bid Failed, refunded + + Bid Script coin locked + + alt: success path + + Bid Scriptless coin locked + + The XmrBidLockReleaseMessage contains the offerer's OTVES for the + script-coin-lock-tx. The bidder decodes the + offerer's signature from the OTVES. When the + offerer has the plaintext signature, they can decode the bidder's key + for the noscript-lock-tx. + + Bid Script coin lock released + + Bid Script tx redeemed + + The offerer extracts the bidder's plaintext signature and derives the + bidder's noscript-lock-tx keyhalf. + + Bid Scriptless tx redeemed + + Bid Completed + + tx can be sent by either party. + + Bid Script pre-refund tx in + chain + + Refunds the script lock tx, with the offerer's cleartext signature + the bidder can refund the noscript lock tx. + + Bid Failed, refunded diff --git a/doc/protocols/sequence_diagrams/xmr.bidder.alt.xu b/doc/protocols/sequence_diagrams/xmr.bidder.alt.xu index fb1239e..d7e5258 100644 --- a/doc/protocols/sequence_diagrams/xmr.bidder.alt.xu +++ b/doc/protocols/sequence_diagrams/xmr.bidder.alt.xu @@ -24,7 +24,7 @@ xu { B abox B [label="Exchanged script lock tx sigs msg"]; O =>> B [label="Sends XmrBidLockSpendTxMessage"], C note C2 - [label="The XmrBidLockSpendTxMessage contains the script-coin-lock-tx and the offerer's signature for it.", + [label="The XmrBidLockSpendTxMessage contains the script-coin-lock-tx and proof the offerer can sign it.", textbgcolor="#FFFFCC"]; O =>> N [label="Sends script-coin-lock-tx"], B abox B [label="Bid Script coin spend tx valid"]; diff --git a/doc/protocols/sequence_diagrams/xmr.offerer.alt.xu b/doc/protocols/sequence_diagrams/xmr.offerer.alt.xu index c48c53b..8e65290 100644 --- a/doc/protocols/sequence_diagrams/xmr.offerer.alt.xu +++ b/doc/protocols/sequence_diagrams/xmr.offerer.alt.xu @@ -26,7 +26,7 @@ xu { O abox O [label="Bid Script coin spend tx valid"]; O =>> B [label="Sends XmrBidLockSpendTxMessage"], C note C2 - [label="The XmrBidLockSpendTxMessage contains the script-coin-lock-tx and the offerer's signature for it.", + [label="The XmrBidLockSpendTxMessage contains the script-coin-lock-tx and proof the offerer can sign it.", textbgcolor="#FFFFCC"]; O abox O [label="Exchanged script lock spend tx msg"];