mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2024-10-01 01:45:40 -04:00
Use global counter to name messages
This commit is contained in:
parent
c55f3e3403
commit
6b4a02427a
@ -19,23 +19,23 @@ group Negotiation
|
|||||||
end
|
end
|
||||||
|
|
||||||
group Execution Setup
|
group Execution Setup
|
||||||
group Phase 0 [Messages can be exchanged in any order]
|
group Phase A [Messages can be exchanged in any order]
|
||||||
Bob -> Alice: bob::Message0
|
Bob -> Alice: Message0
|
||||||
note left: Pubkeys\ndleq proof s_b\nxmr viewkey v_b\nbtc refund addr
|
note left: Pubkeys\ndleq proof s_b\nxmr viewkey v_b\nbtc refund addr
|
||||||
|
|
||||||
Alice -> Bob: alice::Message0
|
Alice -> Bob: Message1
|
||||||
note right: Pubkeys\ndleq proof s_a\nxmr view key v_a\nbtc redeem addr\nbtc punish addr
|
note right: Pubkeys\ndleq proof s_a\nxmr view key v_a\nbtc redeem addr\nbtc punish addr
|
||||||
end
|
end
|
||||||
|
|
||||||
group Phase 1 [Messages must be exchanged in the given order]
|
group Phase B [Messages must be exchanged in the given order]
|
||||||
|
|
||||||
Bob -> Alice: bob::Message1
|
Bob -> Alice: Message2
|
||||||
note left: unsigned btc lock tx
|
note left: unsigned btc lock tx
|
||||||
|
|
||||||
Alice -> Bob: alice::Message1
|
Alice -> Bob: Message3
|
||||||
note right: btc cancel tx sig\nbtc refund tx enc sig S_b
|
note right: btc cancel tx sig\nbtc refund tx enc sig S_b
|
||||||
|
|
||||||
Bob -> Alice: bob::Message2
|
Bob -> Alice: Message4
|
||||||
note left: btc punish tx sig\nbtc cancel tx sig
|
note left: btc punish tx sig\nbtc cancel tx sig
|
||||||
|
|
||||||
end
|
end
|
||||||
@ -46,10 +46,10 @@ group Execution
|
|||||||
|
|
||||||
Alice ->> Monero: Lock
|
Alice ->> Monero: Lock
|
||||||
|
|
||||||
Alice -> Bob: alice::Message2
|
Alice -> Bob: Message5
|
||||||
note right: Exact xmr amount\nzxmr lock tx transfer proof\nThis can be removed if Bob watches the blockchain.
|
note right: Exact xmr amount\nzxmr lock tx transfer proof\nThis can be removed if Bob watches the blockchain.
|
||||||
|
|
||||||
Bob -> Alice: bob::Message3
|
Bob -> Alice: Message6
|
||||||
note left: redeem tx enc sig S_a
|
note left: redeem tx enc sig S_a
|
||||||
|
|
||||||
Alice ->> Bitcoin: Redeem
|
Alice ->> Bitcoin: Redeem
|
||||||
|
Loading…
Reference in New Issue
Block a user