mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2024-10-01 01:45:40 -04:00
Merge branch 'master' into binarybaron-gpg-key
This commit is contained in:
commit
5228bc2f74
@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
- ASB: The `history` command can now be used while the asb is running.
|
||||||
|
|
||||||
## [0.13.3] - 2024-07-15
|
## [0.13.3] - 2024-07-15
|
||||||
|
|
||||||
- Introduced a cooperative Monero redeem feature for Bob to request from Alice if Bob is punished for not refunding in time. Alice can choose to cooperate but is not obligated to do so. This change is backwards compatible. To attempt recovery, resume a swap in the "Bitcoin punished" state. Success depends on Alice being active and still having a record of the swap. Note that Alice's cooperation is voluntary and recovery is not guaranteed
|
- Introduced a cooperative Monero redeem feature for Bob to request from Alice if Bob is punished for not refunding in time. Alice can choose to cooperate but is not obligated to do so. This change is backwards compatible. To attempt recovery, resume a swap in the "Bitcoin punished" state. Success depends on Alice being active and still having a record of the swap. Note that Alice's cooperation is voluntary and recovery is not guaranteed
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
pub mod request;
|
pub mod request;
|
||||||
use crate::cli::command::{Bitcoin, Monero, Tor};
|
use crate::cli::command::{Bitcoin, Monero, Tor};
|
||||||
use crate::database::open_db;
|
use crate::database::{open_db, AccessMode};
|
||||||
use crate::env::{Config as EnvConfig, GetConfig, Mainnet, Testnet};
|
use crate::env::{Config as EnvConfig, GetConfig, Mainnet, Testnet};
|
||||||
use crate::fs::system_data_dir;
|
use crate::fs::system_data_dir;
|
||||||
use crate::network::rendezvous::XmrBtcNamespace;
|
use crate::network::rendezvous::XmrBtcNamespace;
|
||||||
@ -224,7 +224,7 @@ impl Context {
|
|||||||
let tor_socks5_port = tor.map_or(9050, |tor| tor.tor_socks5_port);
|
let tor_socks5_port = tor.map_or(9050, |tor| tor.tor_socks5_port);
|
||||||
|
|
||||||
let context = Context {
|
let context = Context {
|
||||||
db: open_db(data_dir.join("sqlite")).await?,
|
db: open_db(data_dir.join("sqlite"), AccessMode::ReadWrite).await?,
|
||||||
bitcoin_wallet,
|
bitcoin_wallet,
|
||||||
monero_wallet,
|
monero_wallet,
|
||||||
monero_rpc_process,
|
monero_rpc_process,
|
||||||
@ -259,7 +259,7 @@ impl Context {
|
|||||||
bitcoin_wallet: Some(bob_bitcoin_wallet),
|
bitcoin_wallet: Some(bob_bitcoin_wallet),
|
||||||
monero_wallet: Some(bob_monero_wallet),
|
monero_wallet: Some(bob_monero_wallet),
|
||||||
config,
|
config,
|
||||||
db: open_db(db_path)
|
db: open_db(db_path, AccessMode::ReadWrite)
|
||||||
.await
|
.await
|
||||||
.expect("Could not open sqlite database"),
|
.expect("Could not open sqlite database"),
|
||||||
monero_rpc_process: None,
|
monero_rpc_process: None,
|
||||||
|
@ -30,7 +30,7 @@ use swap::asb::config::{
|
|||||||
};
|
};
|
||||||
use swap::asb::{cancel, punish, redeem, refund, safely_abort, EventLoop, Finality, KrakenRate};
|
use swap::asb::{cancel, punish, redeem, refund, safely_abort, EventLoop, Finality, KrakenRate};
|
||||||
use swap::common::check_latest_version;
|
use swap::common::check_latest_version;
|
||||||
use swap::database::open_db;
|
use swap::database::{open_db, AccessMode};
|
||||||
use swap::network::rendezvous::XmrBtcNamespace;
|
use swap::network::rendezvous::XmrBtcNamespace;
|
||||||
use swap::network::swarm;
|
use swap::network::swarm;
|
||||||
use swap::protocol::alice::{run, AliceState};
|
use swap::protocol::alice::{run, AliceState};
|
||||||
@ -95,13 +95,13 @@ async fn main() -> Result<()> {
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
let db = open_db(config.data.dir.join("sqlite")).await?;
|
|
||||||
|
|
||||||
let seed =
|
let seed =
|
||||||
Seed::from_file_or_generate(&config.data.dir).expect("Could not retrieve/initialize seed");
|
Seed::from_file_or_generate(&config.data.dir).expect("Could not retrieve/initialize seed");
|
||||||
|
|
||||||
match cmd {
|
match cmd {
|
||||||
Command::Start { resume_only } => {
|
Command::Start { resume_only } => {
|
||||||
|
let db = open_db(config.data.dir.join("sqlite"), AccessMode::ReadWrite).await?;
|
||||||
|
|
||||||
// check and warn for duplicate rendezvous points
|
// check and warn for duplicate rendezvous points
|
||||||
let mut rendezvous_addrs = config.network.rendezvous_point.clone();
|
let mut rendezvous_addrs = config.network.rendezvous_point.clone();
|
||||||
let prev_len = rendezvous_addrs.len();
|
let prev_len = rendezvous_addrs.len();
|
||||||
@ -225,6 +225,8 @@ async fn main() -> Result<()> {
|
|||||||
event_loop.run().await;
|
event_loop.run().await;
|
||||||
}
|
}
|
||||||
Command::History => {
|
Command::History => {
|
||||||
|
let db = open_db(config.data.dir.join("sqlite"), AccessMode::ReadOnly).await?;
|
||||||
|
|
||||||
let mut table = Table::new();
|
let mut table = Table::new();
|
||||||
|
|
||||||
table.set_header(vec!["SWAP ID", "STATE"]);
|
table.set_header(vec!["SWAP ID", "STATE"]);
|
||||||
@ -270,6 +272,8 @@ async fn main() -> Result<()> {
|
|||||||
tracing::info!(%bitcoin_balance, %monero_balance, "Current balance");
|
tracing::info!(%bitcoin_balance, %monero_balance, "Current balance");
|
||||||
}
|
}
|
||||||
Command::Cancel { swap_id } => {
|
Command::Cancel { swap_id } => {
|
||||||
|
let db = open_db(config.data.dir.join("sqlite"), AccessMode::ReadWrite).await?;
|
||||||
|
|
||||||
let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config).await?;
|
let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config).await?;
|
||||||
|
|
||||||
let (txid, _) = cancel(swap_id, Arc::new(bitcoin_wallet), db).await?;
|
let (txid, _) = cancel(swap_id, Arc::new(bitcoin_wallet), db).await?;
|
||||||
@ -277,6 +281,8 @@ async fn main() -> Result<()> {
|
|||||||
tracing::info!("Cancel transaction successfully published with id {}", txid);
|
tracing::info!("Cancel transaction successfully published with id {}", txid);
|
||||||
}
|
}
|
||||||
Command::Refund { swap_id } => {
|
Command::Refund { swap_id } => {
|
||||||
|
let db = open_db(config.data.dir.join("sqlite"), AccessMode::ReadWrite).await?;
|
||||||
|
|
||||||
let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config).await?;
|
let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config).await?;
|
||||||
let monero_wallet = init_monero_wallet(&config, env_config).await?;
|
let monero_wallet = init_monero_wallet(&config, env_config).await?;
|
||||||
|
|
||||||
@ -291,6 +297,8 @@ async fn main() -> Result<()> {
|
|||||||
tracing::info!("Monero successfully refunded");
|
tracing::info!("Monero successfully refunded");
|
||||||
}
|
}
|
||||||
Command::Punish { swap_id } => {
|
Command::Punish { swap_id } => {
|
||||||
|
let db = open_db(config.data.dir.join("sqlite"), AccessMode::ReadWrite).await?;
|
||||||
|
|
||||||
let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config).await?;
|
let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config).await?;
|
||||||
|
|
||||||
let (txid, _) = punish(swap_id, Arc::new(bitcoin_wallet), db).await?;
|
let (txid, _) = punish(swap_id, Arc::new(bitcoin_wallet), db).await?;
|
||||||
@ -298,6 +306,8 @@ async fn main() -> Result<()> {
|
|||||||
tracing::info!("Punish transaction successfully published with id {}", txid);
|
tracing::info!("Punish transaction successfully published with id {}", txid);
|
||||||
}
|
}
|
||||||
Command::SafelyAbort { swap_id } => {
|
Command::SafelyAbort { swap_id } => {
|
||||||
|
let db = open_db(config.data.dir.join("sqlite"), AccessMode::ReadWrite).await?;
|
||||||
|
|
||||||
safely_abort(swap_id, db).await?;
|
safely_abort(swap_id, db).await?;
|
||||||
|
|
||||||
tracing::info!("Swap safely aborted");
|
tracing::info!("Swap safely aborted");
|
||||||
@ -306,6 +316,8 @@ async fn main() -> Result<()> {
|
|||||||
swap_id,
|
swap_id,
|
||||||
do_not_await_finality,
|
do_not_await_finality,
|
||||||
} => {
|
} => {
|
||||||
|
let db = open_db(config.data.dir.join("sqlite"), AccessMode::ReadWrite).await?;
|
||||||
|
|
||||||
let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config).await?;
|
let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config).await?;
|
||||||
|
|
||||||
let (txid, _) = redeem(
|
let (txid, _) = redeem(
|
||||||
|
@ -83,16 +83,25 @@ impl Swap {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn open_db(sqlite_path: impl AsRef<Path>) -> Result<Arc<dyn Database + Send + Sync>> {
|
#[derive(Debug, Clone, Copy, Serialize, Deserialize, Hash, PartialEq)]
|
||||||
|
pub enum AccessMode {
|
||||||
|
ReadWrite,
|
||||||
|
ReadOnly,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn open_db(
|
||||||
|
sqlite_path: impl AsRef<Path>,
|
||||||
|
access_mode: AccessMode,
|
||||||
|
) -> Result<Arc<dyn Database + Send + Sync>> {
|
||||||
if sqlite_path.as_ref().exists() {
|
if sqlite_path.as_ref().exists() {
|
||||||
tracing::debug!("Using existing sqlite database.");
|
tracing::debug!("Using existing sqlite database.");
|
||||||
let sqlite = SqliteDatabase::open(sqlite_path).await?;
|
let sqlite = SqliteDatabase::open(sqlite_path, access_mode).await?;
|
||||||
Ok(Arc::new(sqlite))
|
Ok(Arc::new(sqlite))
|
||||||
} else {
|
} else {
|
||||||
tracing::debug!("Creating and using new sqlite database.");
|
tracing::debug!("Creating and using new sqlite database.");
|
||||||
ensure_directory_exists(sqlite_path.as_ref())?;
|
ensure_directory_exists(sqlite_path.as_ref())?;
|
||||||
tokio::fs::File::create(&sqlite_path).await?;
|
tokio::fs::File::create(&sqlite_path).await?;
|
||||||
let sqlite = SqliteDatabase::open(sqlite_path).await?;
|
let sqlite = SqliteDatabase::open(sqlite_path, access_mode).await?;
|
||||||
Ok(Arc::new(sqlite))
|
Ok(Arc::new(sqlite))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@ use crate::protocol::{Database, State};
|
|||||||
use anyhow::{anyhow, Context, Result};
|
use anyhow::{anyhow, Context, Result};
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use libp2p::{Multiaddr, PeerId};
|
use libp2p::{Multiaddr, PeerId};
|
||||||
use sqlx::sqlite::Sqlite;
|
use sqlx::sqlite::{Sqlite, SqliteConnectOptions};
|
||||||
use sqlx::{Pool, SqlitePool};
|
use sqlx::{Pool, SqlitePool};
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
@ -12,19 +12,29 @@ use std::str::FromStr;
|
|||||||
use time::OffsetDateTime;
|
use time::OffsetDateTime;
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use super::AccessMode;
|
||||||
|
|
||||||
pub struct SqliteDatabase {
|
pub struct SqliteDatabase {
|
||||||
pool: Pool<Sqlite>,
|
pool: Pool<Sqlite>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl SqliteDatabase {
|
impl SqliteDatabase {
|
||||||
pub async fn open(path: impl AsRef<Path>) -> Result<Self>
|
pub async fn open(path: impl AsRef<Path>, access_mode: AccessMode) -> Result<Self>
|
||||||
where
|
where
|
||||||
Self: std::marker::Sized,
|
Self: std::marker::Sized,
|
||||||
{
|
{
|
||||||
|
let read_only = matches!(access_mode, AccessMode::ReadOnly);
|
||||||
|
|
||||||
let path_str = format!("sqlite:{}", path.as_ref().display());
|
let path_str = format!("sqlite:{}", path.as_ref().display());
|
||||||
let pool = SqlitePool::connect(&path_str).await?;
|
let options = SqliteConnectOptions::from_str(&path_str)?.read_only(read_only);
|
||||||
|
|
||||||
|
let pool = SqlitePool::connect_with(options).await?;
|
||||||
let mut sqlite = Self { pool };
|
let mut sqlite = Self { pool };
|
||||||
sqlite.run_migrations().await?;
|
|
||||||
|
if !read_only {
|
||||||
|
sqlite.run_migrations().await?;
|
||||||
|
}
|
||||||
|
|
||||||
Ok(sqlite)
|
Ok(sqlite)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -504,7 +514,7 @@ mod tests {
|
|||||||
// file has to exist in order to connect with sqlite
|
// file has to exist in order to connect with sqlite
|
||||||
File::create(temp_db.clone()).unwrap();
|
File::create(temp_db.clone()).unwrap();
|
||||||
|
|
||||||
let db = SqliteDatabase::open(temp_db).await?;
|
let db = SqliteDatabase::open(temp_db, AccessMode::ReadWrite).await?;
|
||||||
|
|
||||||
Ok(db)
|
Ok(db)
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,7 @@ use std::sync::Arc;
|
|||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
use swap::asb::FixedRate;
|
use swap::asb::FixedRate;
|
||||||
use swap::bitcoin::{CancelTimelock, PunishTimelock, TxCancel, TxPunish, TxRedeem, TxRefund};
|
use swap::bitcoin::{CancelTimelock, PunishTimelock, TxCancel, TxPunish, TxRedeem, TxRefund};
|
||||||
use swap::database::SqliteDatabase;
|
use swap::database::{AccessMode, SqliteDatabase};
|
||||||
use swap::env::{Config, GetConfig};
|
use swap::env::{Config, GetConfig};
|
||||||
use swap::fs::ensure_directory_exists;
|
use swap::fs::ensure_directory_exists;
|
||||||
use swap::network::rendezvous::XmrBtcNamespace;
|
use swap::network::rendezvous::XmrBtcNamespace;
|
||||||
@ -231,7 +231,11 @@ async fn start_alice(
|
|||||||
if !&db_path.exists() {
|
if !&db_path.exists() {
|
||||||
tokio::fs::File::create(&db_path).await.unwrap();
|
tokio::fs::File::create(&db_path).await.unwrap();
|
||||||
}
|
}
|
||||||
let db = Arc::new(SqliteDatabase::open(db_path.as_path()).await.unwrap());
|
let db = Arc::new(
|
||||||
|
SqliteDatabase::open(db_path.as_path(), AccessMode::ReadWrite)
|
||||||
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
);
|
||||||
|
|
||||||
let min_buy = bitcoin::Amount::from_sat(u64::MIN);
|
let min_buy = bitcoin::Amount::from_sat(u64::MIN);
|
||||||
let max_buy = bitcoin::Amount::from_sat(u64::MAX);
|
let max_buy = bitcoin::Amount::from_sat(u64::MAX);
|
||||||
@ -433,7 +437,7 @@ impl BobParams {
|
|||||||
if !self.db_path.exists() {
|
if !self.db_path.exists() {
|
||||||
tokio::fs::File::create(&self.db_path).await?;
|
tokio::fs::File::create(&self.db_path).await?;
|
||||||
}
|
}
|
||||||
let db = Arc::new(SqliteDatabase::open(&self.db_path).await?);
|
let db = Arc::new(SqliteDatabase::open(&self.db_path, AccessMode::ReadWrite).await?);
|
||||||
|
|
||||||
let (event_loop, handle) = self.new_eventloop(swap_id, db.clone()).await?;
|
let (event_loop, handle) = self.new_eventloop(swap_id, db.clone()).await?;
|
||||||
|
|
||||||
@ -463,7 +467,7 @@ impl BobParams {
|
|||||||
if !self.db_path.exists() {
|
if !self.db_path.exists() {
|
||||||
tokio::fs::File::create(&self.db_path).await?;
|
tokio::fs::File::create(&self.db_path).await?;
|
||||||
}
|
}
|
||||||
let db = Arc::new(SqliteDatabase::open(&self.db_path).await?);
|
let db = Arc::new(SqliteDatabase::open(&self.db_path, AccessMode::ReadWrite).await?);
|
||||||
|
|
||||||
let (event_loop, handle) = self.new_eventloop(swap_id, db.clone()).await?;
|
let (event_loop, handle) = self.new_eventloop(swap_id, db.clone()).await?;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user