1299 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Karzel	c6bc45e7a0	Wait for bitcoin tx finality before locking XMR	2021-01-05 14:31:10 +11:00
Daniel Karzel	30dd15774e	Log Bitcoin and Monero transaction IDs on info instead of debug	2021-01-05 14:11:26 +11:00
Daniel Karzel	0977d36703	Set log level to info instead of trace	2021-01-05 14:00:07 +11:00
Daniel Karzel	72aa517af8	Work in review comments	2021-01-05 11:26:00 +11:00
Daniel Karzel	8a2128e93a	Correct monero-wallet-rpc parameter name	2021-01-05 11:00:15 +11:00
Daniel Karzel	4d9559fc2e	Monero network settings and testnet	2021-01-04 20:30:47 +11:00
Daniel Karzel	1f7e72b230	Log bitcoin harness and monero harness	2021-01-04 20:30:46 +11:00
Franck Royer	dd10e68db4	Merge pull request #113 from comit-network/clippy	2021-01-04 10:10:19 +11:00
bors[bot]	97eb24a26c	Merge #114 ... 114: Type timelock and block height r=D4nte a=D4nte To ensure no mistake is made (and none were!) Co-authored-by: Franck Royer <franck@coblox.tech>	2021-01-03 21:41:55 +00:00
Franck Royer	bcbc54b569	Type timelock and block height ... To ensure no mistake is made (and none were!)	2021-01-04 08:40:53 +11:00
Franck Royer	81cbc24c46	Use action to name trait	2020-12-23 15:40:56 +11:00
Franck Royer	e1e8533862	Embed state mod in database mod ... The `Swap` struct is now database specific, no need to have a 20 lines module.	2020-12-23 15:30:23 +11:00
Franck Royer	59708c57e6	Move Alice and Bob db states in separate modules	2020-12-23 15:26:08 +11:00
Franck Royer	b410de01df	Move state.rs under database module ... The types in state are only used for the database	2020-12-23 15:20:24 +11:00
Franck Royer	8c7964bfee	Rename storage.rs to database.rs to reduce terminology variants	2020-12-23 15:17:27 +11:00
Franck Royer	5ed18469e4	Move db state conversion with db type definition ... Those conversion are specific to the database and should be defined with in the database module.	2020-12-23 15:11:09 +11:00
Franck Royer	2a778f5644	Remove overzealous clippy overrides ... We have overridden a number of clippy warnings such as "large enum variant". Considering that we have a number of issues with the stack size in CI, it is more prudent to follow clippy's advice and box larger items so that the enum does not take larger space. Do note that an instance of the enum always takes as much space as its largest variant.	2020-12-23 15:06:43 +11:00
Franck Royer	cdf2800fa5	Align clippy lints ... Lints in `main.rs` are not used if there is a `lib.rs` file.	2020-12-23 14:33:29 +11:00
Franck Royer	ece689f5ca	There is only one binary, we should use main.rs naming convention	2020-12-23 14:22:04 +11:00
bors[bot]	4e91ac467b	Merge #112 ... 112: Align database types with swap states r=D4nte a=D4nte - Removing naming ambiguities and errors - Clean up the DB state now that they are only use in the new recursive function. - Remove few todos and panics. Co-authored-by: Franck Royer <franck@coblox.tech>	2020-12-23 03:20:42 +00:00
Franck Royer	4150e75488	Replace Try_From state conversion with From for Bob	2020-12-23 14:12:29 +11:00
Franck Royer	5d1b10cc58	Align Bob DB states with swap states	2020-12-23 14:12:29 +11:00
Franck Royer	e541f7b83d	Replace TryFrom with From for Alice states	2020-12-23 14:12:29 +11:00
Franck Royer	69e1c2bb27	Align Alice DB states with swap states	2020-12-23 14:12:29 +11:00
Franck Royer	a31db63e54	Improve state names and display	2020-12-23 14:12:29 +11:00
Franck Royer	f0736d0906	Remove Refund timelock and T0/T1/T2 ... There are no refund timelock, only a cancellation timelock and punish timelock. Refund can be done as soon as the cancellation transaction is published.	2020-12-23 14:12:26 +11:00
Franck Royer	405e377f79	Rename EncSign to EncSig ... `EncSig` means "encrypted signature", the item, not be confused with "signing", the action	2020-12-23 13:41:55 +11:00
bors[bot]	9c83ca52ad	Merge #107 ... 107: Ensure that Bob can cancel correctly if T1 expired and Alice did not … r=da-kami a=da-kami Bob has to check for the possibility to cancel in every state after he locked the BTC. Otherwise Bob will try to perform actions that don't have any point and it might be impossible to use the `resume` command because it will always fail in trying to go on with Alice even though that might not be possible. Co-authored-by: Daniel Karzel <daniel@comit.network>	2020-12-23 01:16:42 +00:00
bors[bot]	4191d41ccf	Merge #102 ... 102: Separate Buy/Sell for resume command r=D4nte a=D4nte And other clean ups from #100. Co-authored-by: Franck Royer <franck@coblox.tech>	2020-12-22 22:19:04 +00:00
Franck Royer	058c214892	Only run 2 tests at the same time to avoid resource issue with docker	2020-12-23 09:17:59 +11:00
Franck Royer	297b15e3ce	Remove async block when it is not needed	2020-12-23 09:17:56 +11:00
Franck Royer	e079b84500	Ensure we wait for other party to complete ... Before we check the balances.	2020-12-23 09:17:41 +11:00
Franck Royer	1fa812b727	Separate Buy/Sell for resume command ... To avoid confusing the user on whether person should enter a listen addr or a connect peer id and address	2020-12-23 09:17:39 +11:00
bors[bot]	672377b216	Merge #108 ... 108: Remove all CLI short-codes because they don't add value at the moment r=da-kami a=da-kami `struct_opt` does not check at compile time, if there is a duplicate. Only when running the application. We have been running in this annoyance twice, so let's remove the shortcodes for now. Co-authored-by: Daniel Karzel <daniel@comit.network>	2020-12-22 07:11:01 +00:00
Daniel Karzel	a692cf9299	Remove all short-codes because they don't add value at the moment	2020-12-22 18:10:13 +11:00
Daniel Karzel	c9d492d155	Only wait for xmr-lock until t1 expired	2020-12-22 17:08:17 +11:00
Daniel Karzel	0cdb7ca8a8	Move current_epoch from lib to bitcoin.rs	2020-12-22 16:45:30 +11:00
Daniel Karzel	83ce6f2c85	Ensure that Bob can cancel correctly if T1 expired and Alice did not move ... Bob has to check for the possibility to cancel in every state after he locked the BTC. Otherwise Bob will try to perform actions that don't have any point.	2020-12-22 16:27:25 +11:00
Daniel Karzel	8296490764	Merge pull request #111 from comit-network/trace-xmr-btc ... Fix tracing subscribe filter for xmr-btc`	2020-12-22 16:17:27 +11:00
Franck Royer	25703a778e	Merge pull request #110 from comit-network/add-address	2020-12-22 14:49:36 +11:00
Daniel Karzel	5f8b7f2624	Fix tracing subscribe filter for xmr-btc`	2020-12-22 14:11:55 +11:00
Franck Royer	b05a96d49b	Merge pull request #105 from comit-network/delete-merged-branch ... Add Mergify rule to delete merged branch and bors+	2020-12-22 14:02:31 +11:00
Franck Royer	40a27a2438	Remove dead code	2020-12-22 13:50:36 +11:00
Franck Royer	df237f82cf	Fix clippy warning	2020-12-22 13:50:28 +11:00
Franck Royer	49b84d84b9	Add address at the start ... Do not carry peer id around as we currently only expect one peer.	2020-12-22 13:47:05 +11:00
Franck Royer	a1c3e1fcbb	Add Mergify rule to delete merged branch and bors+	2020-12-21 16:09:21 +11:00
Franck Royer	7d3b2faedd	Merge pull request #100 from comit-network/Bob-restart ... Merging now, will tackle comments in follow-up.	2020-12-21 14:09:08 +11:00
Franck Royer	1e4b115556	Separate Bob restart tests ... To stabilize CI	2020-12-21 12:19:04 +11:00
Franck Royer	e366d3a73b	Join all futures to avoid hanging tests	2020-12-21 12:17:40 +11:00
Franck Royer	2abf65f3b6	Remove sleep that seems unnecessary	2020-12-21 10:25:36 +11:00