Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-12-12 01:14:28 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,286 Commits 73 Branches 28 Tags 80 MiB
ce3134c86a
Commit Graph

1286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rishflab
a44303f839 Add monerod to config 
Fixed rebase issues
 2020-11-03 16:08:46 +11:00
rishflab
7afd316210 Construct tor transport for Bob 2020-11-03 15:13:25 +11:00
rishflab
3b008c38a6 Remove redundant code and stale comments 2020-11-03 15:13:25 +11:00
rishflab
249f273d1b Remove stale comments 2020-11-03 15:13:25 +11:00
rishflab
5971ef1f28 Fix clippy warnings 2020-11-03 15:13:23 +11:00
rishflab
606c48c752 Format swap crate Cargo.toml 2020-11-03 15:13:03 +11:00
rishflab
796d0b3439 Extract transport creation and remove tor conditional compile 
The numerous tor conditional compile flags were removed by
extracting transport creation to the main statement. A tor
transport is created if Alice specifies a tor port using the CLI.
 2020-11-03 15:12:52 +11:00
rishflab
0ca511bf8a Remove hardcoded configuration 
The hardcoded configuration was replaced with CLI
configuration options. CLI based config was chosen
over a config file as it does not access and clutter
the user's file system. By CLI options depend on whether
the program is run in Alice or Bob mode.
 2020-11-03 15:08:10 +11:00
Lucas Soriano
62c9f22b64
Merge pull request #30 from comit-network/use-execution-in-swap 
Execute on-chain protocol after handshake
 2020-11-03 11:07:12 +11:00
Lucas Soriano del Pino
92c7e8e84f Run swap e2e test without tor feature 
Not worth automatically testing both `tor` and `not(tor)`, it should
not make a difference.
 2020-11-02 10:31:53 +11:00
Lucas Soriano del Pino
792fa351c8 Upgrade bitcoin-harness dependency 
From dev-branch to master.
 2020-10-30 15:55:10 +11:00
Lucas Soriano del Pino
7fa7641feb Clean up some logs and comments 2020-10-30 15:51:46 +11:00
Tobin C. Harding
4d4acde476 Bubble up an event when Bob receives message 3 response 
Before this patch Bob is not sending message 3. This is because we are not
polling Bob's swarm correctly. To fix it we can just mimic the other NB's and
bubble up an event when Bob receives message 3 response from Alice, this way we
can `await` upon this event which triggers polling, making Bob's swarm send the
message.
 2020-10-30 14:07:15 +11:00
Lucas Soriano del Pino
a37f43a1ba wip: Provide enough funds to both parties 
Also use cosntant backoff retry strategy as opposed to exponential
backoff. This is in case retrying several times quickly causes the
retry intervals to become large enough that the test is very slow
and/or the Bitcoin lock transaction expires.

The current problem occurs on the last message i.e. Bob sending
tx_redeem_encsig to Alice. The action is yielded for Bob to do it, but
Alice appears to never receive it (unconfirmed claim, requires more
logging).
 2020-10-30 14:07:15 +11:00
Lucas Soriano del Pino
eb6bbe6180 wip: Fix bug where bob was sending two amount request 2020-10-30 14:05:45 +11:00
Lucas Soriano del Pino
9f32cd988e wip: Use same timelock value for refund and punish 2020-10-30 14:05:45 +11:00
Lucas Soriano del Pino
62c4501926 wip: Add xmr_btc tracing filter 2020-10-30 14:05:45 +11:00
Lucas Soriano del Pino
ae87c10cae wip: fixed message0 2020-10-30 14:05:45 +11:00
Tobin C. Harding
119f2a7c54 Add error logging to request_response 2020-10-30 14:05:45 +11:00
Tobin C. Harding
b8ab4b4eee wip: add env filter 2020-10-30 14:05:45 +11:00
Tobin C. Harding
3e2f0b74a2 Do not trace events meant for other NBs 2020-10-30 14:05:45 +11:00
Tobin C. Harding
c464555f5e Enable trace output 2020-10-30 14:04:27 +11:00
Tobin C. Harding
39f86154ce Use serde_cbor instead of serde_json 
We have serde trait implementations that use `serde_cbor` which is a superset of
josn. We cannot use `serder_json` to ser/deser these objects.
 2020-10-30 14:04:27 +11:00
Tobin C. Harding
2bd4977fe4 Increase read buffer size 
Our messages are quite big, increase the read buffer to 1 megabyte to
accommodate them.
 2020-10-30 14:04:27 +11:00
Tobin C. Harding
be37725303 monero-harness: Use tracing 2020-10-30 14:04:27 +11:00
Lucas Soriano del Pino
9384b0cf3c [WIP] Swap app e2e test 2020-10-30 14:04:27 +11:00
Lucas Soriano del Pino
9e30bd5151 Generate addresses as late as possible 2020-10-30 14:04:27 +11:00
Lucas Soriano del Pino
3f43581da7 Implement traits Receive{BitcoinRedeemEncsig, TransferProof} 
Unfortunately, I had to put the wrap the swarm in Alice's `Network`
struct in an `Arc<Mutex<T>>` in order to be able to use `backoff` to
control the retry mechanism. This is because the stream of events
cannot be turned into a `SharedFuture` (unlike Bob's).

It would be good to find an alternative solution.
 2020-10-30 14:03:27 +11:00
Lucas Soriano del Pino
a4e4c27bee Execute Bob's on-chain protocol after handshake 
Co-authored-by: Tobin C. Harding <tobin@coblox.tech>
 2020-10-30 14:03:27 +11:00
Lucas Soriano del Pino
4ee82a5a2a Execute Alice's on-chain protocol after handshake 
Co-authored-by: Tobin C. Harding <tobin@coblox.tech>
 2020-10-30 14:00:39 +11:00
Philipp Hoenisch
dbd7f2b0c9
Merge pull request #27 from comit-network/tor-swap 2020-10-28 13:28:56 +11:00
Philipp Hoenisch
b8fd9a734f
Use full path imports for dependencies to reduce cfg hell 2020-10-28 11:18:14 +11:00
Tobin C. Harding
a1351e5461 Do not declare 'port' variable 2020-10-28 10:11:04 +11:00
Tobin C. Harding
464b699426 Fail if user passes in local port for non-tor usage 
Local port is only used when running behind tor. Fail if user passes a local
port number when running in non-tor mode.
 2020-10-28 09:46:25 +11:00
Tobin C. Harding
42d194f758 Use fully qualified path for bail 2020-10-28 09:21:37 +11:00
Tobin C. Harding
5e35904101 Use an option for the local port 
We can wrap the local port in an option and pass None when we are not using Tor.
This reduces code duplication.
 2020-10-28 08:41:23 +11:00
Philipp Hoenisch
7f3aa644a0
Extre CI flag to run clippy for wihtout all features enabled 2020-10-27 16:02:32 +11:00
Philipp Hoenisch
8811a0a205
Add Tor to main 2020-10-27 15:03:59 +11:00
Lucas Soriano
cf8accf30d
Merge pull request #28 from comit-network/re-work-swap-functions 
Re work swap functions
 2020-10-27 13:27:52 +11:00
Tobin C. Harding
b22f265cf3 Send back an empty response to Message2 
Alice does not respond with anything when receiving message 2 from Bob. We don't
want to leave Bob's request/response protocol waiting so send an empty response
back.
 2020-10-27 10:26:54 +11:00
Tobin C. Harding
194a19cf1d Add todos 2020-10-27 10:26:51 +11:00
Tobin C. Harding
6be5d64c1c Remove stale, ugly, type conversion 2020-10-27 10:26:46 +11:00
Lucas Soriano
4cfc603786
Merge pull request #26 from comit-network/more-on-chain-tests 
Test that Alice punishes if Bob is inactive after locking bitcoin
 2020-10-27 10:22:12 +11:00
Lucas Soriano
58aa2b5a2b
Merge pull request #23 from comit-network/remove-re-export 
Do not re-export curve25519_dalek
 2020-10-27 10:21:58 +11:00
Tobin C. Harding
8f5a989ad1 Use 'amounts' for local varibale name 2020-10-27 10:05:20 +11:00
Tobin C. Harding
b8130d23a6 Only break if Bob has requested amounts already 
We don't want Bob to be able to crash us by sending an out of
order message. Only break if Bob has not requested amounts.
 2020-10-27 10:02:03 +11:00
Tobin C. Harding
5da84a3d48
Merge pull request #25 from comit-network/unused-assigments 
Remove allow(unused_assignments) attribute
 2020-10-27 09:55:32 +11:00
Tobin C. Harding
36ba504129
Merge pull request #24 from comit-network/alice-state-3 
Send Message2 from Bob to Alice
 2020-10-27 09:13:45 +11:00
Lucas Soriano del Pino
24104d5d35 Test that Alice punishes if Bob is inactive after locking bitcoin 2020-10-26 16:05:30 +11:00
Lucas Soriano del Pino
ba4ae09cd1 Remove allow(unused_assignments) attribute 
It looks like the compiler can ascertain that `message0` will be
initialised by the time we use it, so it doesn't need to be an
`Option` and it doesn't need to be declared as mutable.
 2020-10-26 15:21:32 +11:00