Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-12-13 18:04:31 -05:00
Code Issues Packages Projects Releases Wiki Activity
ff68a1c1b5
xmr-btc-swap/swap/Cargo.toml

80 lines
2.8 KiB
TOML
Raw Normal View History

Add swap/ Add a binary crate `swap` that implements two nodes (Alice and Bob). With this applied we can start up a node for each role and do: - Bob: Requests current amounts using BTC is input - Alice: Responds with amounts - Bob: (mock) get user input to Ok the amounts ... continue with swap (TODO)
2020-10-15 18:14:39 -04:00
[package]
name = "swap"
Prepare release 0.4.0
2021-04-06 04:20:31 -04:00
version = "0.4.0"
Say who we are in the `--help` message The message now says: swap 0.3.0 The COMIT guys <hello@comit.network> CLI for swapping BTC for XMR USAGE: swap [FLAGS] [OPTIONS] <SUBCOMMAND> ...
2021-03-25 23:31:14 -04:00
authors = ["The COMIT guys <hello@comit.network>"]
Add swap/ Add a binary crate `swap` that implements two nodes (Alice and Bob). With this applied we can start up a node for each role and do: - Bob: Requests current amounts using BTC is input - Alice: Responds with amounts - Bob: (mock) get user input to Ok the amounts ... continue with swap (TODO)
2020-10-15 18:14:39 -04:00
edition = "2018"
description = "XMR/BTC trustless atomic swaps."
Move main.rs to cli.rs to prepare for nectar binary
2021-02-04 00:42:14 -05:00
[lib]
name = "swap"
Add swap/ Add a binary crate `swap` that implements two nodes (Alice and Bob). With this applied we can start up a node for each role and do: - Bob: Requests current amounts using BTC is input - Alice: Responds with amounts - Bob: (mock) get user input to Ok the amounts ... continue with swap (TODO)
2020-10-15 18:14:39 -04:00
[dependencies]
anyhow = "1"
Download and run monero wallet rpc on swap cli startup If the monero wallet rpc has not already been downloaded we download the monero cli package and extract the wallet rpc. The unneeded files are cleaned up. The monero wallet rpc is started on a random port which is provided to the swap cli. We added a fork of tokio-tar via a git subtree because we needed a tokio-tar version that was compatible with tokio 1.0. Remove this subtree in favor of a regular cargo dependency when this PR merges: https://github.com/vorot93/tokio-tar/pull/3.
2021-02-24 02:08:25 -05:00
async-compression = { version = "0.3", features = ["bzip2", "tokio"] }
Fix clippy warnings and formatting
2020-11-30 23:38:24 -05:00
async-trait = "0.1"
Add swap/ Add a binary crate `swap` that implements two nodes (Alice and Bob). With this applied we can start up a node for each role and do: - Bob: Requests current amounts using BTC is input - Alice: Responds with amounts - Bob: (mock) get user input to Ok the amounts ... continue with swap (TODO)
2020-10-15 18:14:39 -04:00
atty = "0.2"
Use released version of backoff
2021-02-18 20:33:59 -05:00
backoff = { version = "0.3", features = ["tokio"] }
Bump base64 from 0.12.3 to 0.13.0 Bumps [base64](https://github.com/marshallpierce/rust-base64) from 0.12.3 to 0.13.0. - [Release notes](https://github.com/marshallpierce/rust-base64/releases) - [Changelog](https://github.com/marshallpierce/rust-base64/blob/master/RELEASE-NOTES.md) - [Commits](https://github.com/marshallpierce/rust-base64/compare/v0.12.3...v0.13.0) Signed-off-by: dependabot[bot] <support@github.com>
2021-03-17 03:53:32 -04:00
base64 = "0.13"
Point BDK to commit that fixes overflow error Edge cases of UTXOs where value < fee cause the BDK's `coin_select` calculation to panic. This issue was fixed upstream thus we point the BDK dependency against the commit of the merged fix.
2021-04-01 01:46:39 -04:00
bdk = { git = "https://github.com/bitcoindevkit/bdk.git", rev = "e5ecc7f" }
Tell the user about the monero-wallet-rpc download Fixes #242.
2021-02-28 19:46:53 -05:00
big-bytes = "1"
Upgrade to bdk 4.0 To achieve this we also: - upgrade rust-bitcoin to 0.26 - upgrade bitcoin-harness to latest version (which also depends bitcoin 0.26) - upgrade to latest edcsa-fun - replace cross_curve_dleq proof with sigma_fun (to avoid an upgrade dance over there)
2021-02-17 21:33:50 -05:00
bitcoin = { version = "0.26", features = ["rand", "use-serde"] }
Use bmrng to model communicaton of Bob's EventLoop with the handle bmrng is a library providing a request-response channel that allows the receiving end of the channel to send a response back to the sender. This allows us to more accurately implement the functions on the `EventLoopHandle`. In particular, we now _wait_ for the ACK of specific messages from the other party before resolving the future. For example, when sending the encrypted signature, the async function on the `EventLoopHandle` does not resolve until we received the ACK from the other party. We also delete the `Channels` abstraction in favor of directly creating bmrng channels. This allows us to directly control the channel buffer which we set to 1 because we don't need more than that on Bob's side.
2021-03-29 18:59:51 -04:00
bmrng = "0.5"
Bump dependency versions Otherwise it will take a long time for dependabot to update all of these.
2021-03-18 00:30:09 -04:00
config = { version = "0.11", default-features = false, features = ["toml"] }
Extract execution details from driving loop
2020-11-25 00:27:57 -05:00
conquer-once = "0.3"
Upgrade to bdk 4.0 To achieve this we also: - upgrade rust-bitcoin to 0.26 - upgrade bitcoin-harness to latest version (which also depends bitcoin 0.26) - upgrade to latest edcsa-fun - replace cross_curve_dleq proof with sigma_fun (to avoid an upgrade dance over there)
2021-02-17 21:33:50 -05:00
curve25519-dalek = "3"
Bump dialoguer from 0.7.1 to 0.8.0 Bumps [dialoguer](https://github.com/mitsuhiko/dialoguer) from 0.7.1 to 0.8.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.7.1...0.8.0) Signed-off-by: dependabot[bot] <support@github.com>
2021-03-17 03:53:12 -04:00
dialoguer = "0.8"
Configuration for RPC urls and Bitcoin wallet name
2021-01-26 21:33:32 -05:00
directories-next = "2"
Upgrade to bdk 4.0 To achieve this we also: - upgrade rust-bitcoin to 0.26 - upgrade bitcoin-harness to latest version (which also depends bitcoin 0.26) - upgrade to latest edcsa-fun - replace cross_curve_dleq proof with sigma_fun (to avoid an upgrade dance over there)
2021-02-17 21:33:50 -05:00
ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", features = ["libsecp_compat", "serde"] }
Add swap/ Add a binary crate `swap` that implements two nodes (Alice and Bob). With this applied we can start up a node for each role and do: - Bob: Requests current amounts using BTC is input - Alice: Responds with amounts - Bob: (mock) get user input to Ok the amounts ... continue with swap (TODO)
2020-10-15 18:14:39 -04:00
futures = { version = "0.3", default-features = false }
Distinguish loading all swaps for alice or bob on db level
2021-03-26 00:16:19 -04:00
itertools = "0.10"
Bump dependency versions Otherwise it will take a long time for dependabot to update all of these.
2021-03-18 00:30:09 -04:00
libp2p = { version = "0.36", default-features = false, features = ["tcp-tokio", "yamux", "mplex", "dns-tokio", "noise", "request-response"] }
libp2p-async-await = { git = "https://github.com/comit-network/rust-libp2p-async-await" }
Upgrade to bdk 4.0 To achieve this we also: - upgrade rust-bitcoin to 0.26 - upgrade bitcoin-harness to latest version (which also depends bitcoin 0.26) - upgrade to latest edcsa-fun - replace cross_curve_dleq proof with sigma_fun (to avoid an upgrade dance over there)
2021-02-17 21:33:50 -05:00
miniscript = { version = "5", features = ["serde"] }
Bump monero from 0.10.0 to 0.11.1 Bumps [monero](https://github.com/monero-rs/monero-rs) from 0.10.0 to 0.11.1. - [Release notes](https://github.com/monero-rs/monero-rs/releases) - [Commits](https://github.com/monero-rs/monero-rs/compare/v0.10.0...v0.11.1) Signed-off-by: dependabot[bot] <support@github.com>
2021-03-30 03:26:53 -04:00
monero = { version = "0.11", features = ["serde_support"] }
Split monero-harness into harness and rpc This allows us to move `monero-harness` and `bitcoin-harness` into `[dev-dependencies]` of `swap`.
2021-02-21 20:32:15 -05:00
monero-rpc = { path = "../monero-rpc" }
Deterministic peer id from seed for alice This includes the introduction of the --data-dir parameter instead of the --database. Both the seed file and the database are stored in the data-dir, the database in sub-folder `database`.
2021-01-07 20:04:48 -05:00
pem = "0.8"
Print swap history on --history flag
2020-11-03 00:44:04 -05:00
prettytable-rs = "0.8"
Add swap/ Add a binary crate `swap` that implements two nodes (Alice and Bob). With this applied we can start up a node for each role and do: - Bob: Requests current amounts using BTC is input - Alice: Responds with amounts - Bob: (mock) get user input to Ok the amounts ... continue with swap (TODO)
2020-10-15 18:14:39 -04:00
rand = "0.7"
Bump dependency versions Otherwise it will take a long time for dependabot to update all of these.
2021-03-18 00:30:09 -04:00
rand_chacha = "0.2"
Download and run monero wallet rpc on swap cli startup If the monero wallet rpc has not already been downloaded we download the monero cli package and extract the wallet rpc. The unneeded files are cleaned up. The monero wallet rpc is started on a random port which is provided to the swap cli. We added a fork of tokio-tar via a git subtree because we needed a tokio-tar version that was compatible with tokio 1.0. Remove this subtree in favor of a regular cargo dependency when this PR merges: https://github.com/vorot93/tokio-tar/pull/3.
2021-02-24 02:08:25 -05:00
reqwest = { version = "0.11", features = ["rustls-tls", "stream"], default-features = false }
Bump dependency versions Otherwise it will take a long time for dependabot to update all of these.
2021-03-18 00:30:09 -04:00
rust_decimal = "1"
Add swap/ Add a binary crate `swap` that implements two nodes (Alice and Bob). With this applied we can start up a node for each role and do: - Bob: Requests current amounts using BTC is input - Alice: Responds with amounts - Bob: (mock) get user input to Ok the amounts ... continue with swap (TODO)
2020-10-15 18:14:39 -04:00
serde = { version = "1", features = ["derive"] }
Move storage into application crate
2020-10-22 22:13:17 -04:00
serde_cbor = "0.11"
Add swap/ Add a binary crate `swap` that implements two nodes (Alice and Bob). With this applied we can start up a node for each role and do: - Bob: Requests current amounts using BTC is input - Alice: Responds with amounts - Bob: (mock) get user input to Ok the amounts ... continue with swap (TODO)
2020-10-15 18:14:39 -04:00
serde_json = "1"
Implement swap recover function for Bob
2020-11-04 23:48:31 -05:00
sha2 = "0.9"
Upgrade to bdk 4.0 To achieve this we also: - upgrade rust-bitcoin to 0.26 - upgrade bitcoin-harness to latest version (which also depends bitcoin 0.26) - upgrade to latest edcsa-fun - replace cross_curve_dleq proof with sigma_fun (to avoid an upgrade dance over there)
2021-02-17 21:33:50 -05:00
sigma_fun = { git = "https://github.com/LLFourn/secp256kfun", features = ["ed25519", "serde"] }
Move storage into application crate
2020-10-22 22:13:17 -04:00
sled = "0.34"
Add swap/ Add a binary crate `swap` that implements two nodes (Alice and Bob). With this applied we can start up a node for each role and do: - Bob: Requests current amounts using BTC is input - Alice: Responds with amounts - Bob: (mock) get user input to Ok the amounts ... continue with swap (TODO)
2020-10-15 18:14:39 -04:00
structopt = "0.3"
Align Alice DB states with swap states
2020-12-22 00:28:14 -05:00
strum = { version = "0.20", features = ["derive"] }
Merge xmr_btc crate Created network, storage and protocol modules. Organised files into the modules where the belong. xmr_btc crate moved into isolated modulein swap crate. Remove the xmr_btc module and integrate into swap crate. Consolidate message related code Reorganise imports Remove unused parent Message enum Remove unused parent State enum Remove unused dependencies from Cargo.toml
2021-01-04 22:08:36 -05:00
thiserror = "1"
Add swap/ Add a binary crate `swap` that implements two nodes (Alice and Bob). With this applied we can start up a node for each role and do: - Bob: Requests current amounts using BTC is input - Alice: Responds with amounts - Bob: (mock) get user input to Ok the amounts ... continue with swap (TODO)
2020-10-15 18:14:39 -04:00
time = "0.2"
Bump dependency versions Otherwise it will take a long time for dependabot to update all of these.
2021-03-18 00:30:09 -04:00
tokio = { version = "1", features = ["rt-multi-thread", "time", "macros", "sync", "process", "fs"] }
Remove openssl dependency Upgrade tokio-tungstenite to 0.14 and use feature flag rustls-tls to get rid of the openssl dependency.
2021-03-14 22:59:14 -04:00
tokio-tungstenite = { version = "0.14", features = [ "rustls-tls" ] }
Bump dependency versions Otherwise it will take a long time for dependabot to update all of these.
2021-03-18 00:30:09 -04:00
tokio-util = { version = "0.6", features = ["io"] }
Configuration for RPC urls and Bitcoin wallet name
2021-01-26 21:33:32 -05:00
toml = "0.5"
Add swap/ Add a binary crate `swap` that implements two nodes (Alice and Bob). With this applied we can start up a node for each role and do: - Bob: Requests current amounts using BTC is input - Alice: Responds with amounts - Bob: (mock) get user input to Ok the amounts ... continue with swap (TODO)
2020-10-15 18:14:39 -04:00
tracing = { version = "0.1", features = ["attributes"] }
Log at debug level to file EnvFilter is applied globally. This means you cannot log at INFO level to the terminal and at DEBUG level to log files. To get a around this limitation I had to implement the layer trait on a new type and filter in the on_event() trait method. Each swap has its own log file denoted by its swap_id. The logger appends to the existing file when resuming a swap. Closes #278
2021-04-02 03:22:51 -04:00
tracing-appender = "0.1"
Add swap/ Add a binary crate `swap` that implements two nodes (Alice and Bob). With this applied we can start up a node for each role and do: - Bob: Requests current amounts using BTC is input - Alice: Responds with amounts - Bob: (mock) get user input to Ok the amounts ... continue with swap (TODO)
2020-10-15 18:14:39 -04:00
tracing-futures = { version = "0.2", features = ["std-future", "futures-03"] }
Use `tracing-log` feature flag instead of manual initialization This also formats `log` events more nicely. Instead of ``` Mar 29 09:46:16.775 INFO log: Found message after comparing 82 lines log.target="testcontainers::core::wait_for_message" log.module_path="testcontainers::core::wait_for_message" log.file="/home/thomas/.cargo/registry/src/github.com-1ecc6299db9ec823/testcontainers-0.12.0/src/core/wait_for_message.rs" log.line=35 ``` We now have ``` Mar 29 09:57:15.860 INFO testcontainers::core::wait_for_message: Found message after comparing 81 lines ```
2021-03-28 18:48:56 -04:00
tracing-subscriber = { version = "0.2", default-features = false, features = ["fmt", "ansi", "env-filter", "chrono", "tracing-log"] }
Bump dependency versions Otherwise it will take a long time for dependabot to update all of these.
2021-03-18 00:30:09 -04:00
url = { version = "2", features = ["serde"] }
Support saving multiple swaps By replacing `LAST_STATE_KEY` with a swap ID passed as an argument to inserting and reading from the database.
2020-11-02 22:23:03 -05:00
uuid = { version = "0.8", features = ["serde", "v4"] }
Add swap/ Add a binary crate `swap` that implements two nodes (Alice and Bob). With this applied we can start up a node for each role and do: - Bob: Requests current amounts using BTC is input - Alice: Responds with amounts - Bob: (mock) get user input to Ok the amounts ... continue with swap (TODO)
2020-10-15 18:14:39 -04:00
void = "1"
Moving tor into swap
2020-10-22 19:32:48 -04:00
Add windows support to monero rpc installer
2021-03-01 01:34:25 -05:00
[target.'cfg(not(windows))'.dependencies]
tokio-tar = { path = "../tokio-tar" }
[target.'cfg(windows)'.dependencies]
zip = "0.5"
Moving tor into swap
2020-10-22 19:32:48 -04:00
[dev-dependencies]
Bump bdk-testutils from 0.3.0 to 0.4.0 Bumps [bdk-testutils](https://github.com/bitcoindevkit/bdk) from 0.3.0 to 0.4.0. - [Release notes](https://github.com/bitcoindevkit/bdk/releases) - [Changelog](https://github.com/bitcoindevkit/bdk/blob/master/CHANGELOG.md) - [Commits](https://github.com/bitcoindevkit/bdk/compare/v0.3.0...v0.4.0) Signed-off-by: dependabot[bot] <support@github.com>
2021-03-30 03:26:39 -04:00
bdk-testutils = { version = "0.4" }
Split monero-harness into harness and rpc This allows us to move `monero-harness` and `bitcoin-harness` into `[dev-dependencies]` of `swap`.
2021-02-21 20:32:15 -05:00
bitcoin-harness = { git = "https://github.com/coblox/bitcoin-harness-rs" }
Replace hard coded port by dynamic available one Fixes #84.
2020-12-17 19:54:13 -05:00
get-port = "3"
Upgrade tokio to 1.0 Upgrade bitcoin harness dependency to latest commit Upgrade backoff to fix failing tests. The previous version of backoff had a broken version of the retry function. Upgraded to a newer comit which fixes this problem. Upgrade hyper to 0.14 as the 0.13 was bringing in tokio 0.2.24 Upgraded bitcoin harness to version that uses tokio 1.0 and reqwest 0.11 Upgrade reqwest to 0.11. Reqwest 0.11 uses tokio 1.0 Upgrade libp2p to 0.34 in preparation for tokio 1.0 upgrade
2021-01-15 00:58:16 -05:00
hyper = "0.14"
Split monero-harness into harness and rpc This allows us to move `monero-harness` and `bitcoin-harness` into `[dev-dependencies]` of `swap`.
2021-02-21 20:32:15 -05:00
monero-harness = { path = "../monero-harness" }
Moving tor into swap
2020-10-22 19:32:48 -04:00
port_check = "0.1"
Merge xmr_btc crate Created network, storage and protocol modules. Organised files into the modules where the belong. xmr_btc crate moved into isolated modulein swap crate. Remove the xmr_btc module and integrate into swap crate. Consolidate message related code Reorganise imports Remove unused parent Message enum Remove unused parent State enum Remove unused dependencies from Cargo.toml
2021-01-04 22:08:36 -05:00
serde_cbor = "0.11"
Moving tor into swap
2020-10-22 19:32:48 -04:00
spectral = "0.6"
tempfile = "3"
Upgrade to testcontainers v0.12
2021-02-16 01:09:09 -05:00
testcontainers = "0.12"
Reference in New Issue Copy Permalink