Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swap: Ensure a checkpoint is only set once and in the correct order #520

Merged
merged 3 commits into from
Jul 3, 2022
Merged

Swap: Ensure a checkpoint is only set once and in the correct order #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f97c2ad
Swap: Ensure a checkpoint is only set once and in the correct order
TheCharlatan Jul 2, 2022
f44aa83
Swap: rename s/checkpoint/last_checkpoint_type/
TheCharlatan Jul 3, 2022
4173830
Merge remote-tracking branch 'upstream/main' into CheckpointOrder
TheCharlatan Jul 3, 2022
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
1 change: 1 addition & 0 deletions src/swapd/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ pub use runtime::get_swap_id;
pub use runtime::run;
pub use runtime::CheckpointSwapd;
pub use swap_state::State;
pub use swap_state::SwapCheckpointType;
159 changes: 85 additions & 74 deletions src/swapd/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ use std::{

use super::{
storage::{self, Driver},
swap_state::{AliceState, BobState, State},
swap_state::{AliceState, BobState, State, SwapCheckpointType},
syncer_client::{log_tx_received, log_tx_seen, SyncerState, SyncerTasks},
temporal_safety::TemporalSafety,
};
Expand Down Expand Up @@ -771,22 +771,24 @@ impl Runtime {
"{} | checkpointing alice pre buy swapd state",
self.swap_id.bright_blue_italic()
);
checkpoint_send(
endpoints,
self.swap_id,
self.identity(),
ServiceId::Database,
request::CheckpointState::CheckpointSwapd(CheckpointSwapd {
state: self.state.clone(),
last_msg: Msg::BuyProcedureSignature(buy_proc_sig.clone()),
enquirer: self.enquirer.clone(),
temporal_safety: self.temporal_safety.clone(),
txs: self.txs.clone(),
txids: self.syncer_state.tasks.txids.clone(),
pending_requests: self.pending_requests.clone(),
xmr_addr_addendum: self.syncer_state.xmr_addr_addendum.clone(),
}),
)?;
if self.state.a_sup_checkpoint_pre_buy() {
zkao marked this conversation as resolved.
Show resolved Hide resolved
checkpoint_send(
endpoints,
self.swap_id,
self.identity(),
ServiceId::Database,
request::CheckpointState::CheckpointSwapd(CheckpointSwapd {
state: self.state.clone(),
last_msg: Msg::BuyProcedureSignature(buy_proc_sig.clone()),
enquirer: self.enquirer.clone(),
temporal_safety: self.temporal_safety.clone(),
txs: self.txs.clone(),
txids: self.syncer_state.tasks.txids.clone(),
pending_requests: self.pending_requests.clone(),
xmr_addr_addendum: self.syncer_state.xmr_addr_addendum.clone(),
}),
)?;
}

self.send_wallet(msg_bus, endpoints, request)?
}
Expand Down Expand Up @@ -1240,7 +1242,10 @@ impl Runtime {
{
endpoints.send_to(bus_id, self.identity(), dest, request)?;
debug!("sent buyproceduresignature at state {}", &self.state);
let next_state = State::Bob(BobState::BuySigB { buy_tx_seen: false });
let next_state = State::Bob(BobState::BuySigB {
buy_tx_seen: false,
last_checkpoint_type: self.state.last_checkpoint_type().unwrap(),
});
self.state_update(endpoints, next_state)?;
} else {
error!(
Expand Down Expand Up @@ -1589,6 +1594,10 @@ impl Runtime {
cancel_seen: false,
refund_seen: false,
remote_params: self.state.remote_params().unwrap(),
last_checkpoint_type: self
.state
.last_checkpoint_type()
.unwrap(),
});
} else {
warn!(
Expand Down Expand Up @@ -1914,22 +1923,24 @@ impl Runtime {
"{} | checkpointing bob pre lock swapd state",
self.swap_id.bright_blue_italic()
);
checkpoint_send(
endpoints,
self.swap_id,
self.identity(),
ServiceId::Database,
request::CheckpointState::CheckpointSwapd(CheckpointSwapd {
state: self.state.clone(),
last_msg: Msg::CoreArbitratingSetup(core_arb_setup.clone()),
enquirer: self.enquirer.clone(),
temporal_safety: self.temporal_safety.clone(),
txs: self.txs.clone(),
txids: self.syncer_state.tasks.txids.clone(),
pending_requests: self.pending_requests.clone(),
xmr_addr_addendum: self.syncer_state.xmr_addr_addendum.clone(),
}),
)?;
if self.state.b_sup_checkpoint_pre_lock() {
checkpoint_send(
endpoints,
self.swap_id,
self.identity(),
ServiceId::Database,
request::CheckpointState::CheckpointSwapd(CheckpointSwapd {
state: self.state.clone(),
last_msg: Msg::CoreArbitratingSetup(core_arb_setup.clone()),
enquirer: self.enquirer.clone(),
temporal_safety: self.temporal_safety.clone(),
txs: self.txs.clone(),
txids: self.syncer_state.tasks.txids.clone(),
pending_requests: self.pending_requests.clone(),
xmr_addr_addendum: self.syncer_state.xmr_addr_addendum.clone(),
}),
)?;
}
let CoreArbitratingSetup {
swap_id: _,
lock,
Expand Down Expand Up @@ -1961,6 +1972,7 @@ impl Runtime {
cancel_seen: false,
remote_params: self.state.remote_params().unwrap(),
b_address: self.state.b_address().cloned().unwrap(),
last_checkpoint_type: self.state.last_checkpoint_type().unwrap(),
});
self.state_update(endpoints, next_state)?;
}
Expand Down Expand Up @@ -2057,26 +2069,29 @@ impl Runtime {
"{} | checkpointing alice pre lock swapd state",
self.swap_id.bright_blue_italic()
);
checkpoint_send(
endpoints,
self.swap_id,
self.identity(),
ServiceId::Database,
request::CheckpointState::CheckpointSwapd(CheckpointSwapd {
state: self.state.clone(),
last_msg: Msg::RefundProcedureSignatures(refund_proc_sigs.clone()),
enquirer: self.enquirer.clone(),
temporal_safety: self.temporal_safety.clone(),
txs: self.txs.clone(),
txids: self.syncer_state.tasks.txids.clone(),
pending_requests: self.pending_requests.clone(),
xmr_addr_addendum: self.syncer_state.xmr_addr_addendum.clone(),
}),
)?;
if self.state.a_sup_checkpoint_pre_lock() {
checkpoint_send(
endpoints,
self.swap_id,
self.identity(),
ServiceId::Database,
request::CheckpointState::CheckpointSwapd(CheckpointSwapd {
state: self.state.clone(),
last_msg: Msg::RefundProcedureSignatures(refund_proc_sigs.clone()),
enquirer: self.enquirer.clone(),
temporal_safety: self.temporal_safety.clone(),
txs: self.txs.clone(),
txids: self.syncer_state.tasks.txids.clone(),
pending_requests: self.pending_requests.clone(),
xmr_addr_addendum: self.syncer_state.xmr_addr_addendum.clone(),
}),
)?;
}

self.send_peer(endpoints, Msg::RefundProcedureSignatures(refund_proc_sigs))?;
trace!("sent peer RefundProcedureSignatures msg");
let next_state = State::Alice(AliceState::RefundSigA {
last_checkpoint_type: SwapCheckpointType::CheckpointAlicePreLock,
local_params: self.state.local_params().cloned().unwrap(),
btc_locked: false,
xmr_locked: false,
Expand All @@ -2097,22 +2112,24 @@ impl Runtime {
"{} | checkpointing bob pre buy swapd state",
self.swap_id.bright_blue_italic()
);
checkpoint_send(
endpoints,
self.swap_id,
self.identity(),
ServiceId::Database,
request::CheckpointState::CheckpointSwapd(CheckpointSwapd {
state: self.state.clone(),
last_msg: Msg::BuyProcedureSignature(buy_proc_sig.clone()),
enquirer: self.enquirer.clone(),
temporal_safety: self.temporal_safety.clone(),
txs: self.txs.clone(),
txids: self.syncer_state.tasks.txids.clone(),
pending_requests: self.pending_requests.clone(),
xmr_addr_addendum: self.syncer_state.xmr_addr_addendum.clone(),
}),
)?;
if self.state.b_sup_checkpoint_pre_buy() {
checkpoint_send(
endpoints,
self.swap_id,
self.identity(),
ServiceId::Database,
request::CheckpointState::CheckpointSwapd(CheckpointSwapd {
state: self.state.clone(),
last_msg: Msg::BuyProcedureSignature(buy_proc_sig.clone()),
enquirer: self.enquirer.clone(),
temporal_safety: self.temporal_safety.clone(),
txs: self.txs.clone(),
txids: self.syncer_state.tasks.txids.clone(),
pending_requests: self.pending_requests.clone(),
xmr_addr_addendum: self.syncer_state.xmr_addr_addendum.clone(),
}),
)?;
}

debug!("subscribing with syncer for receiving raw buy tx ");

Expand Down Expand Up @@ -2277,10 +2294,7 @@ impl Runtime {
self.pending_requests = pending_requests;
self.txs = txs.clone();
trace!("Watch height bitcoin");
let watch_height_bitcoin = Task::WatchHeight(WatchHeight {
id: self.syncer_state.tasks.new_taskid(),
lifetime: self.syncer_state.task_lifetime(Coin::Bitcoin),
});
let watch_height_bitcoin = self.syncer_state.watch_height(Coin::Bitcoin);
endpoints.send_to(
ServiceBus::Ctl,
self.identity(),
Expand All @@ -2289,10 +2303,7 @@ impl Runtime {
)?;

trace!("Watch height monero");
let watch_height_monero = Task::WatchHeight(WatchHeight {
id: self.syncer_state.tasks.new_taskid(),
lifetime: self.syncer_state.task_lifetime(Coin::Monero),
});
let watch_height_monero = self.syncer_state.watch_height(Coin::Monero);
endpoints.send_to(
ServiceBus::Ctl,
self.identity(),
Expand Down
Loading