mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2024-07-15 15:51:53 +00:00
5ff46be279
* saving: implementing internal api shared by cli and rpc server * writing async rpc methods and using arc for shared struct references * cleaning up, renamed Init to Context * saving: cleaning up and initial work for tests * Respond with bitcoin withdraw txid * Print RPC server address * Cleanup, formatting, add `get_seller`, `get_swap_start_date` RPC endpoints * fixing tests in cli module * uncommenting and fixing more tests * split api module and propagate errors with rpc server * moving methods to api and validating addresses for rpc * add broadcast channel to handle shutdowns gracefully and prepare for RPC server test * added files * Update rpc.rs * adding new unfinished RPC tests * updating rpc-server tests * fixing warnings * fixing formatting and cargo clippy warnings * fix missing import in test * fix: add data_dir to config to make config command work * set server listen address manually and return file locations in JSON on Config * Add called api method and swap_id to tracing for context, reduced boilerplate * Pass server_address properly to RpcServer * Update Cargo.lock * dprint fmt * Add cancel_refund RPC endpoint * Combine Cmd and Params * Disallow concurrent swaps * Use RwLock instead of Mutex to allow for parallel reads and add get_current_swap endpoint * Return wallet descriptor to RPC API caller * Append all cli logs to single log file After careful consideration, I've concluded that it's not practical/possible to ensure that the previous behaviour (one log file per swap) is preserved due to limitations of the tracing-subscriber crate and a big in the built in JSON formatter * Add get_swap_expired_timelock timelock, other small refactoring - Add get_swap_expired_timelock endpoint to return expired timelock if one exists. Fails if bitcoin lock tx has not yet published or if swap is already finished. - Rename current_epoch to expired_timelock to enforce consistent method names - Add blocks left until current expired timelock expires (next timelock expires) to ExpiredTimelock struct - Change .expect() to .unwrap() in rpc server method register because those will only fail if we register the same method twice which will never happen * initiating swaps in a separate task and handling shutdown signals with broadcast queues * Replace get_swap_start_date, get_seller, get_expired_timelock with one get_swap_info rpc method * WIP: Struct for concurrent swaps manager * Ensure correct tracing spans * Add note regarding Request, Method structs * Update request.rs * Add tracing span attribute log_reference_id to logs caused by rpc call * Sync bitcoin wallet before initial max_giveable call * use Span::current() to pass down to tracing span to spawned tasks * Remove unused shutdown channel * Add `get_monero_recovery_info` RPC endpoint - Add `get_monero_recovery_info` RPC endpoint - format PrivateViewKey using Display * Rename `Method::RawHistory` to `Method::GetRawStates` * Wait for swap to be suspended after sending signal * Remove notes * Add tracing span attribute log_reference_id to logs caused by rpc call * Sync bitcoin wallet before initial max_giveable call * use Span::current() to pass down to tracing span to spawned tasks * Remove unused shutdown channel * Add `get_monero_recovery_info` RPC endpoint - Add `get_monero_recovery_info` RPC endpoint - format PrivateViewKey using Display * Rename `Method::RawHistory` to `Method::GetRawStates` * Wait for swap to be suspended after sending signal * Return additonal info on GetSwapInfo * Update wallet.rs * fix compile issues for tests and use serial_test crate * fix rpc tests, only check for RPC errors and not returned values * Rename `get_raw_history` tp `get_raw_states` * Fix typo in rpc server stopped tracing log * Remove unnecessary success property on suspend_current_swap response * fixing test_cli_arguments and other tests * WIP: RPC server integration tests * WIP: Integration tests for RPC server * Update rpc tests * fix compile and warnings in tests/rpc.rs * test: fix assert * clippy --fix * remove otp file * cargo clippy fixes * move resume swap initialization code out of spawned task * Use `in_current_span` to pass down tracing span to spawned tasks * moving buy_xmr initialization code out of spawned tasks * cargo fmt * Moving swap initialization code inside tokio select block to handle swap lock release logic * Remove unnecessary swap suspension listener from determine_btc_to_swap call in BuyXmr * Spawn event loop before requesting quote * Release swap lock after receiving shutdown signal * Remove inner tokio::select in BuyXmr and Resume * Improve debug text for swap resume * Return error to API caller if bid quote request fails * Print error if one occurs during process invoked by API call * Return bid quote to API caller * Use type safe query! macro for database retrieval of states * Return tx_lock_fee to API caller on GetSwapInfo call Update request.rs * Allow API caller to retrieve last synced bitcoin balane and avoid costly sync * Return restore height on MoneroRecovery command to API Caller * Include entire error cause-chain in API response * Add span to bitcoin wallet logs * Log event loop connection properties as tracing fields * Wait for background tasks to complete before exiting CLI * clippy * specify sqlx patch version explicitly * remove mem::forget and replace with _guard * ci: add rpc test job * test: wrap rpc test in #[cfg(test)] * add missing tokio::test attribute * fix and merge rpc tests, parse uuuid and multiaddr from serde_json value * default Tor socks port to 9050, Cargo fmt * Update swap/sqlite_dev_setup.sh: add version Co-authored-by: Byron Hambly <byron@hambly.dev> * ci: free up space on ubuntu test job * Update swap/src/bitcoin/wallet.rs Co-authored-by: Byron Hambly <byron@hambly.dev> * Update swap/src/bitcoin/wallet.rs Co-authored-by: Byron Hambly <byron@hambly.dev> * fmt --------- Co-authored-by: binarybaron <86064887+binarybaron@users.noreply.github.com> Co-authored-by: Byron Hambly <byron@hambly.dev>
98 lines
3.5 KiB
TOML
98 lines
3.5 KiB
TOML
[package]
|
|
name = "swap"
|
|
version = "0.12.3"
|
|
authors = [ "The COMIT guys <hello@comit.network>" ]
|
|
edition = "2021"
|
|
description = "XMR/BTC trustless atomic swaps."
|
|
|
|
[lib]
|
|
name = "swap"
|
|
|
|
[dependencies]
|
|
anyhow = "1"
|
|
async-compression = { version = "0.3", features = [ "bzip2", "tokio" ] }
|
|
async-trait = "0.1"
|
|
atty = "0.2"
|
|
backoff = { version = "0.4", features = [ "tokio" ] }
|
|
base64 = "0.22"
|
|
bdk = "0.28"
|
|
big-bytes = "1"
|
|
bitcoin = { version = "0.29", features = [ "rand", "serde" ] }
|
|
bmrng = "0.5"
|
|
comfy-table = "7.1"
|
|
config = { version = "0.14", default-features = false, features = [ "toml" ] }
|
|
conquer-once = "0.4"
|
|
curve25519-dalek = { package = "curve25519-dalek-ng", version = "4" }
|
|
data-encoding = "2.6"
|
|
dialoguer = "0.11"
|
|
digest = "0.10.7"
|
|
directories-next = "2"
|
|
ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", default-features = false, features = [ "libsecp_compat", "serde", "adaptor" ] }
|
|
ed25519-dalek = "1"
|
|
futures = { version = "0.3", default-features = false }
|
|
hex = "0.4"
|
|
itertools = "0.13"
|
|
jsonrpsee = { version = "0.16.2", features = [ "server" ] }
|
|
jsonrpsee-core = "0.16.2"
|
|
libp2p = { version = "0.42.2", default-features = false, features = [ "tcp-tokio", "yamux", "mplex", "dns-tokio", "noise", "request-response", "websocket", "ping", "rendezvous", "identify" ] }
|
|
monero = { version = "0.12", features = [ "serde_support" ] }
|
|
monero-rpc = { path = "../monero-rpc" }
|
|
pem = "3.0"
|
|
proptest = "1"
|
|
qrcode = "0.14"
|
|
rand = "0.8"
|
|
rand_chacha = "0.3"
|
|
reqwest = { version = "0.11", features = [ "rustls-tls", "stream", "socks" ], default-features = false }
|
|
rust_decimal = { version = "1", features = [ "serde-float" ] }
|
|
rust_decimal_macros = "1"
|
|
serde = { version = "1", features = [ "derive" ] }
|
|
serde_cbor = "0.11"
|
|
serde_json = "1"
|
|
serde_with = { version = "1", features = [ "macros" ] }
|
|
sha2 = "0.10"
|
|
sigma_fun = { git = "https://github.com/LLFourn/secp256kfun", default-features = false, features = [ "ed25519", "serde", "secp256k1", "alloc" ] }
|
|
sqlx = { version = "0.6.3", features = [ "sqlite", "runtime-tokio-rustls", "offline" ] }
|
|
structopt = "0.3"
|
|
strum = { version = "0.26", features = [ "derive" ] }
|
|
thiserror = "1"
|
|
time = "0.3"
|
|
tokio = { version = "1", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net", "parking_lot" ] }
|
|
tokio-socks = "0.5"
|
|
tokio-tungstenite = { version = "0.15", features = [ "rustls-tls" ] }
|
|
tokio-util = { version = "0.7", features = [ "io", "codec" ] }
|
|
toml = "0.8"
|
|
torut = { version = "0.2", default-features = false, features = [ "v3", "control" ] }
|
|
tracing = { version = "0.1", features = [ "attributes" ] }
|
|
tracing-appender = "0.2"
|
|
tracing-futures = { version = "0.2", features = [ "std-future", "futures-03" ] }
|
|
tracing-subscriber = { version = "0.3", default-features = false, features = [ "fmt", "ansi", "env-filter", "time", "tracing-log", "json" ] }
|
|
url = { version = "2", features = [ "serde" ] }
|
|
uuid = { version = "1.8", features = [ "serde", "v4" ] }
|
|
void = "1"
|
|
|
|
[target.'cfg(not(windows))'.dependencies]
|
|
tokio-tar = "0.3"
|
|
|
|
[target.'cfg(windows)'.dependencies]
|
|
zip = "0.5"
|
|
|
|
[dev-dependencies]
|
|
bitcoin-harness = "0.2.2"
|
|
get-port = "3"
|
|
hyper = "1.3"
|
|
jsonrpsee = { version = "0.16.2", features = [ "ws-client" ] }
|
|
mockito = "1.3.0"
|
|
monero-harness = { path = "../monero-harness" }
|
|
port_check = "0.2"
|
|
proptest = "1"
|
|
sequential-test = "0.2.4"
|
|
serde_cbor = "0.11"
|
|
serial_test = "3.0"
|
|
spectral = "0.6"
|
|
tempfile = "3"
|
|
testcontainers = "0.14"
|
|
|
|
[build-dependencies]
|
|
anyhow = "1"
|
|
vergen = { version = "8.3", default-features = false, features = [ "build", "git", "git2" ] }
|