|
|
|
|
@ -5,7 +5,14 @@ use uuid::Uuid;
|
|
|
|
|
use xmr_btc::{alice, bob, monero, serde::monero_private_key};
|
|
|
|
|
|
|
|
|
|
#[allow(clippy::large_enum_variant)]
|
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
|
|
|
|
|
pub enum Swap {
|
|
|
|
|
Alice(Alice),
|
|
|
|
|
Bob(Bob),
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[allow(clippy::large_enum_variant)]
|
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
|
|
|
|
|
pub enum Alice {
|
|
|
|
|
Handshaken(alice::State3),
|
|
|
|
|
BtcLocked(alice::State3),
|
|
|
|
|
@ -24,7 +31,7 @@ pub enum Alice {
|
|
|
|
|
SwapComplete,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
|
|
|
|
|
pub enum Bob {
|
|
|
|
|
Handshaken(bob::State2),
|
|
|
|
|
BtcLocked(bob::State2),
|
|
|
|
|
@ -34,54 +41,54 @@ pub enum Bob {
|
|
|
|
|
SwapComplete,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub struct Database<T>
|
|
|
|
|
where
|
|
|
|
|
T: Serialize + DeserializeOwned,
|
|
|
|
|
{
|
|
|
|
|
db: sled::Db,
|
|
|
|
|
_marker: std::marker::PhantomData<T>,
|
|
|
|
|
impl From<Alice> for Swap {
|
|
|
|
|
fn from(from: Alice) -> Self {
|
|
|
|
|
Swap::Alice(from)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl<T> Database<T>
|
|
|
|
|
where
|
|
|
|
|
T: Serialize + DeserializeOwned,
|
|
|
|
|
{
|
|
|
|
|
impl From<Bob> for Swap {
|
|
|
|
|
fn from(from: Bob) -> Self {
|
|
|
|
|
Swap::Bob(from)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub struct Database(sled::Db);
|
|
|
|
|
|
|
|
|
|
impl Database {
|
|
|
|
|
pub fn open(path: &Path) -> Result<Self> {
|
|
|
|
|
let db =
|
|
|
|
|
sled::open(path).with_context(|| format!("Could not open the DB at {:?}", path))?;
|
|
|
|
|
|
|
|
|
|
Ok(Database {
|
|
|
|
|
db,
|
|
|
|
|
_marker: Default::default(),
|
|
|
|
|
})
|
|
|
|
|
Ok(Database(db))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// TODO: Add method to update state
|
|
|
|
|
|
|
|
|
|
pub async fn insert_latest_state(&self, swap_id: Uuid, state: &T) -> Result<()> {
|
|
|
|
|
pub async fn insert_latest_state(&self, swap_id: Uuid, state: Swap) -> Result<()> {
|
|
|
|
|
let key = serialize(&swap_id)?;
|
|
|
|
|
let new_value = serialize(&state).context("Could not serialize new state value")?;
|
|
|
|
|
|
|
|
|
|
let old_value = self.db.get(&key)?;
|
|
|
|
|
let old_value = self.0.get(&key)?;
|
|
|
|
|
|
|
|
|
|
self.db
|
|
|
|
|
self.0
|
|
|
|
|
.compare_and_swap(key, old_value, Some(new_value))
|
|
|
|
|
.context("Could not write in the DB")?
|
|
|
|
|
.context("Stored swap somehow changed, aborting saving")?;
|
|
|
|
|
|
|
|
|
|
// TODO: see if this can be done through sled config
|
|
|
|
|
self.db
|
|
|
|
|
self.0
|
|
|
|
|
.flush_async()
|
|
|
|
|
.await
|
|
|
|
|
.map(|_| ())
|
|
|
|
|
.context("Could not flush db")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn get_latest_state(&self, swap_id: Uuid) -> anyhow::Result<T> {
|
|
|
|
|
pub fn get_latest_state(&self, swap_id: Uuid) -> anyhow::Result<Swap> {
|
|
|
|
|
let key = serialize(&swap_id)?;
|
|
|
|
|
|
|
|
|
|
let encoded = self
|
|
|
|
|
.db
|
|
|
|
|
.0
|
|
|
|
|
.get(&key)?
|
|
|
|
|
.ok_or_else(|| anyhow!("State does not exist {:?}", key))?;
|
|
|
|
|
|
|
|
|
|
@ -106,87 +113,61 @@ where
|
|
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
|
mod tests {
|
|
|
|
|
#![allow(non_snake_case)]
|
|
|
|
|
use super::*;
|
|
|
|
|
use bitcoin::SigHash;
|
|
|
|
|
use rand::rngs::OsRng;
|
|
|
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
|
use std::str::FromStr;
|
|
|
|
|
use xmr_btc::{cross_curve_dleq, monero, serde::monero_private_key};
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Serialize, Deserialize, PartialEq)]
|
|
|
|
|
pub struct TestState {
|
|
|
|
|
A: xmr_btc::bitcoin::PublicKey,
|
|
|
|
|
a: xmr_btc::bitcoin::SecretKey,
|
|
|
|
|
s_a: cross_curve_dleq::Scalar,
|
|
|
|
|
#[serde(with = "monero_private_key")]
|
|
|
|
|
s_b: monero::PrivateKey,
|
|
|
|
|
S_a_monero: ::monero::PublicKey,
|
|
|
|
|
S_a_bitcoin: xmr_btc::bitcoin::PublicKey,
|
|
|
|
|
v: xmr_btc::monero::PrivateViewKey,
|
|
|
|
|
#[serde(with = "::bitcoin::util::amount::serde::as_sat")]
|
|
|
|
|
btc: ::bitcoin::Amount,
|
|
|
|
|
xmr: xmr_btc::monero::Amount,
|
|
|
|
|
refund_timelock: u32,
|
|
|
|
|
refund_address: ::bitcoin::Address,
|
|
|
|
|
transaction: ::bitcoin::Transaction,
|
|
|
|
|
tx_punish_sig: xmr_btc::bitcoin::Signature,
|
|
|
|
|
|
|
|
|
|
#[tokio::test]
|
|
|
|
|
async fn can_write_and_read_to_multiple_keys() {
|
|
|
|
|
let db_dir = tempfile::tempdir().unwrap();
|
|
|
|
|
let db = Database::open(db_dir.path()).unwrap();
|
|
|
|
|
|
|
|
|
|
let state_1 = Swap::Alice(Alice::SwapComplete);
|
|
|
|
|
let swap_id_1 = Uuid::new_v4();
|
|
|
|
|
db.insert_latest_state(swap_id_1, state_1.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect("Failed to save second state");
|
|
|
|
|
|
|
|
|
|
let state_2 = Swap::Bob(Bob::SwapComplete);
|
|
|
|
|
let swap_id_2 = Uuid::new_v4();
|
|
|
|
|
db.insert_latest_state(swap_id_2, state_2.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect("Failed to save first state");
|
|
|
|
|
|
|
|
|
|
let recovered_1 = db
|
|
|
|
|
.get_latest_state(swap_id_1)
|
|
|
|
|
.expect("Failed to recover first state");
|
|
|
|
|
|
|
|
|
|
let recovered_2 = db
|
|
|
|
|
.get_latest_state(swap_id_2)
|
|
|
|
|
.expect("Failed to recover second state");
|
|
|
|
|
|
|
|
|
|
assert_eq!(recovered_1, state_1);
|
|
|
|
|
assert_eq!(recovered_2, state_2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[tokio::test]
|
|
|
|
|
async fn recover_state_from_db() {
|
|
|
|
|
async fn can_write_twice_to_one_key() {
|
|
|
|
|
let db_dir = tempfile::tempdir().unwrap();
|
|
|
|
|
let db = Database::open(db_dir.path()).unwrap();
|
|
|
|
|
|
|
|
|
|
let a = xmr_btc::bitcoin::SecretKey::new_random(&mut OsRng);
|
|
|
|
|
let s_a = cross_curve_dleq::Scalar::random(&mut OsRng);
|
|
|
|
|
let s_b = monero::PrivateKey::from_scalar(monero::Scalar::random(&mut OsRng));
|
|
|
|
|
let v_a = xmr_btc::monero::PrivateViewKey::new_random(&mut OsRng);
|
|
|
|
|
let S_a_monero = monero::PublicKey::from_private_key(&monero::PrivateKey {
|
|
|
|
|
scalar: s_a.into_ed25519(),
|
|
|
|
|
});
|
|
|
|
|
let S_a_bitcoin = s_a.into_secp256k1().into();
|
|
|
|
|
let tx_punish_sig = a.sign(SigHash::default());
|
|
|
|
|
|
|
|
|
|
let state = TestState {
|
|
|
|
|
A: a.public(),
|
|
|
|
|
a,
|
|
|
|
|
s_b,
|
|
|
|
|
s_a,
|
|
|
|
|
S_a_monero,
|
|
|
|
|
S_a_bitcoin,
|
|
|
|
|
v: v_a,
|
|
|
|
|
btc: ::bitcoin::Amount::from_sat(100),
|
|
|
|
|
xmr: xmr_btc::monero::Amount::from_piconero(1000),
|
|
|
|
|
refund_timelock: 0,
|
|
|
|
|
refund_address: ::bitcoin::Address::from_str("1L5wSMgerhHg8GZGcsNmAx5EXMRXSKR3He")
|
|
|
|
|
.unwrap(),
|
|
|
|
|
transaction: ::bitcoin::Transaction {
|
|
|
|
|
version: 0,
|
|
|
|
|
lock_time: 0,
|
|
|
|
|
input: vec![::bitcoin::TxIn::default()],
|
|
|
|
|
output: vec![::bitcoin::TxOut::default()],
|
|
|
|
|
},
|
|
|
|
|
tx_punish_sig,
|
|
|
|
|
};
|
|
|
|
|
let state = Swap::Alice(Alice::SwapComplete);
|
|
|
|
|
|
|
|
|
|
let swap_id = Uuid::new_v4();
|
|
|
|
|
db.insert_latest_state(swap_id, &state)
|
|
|
|
|
db.insert_latest_state(swap_id, state.clone())
|
|
|
|
|
.await
|
|
|
|
|
.expect("Failed to save state the first time");
|
|
|
|
|
let recovered: TestState = db
|
|
|
|
|
let recovered = db
|
|
|
|
|
.get_latest_state(swap_id)
|
|
|
|
|
.expect("Failed to recover state the first time");
|
|
|
|
|
|
|
|
|
|
// We insert and recover twice to ensure database implementation allows the
|
|
|
|
|
// caller to write to an existing key
|
|
|
|
|
db.insert_latest_state(swap_id, &recovered)
|
|
|
|
|
db.insert_latest_state(swap_id, recovered)
|
|
|
|
|
.await
|
|
|
|
|
.expect("Failed to save state the second time");
|
|
|
|
|
let recovered: TestState = db
|
|
|
|
|
let recovered = db
|
|
|
|
|
.get_latest_state(swap_id)
|
|
|
|
|
.expect("Failed to recover state the second time");
|
|
|
|
|
|
|
|
|
|
assert_eq!(state, recovered);
|
|
|
|
|
assert_eq!(recovered, state);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Lucas Soriano del Pino
4 years ago
committed by
rishflab