mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2025-03-29 01:18:13 -04:00
![dependabot[bot]](/assets/img/avatar_default.png)
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.130 to 1.0.133. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.130...v1.0.133) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Add rfc3339 removal changelog entry Bump anyhow from 1.0.51 to 1.0.52 Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.51 to 1.0.52. - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.51...1.0.52) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Bump serde_json from 1.0.68 to 1.0.74 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.68 to 1.0.74. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.68...v1.0.74) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Fix failing CI tests due to deleted xmrto docker hub images Fix failing CI tests due to deleted xmrto docker hub images by moving to the docker images provided by melotools Bump tempfile from 3.2.0 to 3.3.0 Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/Stebalien/tempfile/releases) - [Changelog](https://github.com/Stebalien/tempfile/blob/master/NEWS) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.2.0...v3.3.0) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Bump tempfile from 3.2.0 to 3.3.0 Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/Stebalien/tempfile/releases) - [Changelog](https://github.com/Stebalien/tempfile/blob/master/NEWS) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.2.0...v3.3.0) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Always write logs as JSON to files Bump torut from 0.2.0 to 0.2.1 Bumps [torut](https://github.com/teawithsand/torut) from 0.2.0 to 0.2.1. - [Release notes](https://github.com/teawithsand/torut/releases) - [Commits](https://github.com/teawithsand/torut/commits) --- updated-dependencies: - dependency-name: torut dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Bump time from 0.3.3 to 0.3.7 Bumps [time](https://github.com/time-rs/time) from 0.3.3 to 0.3.7. - [Release notes](https://github.com/time-rs/time/releases) - [Changelog](https://github.com/time-rs/time/blob/main/CHANGELOG.md) - [Commits](https://github.com/time-rs/time/compare/v0.3.3...v0.3.7) --- updated-dependencies: - dependency-name: time dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Bump tokio from 1.12.0 to 1.16.1 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.12.0 to 1.16.1. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.12.0...tokio-1.16.1) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Bump dialoguer from 0.8.0 to 0.10.0 Bumps [dialoguer](https://github.com/mitsuhiko/dialoguer) from 0.8.0 to 0.10.0. - [Release notes](https://github.com/mitsuhiko/dialoguer/releases) - [Changelog](https://github.com/mitsuhiko/dialoguer/blob/master/CHANGELOG.md) - [Commits](https://github.com/mitsuhiko/dialoguer/compare/0.8.0...v0.10.0) --- updated-dependencies: - dependency-name: dialoguer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Bump reqwest from 0.11.7 to 0.11.9 Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.7 to 0.11.9. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.7...v0.11.9) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Bump actions/setup-python from 2.3.1 to 2.3.2 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2.3.1...v2.3.2) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Adjust quote based on Bitcoin balance Update dependencies and rust-toolchain to 1.59 This commit updates the rust-toolchain to the current stable version 1.59, and fixes a number of new clippy warnings from that change. Other changes: - updates backoff to 0.4 - updates swap to 2021 edition - updates comfy-table to 5.0 - updates monero-wallet to 2021 edition - updates moneor-harness to 2021 edition - updates bdk and rust_decimal - updates tokio-util to 0.7 - updates workflow to use actions/setup-python@3 - updates pem and serde_with - adds stable rust toolchain notice to readme Change to rino nodes Update dprint plugins to fix CI error Bump futures from 0.3.17 to 0.3.21 Bumps [futures](https://github.com/rust-lang/futures-rs) from 0.3.17 to 0.3.21. - [Release notes](https://github.com/rust-lang/futures-rs/releases) - [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.17...0.3.21) --- updated-dependencies: - dependency-name: futures dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Bump structopt from 0.3.25 to 0.3.26 Bumps [structopt](https://github.com/TeXitoi/structopt) from 0.3.25 to 0.3.26. - [Release notes](https://github.com/TeXitoi/structopt/releases) - [Changelog](https://github.com/TeXitoi/structopt/blob/master/CHANGELOG.md) - [Commits](https://github.com/TeXitoi/structopt/compare/v0.3.25...v0.3.26) --- updated-dependencies: - dependency-name: structopt dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Bump serde from 1.0.133 to 1.0.136 Bumps [serde](https://github.com/serde-rs/serde) from 1.0.133 to 1.0.136. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.133...v1.0.136) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Bump hyper from 0.14.16 to 0.14.18 Bumps [hyper](https://github.com/hyperium/hyper) from 0.14.16 to 0.14.18. - [Release notes](https://github.com/hyperium/hyper/releases) - [Changelog](https://github.com/hyperium/hyper/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/hyper/compare/v0.14.16...v0.14.18) --- updated-dependencies: - dependency-name: hyper dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Inform Bob that he has been punished Reduce required confirmations for Bitcoin transactions from 2 to 1 Don't wait for refund transaction to receive confirmations Don't wait for refund transaction to receive confirmations to mitigate a scenario where the swap is stuck in `BtcCancelled` because it's not resumable. Check if binary is latest version Check if binary is latest version
341 lines
11 KiB
Rust
341 lines
11 KiB
Rust
use anyhow::{anyhow, Context, Result};
|
|
use futures::{SinkExt, StreamExt, TryStreamExt};
|
|
use serde::Deserialize;
|
|
use std::convert::{Infallible, TryFrom};
|
|
use std::sync::Arc;
|
|
use std::time::Duration;
|
|
use tokio::sync::watch;
|
|
use url::Url;
|
|
|
|
/// Connect to Kraken websocket API for a constant stream of rate updates.
|
|
///
|
|
/// If the connection fails, it will automatically be re-established.
|
|
///
|
|
/// price_ticker_ws_url must point to a websocket server that follows the kraken
|
|
/// price ticker protocol
|
|
/// See: https://docs.kraken.com/websockets/
|
|
pub fn connect(price_ticker_ws_url: Url) -> Result<PriceUpdates> {
|
|
let (price_update, price_update_receiver) = watch::channel(Err(Error::NotYetAvailable));
|
|
let price_update = Arc::new(price_update);
|
|
|
|
tokio::spawn(async move {
|
|
// The default backoff config is fine for us apart from one thing:
|
|
// `max_elapsed_time`. If we don't get an error within this timeframe,
|
|
// backoff won't actually retry the operation.
|
|
let backoff = backoff::ExponentialBackoff {
|
|
max_elapsed_time: None,
|
|
..backoff::ExponentialBackoff::default()
|
|
};
|
|
|
|
let result = backoff::future::retry_notify::<Infallible, _, _, _, _, _>(
|
|
backoff,
|
|
|| {
|
|
let price_update = price_update.clone();
|
|
let price_ticker_ws_url = price_ticker_ws_url.clone();
|
|
async move {
|
|
let mut stream = connection::new(price_ticker_ws_url).await?;
|
|
|
|
while let Some(update) = stream.try_next().await.map_err(to_backoff)? {
|
|
let send_result = price_update.send(Ok(update));
|
|
|
|
if send_result.is_err() {
|
|
return Err(backoff::Error::Permanent(anyhow!(
|
|
"receiver disconnected"
|
|
)));
|
|
}
|
|
}
|
|
|
|
Err(backoff::Error::transient(anyhow!("stream ended")))
|
|
}
|
|
},
|
|
|error, next: Duration| {
|
|
tracing::info!(
|
|
"Kraken websocket connection failed, retrying in {}ms. Error {:#}",
|
|
next.as_millis(),
|
|
error
|
|
);
|
|
},
|
|
)
|
|
.await;
|
|
|
|
match result {
|
|
Err(e) => {
|
|
tracing::warn!("Rate updates incurred an unrecoverable error: {:#}", e);
|
|
|
|
// in case the retries fail permanently, let the subscribers know
|
|
price_update.send(Err(Error::PermanentFailure))
|
|
}
|
|
Ok(never) => match never {},
|
|
}
|
|
});
|
|
|
|
Ok(PriceUpdates {
|
|
inner: price_update_receiver,
|
|
})
|
|
}
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub struct PriceUpdates {
|
|
inner: watch::Receiver<PriceUpdate>,
|
|
}
|
|
|
|
impl PriceUpdates {
|
|
pub async fn wait_for_next_update(&mut self) -> Result<PriceUpdate> {
|
|
self.inner.changed().await?;
|
|
|
|
Ok(self.inner.borrow().clone())
|
|
}
|
|
|
|
pub fn latest_update(&mut self) -> PriceUpdate {
|
|
self.inner.borrow().clone()
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug, thiserror::Error)]
|
|
pub enum Error {
|
|
#[error("Rate is not yet available")]
|
|
NotYetAvailable,
|
|
#[error("Permanently failed to retrieve rate from Kraken")]
|
|
PermanentFailure,
|
|
}
|
|
|
|
type PriceUpdate = Result<wire::PriceUpdate, Error>;
|
|
|
|
/// Maps a [`connection::Error`] to a backoff error, effectively defining our
|
|
/// retry strategy.
|
|
fn to_backoff(e: connection::Error) -> backoff::Error<anyhow::Error> {
|
|
use backoff::Error::*;
|
|
|
|
match e {
|
|
// Connection closures and websocket errors will be retried
|
|
connection::Error::ConnectionClosed => backoff::Error::transient(anyhow::Error::from(e)),
|
|
connection::Error::WebSocket(_) => backoff::Error::transient(anyhow::Error::from(e)),
|
|
|
|
// Failures while parsing a message are permanent because they most likely present a
|
|
// programmer error
|
|
connection::Error::Parse(_) => Permanent(anyhow::Error::from(e)),
|
|
}
|
|
}
|
|
|
|
/// Kraken websocket connection module.
|
|
///
|
|
/// Responsible for establishing a connection to the Kraken websocket API and
|
|
/// transforming the received websocket frames into a stream of rate updates.
|
|
/// The connection may fail in which case it is simply terminated and the stream
|
|
/// ends.
|
|
mod connection {
|
|
use super::*;
|
|
use crate::kraken::wire;
|
|
use futures::stream::BoxStream;
|
|
use tokio_tungstenite::tungstenite;
|
|
|
|
pub async fn new(ws_url: Url) -> Result<BoxStream<'static, Result<wire::PriceUpdate, Error>>> {
|
|
let (mut rate_stream, _) = tokio_tungstenite::connect_async(ws_url)
|
|
.await
|
|
.context("Failed to connect to Kraken websocket API")?;
|
|
|
|
rate_stream
|
|
.send(SUBSCRIBE_XMR_BTC_TICKER_PAYLOAD.into())
|
|
.await?;
|
|
|
|
let stream = rate_stream.err_into().try_filter_map(parse_message).boxed();
|
|
|
|
Ok(stream)
|
|
}
|
|
|
|
/// Parse a websocket message into a [`wire::PriceUpdate`].
|
|
///
|
|
/// Messages which are not actually ticker updates are ignored and result in
|
|
/// `None` being returned. In the context of a [`TryStream`], these will
|
|
/// simply be filtered out.
|
|
async fn parse_message(msg: tungstenite::Message) -> Result<Option<wire::PriceUpdate>, Error> {
|
|
let msg = match msg {
|
|
tungstenite::Message::Text(msg) => msg,
|
|
tungstenite::Message::Close(close_frame) => {
|
|
if let Some(tungstenite::protocol::CloseFrame { code, reason }) = close_frame {
|
|
tracing::debug!(
|
|
"Kraken rate stream was closed with code {} and reason: {}",
|
|
code,
|
|
reason
|
|
);
|
|
} else {
|
|
tracing::debug!("Kraken rate stream was closed without code and reason");
|
|
}
|
|
|
|
return Err(Error::ConnectionClosed);
|
|
}
|
|
msg => {
|
|
tracing::trace!(
|
|
"Kraken rate stream returned non text message that will be ignored: {}",
|
|
msg
|
|
);
|
|
|
|
return Ok(None);
|
|
}
|
|
};
|
|
|
|
let update = match serde_json::from_str::<wire::Event>(&msg) {
|
|
Ok(wire::Event::SystemStatus) => {
|
|
tracing::debug!("Connected to Kraken websocket API");
|
|
|
|
return Ok(None);
|
|
}
|
|
Ok(wire::Event::SubscriptionStatus) => {
|
|
tracing::debug!("Subscribed to updates for ticker");
|
|
|
|
return Ok(None);
|
|
}
|
|
Ok(wire::Event::Heartbeat) => {
|
|
tracing::trace!("Received heartbeat message");
|
|
|
|
return Ok(None);
|
|
}
|
|
// if the message is not an event, it is a ticker update or an unknown event
|
|
Err(_) => match serde_json::from_str::<wire::PriceUpdate>(&msg) {
|
|
Ok(ticker) => ticker,
|
|
Err(error) => {
|
|
tracing::warn!(%msg, "Failed to deserialize message as ticker update. Error {:#}", error);
|
|
return Ok(None);
|
|
}
|
|
},
|
|
};
|
|
|
|
Ok(Some(update))
|
|
}
|
|
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum Error {
|
|
#[error("The Kraken server closed the websocket connection")]
|
|
ConnectionClosed,
|
|
#[error("Failed to read message from websocket stream")]
|
|
WebSocket(#[from] tungstenite::Error),
|
|
#[error("Failed to parse rate from websocket message")]
|
|
Parse(#[from] wire::Error),
|
|
}
|
|
|
|
const SUBSCRIBE_XMR_BTC_TICKER_PAYLOAD: &str = r#"
|
|
{ "event": "subscribe",
|
|
"pair": [ "XMR/XBT" ],
|
|
"subscription": {
|
|
"name": "ticker"
|
|
}
|
|
}"#;
|
|
}
|
|
|
|
/// Kraken websocket API wire module.
|
|
///
|
|
/// Responsible for parsing websocket text messages to events and rate updates.
|
|
mod wire {
|
|
use super::*;
|
|
use bitcoin::util::amount::ParseAmountError;
|
|
use serde_json::Value;
|
|
|
|
#[derive(Debug, Deserialize, PartialEq)]
|
|
#[serde(tag = "event")]
|
|
pub enum Event {
|
|
#[serde(rename = "systemStatus")]
|
|
SystemStatus,
|
|
#[serde(rename = "heartbeat")]
|
|
Heartbeat,
|
|
#[serde(rename = "subscriptionStatus")]
|
|
SubscriptionStatus,
|
|
}
|
|
|
|
#[derive(Clone, Debug, thiserror::Error)]
|
|
pub enum Error {
|
|
#[error("Data field is missing")]
|
|
DataFieldMissing,
|
|
#[error("Ask Rate Element is of unexpected type")]
|
|
UnexpectedAskRateElementType,
|
|
#[error("Ask Rate Element is missing")]
|
|
MissingAskRateElementType,
|
|
#[error("Failed to parse Bitcoin amount")]
|
|
BitcoinParseAmount(#[from] ParseAmountError),
|
|
}
|
|
|
|
/// Represents an update within the price ticker.
|
|
#[derive(Clone, Debug, Deserialize)]
|
|
#[serde(try_from = "TickerUpdate")]
|
|
pub struct PriceUpdate {
|
|
pub ask: bitcoin::Amount,
|
|
}
|
|
|
|
#[derive(Debug, Deserialize)]
|
|
#[serde(transparent)]
|
|
pub struct TickerUpdate(Vec<TickerField>);
|
|
|
|
#[derive(Debug, Deserialize)]
|
|
#[serde(untagged)]
|
|
pub enum TickerField {
|
|
Data(TickerData),
|
|
Metadata(Value),
|
|
}
|
|
|
|
#[derive(Debug, Deserialize)]
|
|
pub struct TickerData {
|
|
#[serde(rename = "a")]
|
|
ask: Vec<RateElement>,
|
|
}
|
|
|
|
#[derive(Debug, Deserialize)]
|
|
#[serde(untagged)]
|
|
pub enum RateElement {
|
|
Text(String),
|
|
Number(u64),
|
|
}
|
|
|
|
impl TryFrom<TickerUpdate> for PriceUpdate {
|
|
type Error = Error;
|
|
|
|
fn try_from(value: TickerUpdate) -> Result<Self, Error> {
|
|
let data = value
|
|
.0
|
|
.iter()
|
|
.find_map(|field| match field {
|
|
TickerField::Data(data) => Some(data),
|
|
TickerField::Metadata(_) => None,
|
|
})
|
|
.ok_or(Error::DataFieldMissing)?;
|
|
let ask = data.ask.first().ok_or(Error::MissingAskRateElementType)?;
|
|
let ask = match ask {
|
|
RateElement::Text(ask) => {
|
|
bitcoin::Amount::from_str_in(ask, ::bitcoin::Denomination::Bitcoin)?
|
|
}
|
|
_ => return Err(Error::UnexpectedAskRateElementType),
|
|
};
|
|
|
|
Ok(PriceUpdate { ask })
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn can_deserialize_system_status_event() {
|
|
let event = r#"{"connectionID":14859574189081089471,"event":"systemStatus","status":"online","version":"1.8.1"}"#;
|
|
|
|
let event = serde_json::from_str::<Event>(event).unwrap();
|
|
|
|
assert_eq!(event, Event::SystemStatus)
|
|
}
|
|
|
|
#[test]
|
|
fn can_deserialize_subscription_status_event() {
|
|
let event = r#"{"channelID":980,"channelName":"ticker","event":"subscriptionStatus","pair":"XMR/XBT","status":"subscribed","subscription":{"name":"ticker"}}"#;
|
|
|
|
let event = serde_json::from_str::<Event>(event).unwrap();
|
|
|
|
assert_eq!(event, Event::SubscriptionStatus)
|
|
}
|
|
|
|
#[test]
|
|
fn deserialize_ticker_update() {
|
|
let message = r#"[980,{"a":["0.00440700",7,"7.35318535"],"b":["0.00440200",7,"7.57416678"],"c":["0.00440700","0.22579000"],"v":["273.75489000","4049.91233351"],"p":["0.00446205","0.00441699"],"t":[123,1310],"l":["0.00439400","0.00429900"],"h":["0.00450000","0.00450000"],"o":["0.00449100","0.00433700"]},"ticker","XMR/XBT"]"#;
|
|
|
|
let _ = serde_json::from_str::<TickerUpdate>(message).unwrap();
|
|
}
|
|
}
|
|
}
|