Skip to content

Commit

Permalink
Merge pull request #688 from TheCharlatan/sequencediagramDatabase
Browse files Browse the repository at this point in the history
Docs: Correct s/checkpoint/database/ in sequence diagram
  • Loading branch information
Lederstrumpf authored Aug 23, 2022
2 parents 2ebda98 + 71d0841 commit 2c94700
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion doc/sequencediagram.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions doc/sequencediagram.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ title Farcaster node
participant t_syncer
participant t_wallet
participant t_swap
participant t_checkpoint
participant t_database
participant t_farcasterd
participant t_cli
participant peerd
participant m_cli
participant m_farcasterd
participant m_checkpoint
participant m_database
participant m_swap
participant m_wallet
participant m_syncer
Expand Down Expand Up @@ -97,9 +97,9 @@ t_swap -> t_wallet : if Bob, SEND PENDING Msg Reveal (maker is sender)
==Commit-Reveal Complete==
==Changing semantics: On Commit-Reveal, Maker and Taker were the key roles. From now on Bob or Alice are the key roles. Now t_ is bob_ on the left and m_ is alice_ on the right.==
==Swap setup: Bob is left, Alice right==
t_wallet -> t_checkpoint: Ctl CheckpointWalletBobPrelockBob
t_wallet -> t_database: Ctl CheckpointWalletBobPrelockBob
t_wallet -> t_swap : Ctl CoreArbitratingSetup
t_swap -> t_checkpoint: Ctl CheckpointSwapBobPrelockBob
t_swap -> t_database: Ctl CheckpointSwapBobPrelockBob
// TODO: During replay of CheckpointSwapBobPrelockBob, Bob has to rewatch these 3 txs
t_syncer <- t_swap : Watch Arbitrating Lock
t_syncer <- t_swap : Watch Cancel
Expand All @@ -112,23 +112,23 @@ m_swap -> m_syncer : Watch Cancel
m_swap -> m_syncer : Watch Refund

m_wallet <- m_swap : Msg CoreArbitratingSetup
m_wallet -> m_checkpoint : Ctl CheckpointWalletAlicePrelockBob
m_wallet -> m_database : Ctl CheckpointWalletAlicePrelockBob
m_wallet -> m_swap : Ctl RefundProcedureSignatures
m_swap -> m_checkpoint : Ctl CheckpointSwapAlicePrelockBob
m_swap -> m_database : Ctl CheckpointSwapAlicePrelockBob
m_swap -> peerd : Msg RefundProcedureSignatures
peerd -> t_swap : Msg RefundProcedureSignatures
t_wallet <- t_swap : Msg RefundProcedureSignatures
t_wallet -> t_swap:Ctl Datum::SignedArbitratingLock
// DONE: do we know that same inputs are being used in case of replay?
// -> yes, but create different sig
t_wallet -> t_checkpoint : Ctl CheckpointWalletBobPreBuySig
t_wallet -> t_database : Ctl CheckpointWalletBobPreBuySig
t_wallet -> t_swap : Ctl Tx::Lock
t_swap -> t_syncer: Ctl Broadcast Arbitrating Lock
t_swap -> t_syncer : Watch Accordant Lock
t_wallet -> t_swap: Ctl Tx::Cancel
t_wallet -> t_swap: Ctl Tx::Refund
t_wallet -> t_swap : Ctl BuyProcedureSignature
t_swap -> t_checkpoint : Ctl CheckpointSwapBobPreBuySig
t_swap -> t_database : Ctl CheckpointSwapBobPreBuySig
t_swap -> t_syncer : Watch Buy

parallel
Expand All @@ -146,10 +146,10 @@ parallel off

peerd <- t_swap : Msg BuyProcedureSignature
m_swap <- peerd : Msg BuyProcedureSignature
m_swap -> m_checkpoint : Ctl CheckpointSwapAlicePreBuy
m_swap -> m_database : Ctl CheckpointSwapAlicePreBuy
m_swap -> m_syncer:Watch Buy
m_swap -> m_wallet : Msg BuyProcedureSignature
m_wallet -> m_checkpoint : Ctl CheckpointWalletAlicePreBuy
m_wallet -> m_database : Ctl CheckpointWalletAlicePreBuy
==Swap Setup Complete==
==Buy Procedure: Bob is left, Alice right==

Expand Down

0 comments on commit 2c94700

Please sign in to comment.