865 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Franck Royer	4a4e23038b	Add logging to investigate add address race condition	2020-12-21 10:25:19 +11:00
Franck Royer	1a4bd0e2b4	Bob refunds swap after restart that requires communication ... As Bob is dialing Alice, we now ensure that we are connected to Alice at each step that needs communication. If we are not connected, we proceed with dialing. In an attempt to improve libp2p usage, we also add known address of Alice first and only use peer_id to dial. This ensures that we use the expected peer id.	2020-12-21 08:31:21 +11:00
Franck Royer	d9ea7ab605	Only carry the tx_lock_id instead of the full state	2020-12-21 08:19:39 +11:00
Franck Royer	edfab58246	Scope alice db ... To better match the restart scenario	2020-12-21 08:19:39 +11:00
Franck Royer	dc96b3d1e9	Stop running first event loop after Alice restarts	2020-12-21 08:19:39 +11:00
Franck Royer	638143a10d	Replace hard coded port by dynamic available one ... Fixes #84.	2020-12-21 08:19:31 +11:00
Franck Royer	2212758d17	Rename refund test as it is alice specific	2020-12-21 08:13:42 +11:00
Franck Royer	9af8ab3028	Increase stack size to 16MB ... Default is 8MB. As we start both Alice and bob in test, it is fine to double the stack size but still assume it does not impact the normal execution of the binary.	2020-12-21 08:13:42 +11:00
bors[bot]	3db71997d3	Merge #99 ... 99: Cleanup resume_from_database functions only used in tests r=da-kami a=da-kami Follow up of https://github.com/comit-network/xmr-btc-swap/pull/88 Co-authored-by: Daniel Karzel <daniel@comit.network>	2020-12-18 03:01:18 +00:00
bors[bot]	4f631c0c9b	Merge #98 ... 98: Remove tor module r=da-kami a=da-kami This removes the currently unused `tor module`. Different `tokio` versions have been causing issues with the `tor` module in the past (i.e. `Cargo.lock` broken problem...). It started causing issues again when adding a dependency to `jsonrpc_client` working on https://github.com/comit-network/xmr-btc-swap/pull/97 We don't support `tor` at the moment and are no planning to add this feature initially as it is not super important to users. The functionality can easily added again at a later point. Co-authored-by: Daniel Karzel <daniel@comit.network>	2020-12-18 02:10:25 +00:00
bors[bot]	88c29dbce5	Merge #94 ... 94: T1Expired state for Bob and check expiries in states after both locked r=da-kami a=da-kami Co-authored-by: Daniel Karzel <daniel@comit.network>	2020-12-18 01:20:30 +00:00
Daniel Karzel	4046305474	Merge pull request #88 from comit-network/resume-swap-cli ... Resume command and global database cl-parameter	2020-12-18 11:42:54 +11:00
Daniel Karzel	20893c1bb1	Cleanup Display for database states	2020-12-18 11:39:21 +11:00
Daniel Karzel	e6493784bf	Change pin_mut! to select!	2020-12-18 11:37:02 +11:00
Daniel Karzel	773eebc723	Cleanup resume_from_database functions only used in tests	2020-12-18 10:50:32 +11:00
Daniel Karzel	e9681b6e2b	Work in review comments	2020-12-17 19:10:24 +11:00
Daniel Karzel	43d05935e7	Remove tor module	2020-12-17 18:50:15 +11:00
Daniel Karzel	093cbaa4b4	Introduce T1Expired state for Bob properly and check expiries in states after both locked	2020-12-17 15:17:15 +11:00
Daniel Karzel	6d03d1bbff	Resume command and global database cl-parameter	2020-12-15 21:40:52 +11:00
bors[bot]	6ef6fc894f	Merge #85 ... 85: Database & Swap Resume r=da-kami a=D4nte - Introduce Database for Alice and Bob - Save states in database - Resume from database (broken for Bob, will create test + fix it in follow-up) PR - Tests when alice restarts: Both happy and refund path Co-authored-by: Franck Royer <franck@coblox.tech> Co-authored-by: rishflab <rishflab@hotmail.com> Co-authored-by: Daniel Karzel <daniel@comit.network>	2020-12-15 06:13:47 +00:00
Franck Royer	71cf501c29	Delete bob::negotiate ... This module was intended to contain helper functions for each step. However, those are not needed except for the negotiate step. A dedicated module is not needed for one function.	2020-12-15 16:53:50 +11:00
Franck Royer	19066200d1	Add a TODO to use existing helper functions ... Helper functions already exist on the xmr-btc crate states, use them like it is done in the bob module.	2020-12-15 16:51:23 +11:00
Franck Royer	84bec0631b	Rename alice::negotiate to steps ... This module includes helper function for each state.	2020-12-15 16:49:38 +11:00
Franck Royer	53d13330c2	Remove dupe code	2020-12-15 16:45:06 +11:00
rishflab	9d266fc648	Add balance assertions to restart tests	2020-12-15 13:11:16 +11:00
Franck Royer	5ba830f3bf	Replace swap recover terminology with resume	2020-12-15 11:52:00 +11:00
Franck Royer	8cc470a80e	Use -ed terminology for cancel state	2020-12-15 11:47:05 +11:00
Daniel Karzel	b83ab71669	Split up tests into separate files to overcome CI failure	2020-12-15 11:43:28 +11:00
Daniel Karzel	7cae6a9e4d	Add Bob restart test	2020-12-15 11:43:28 +11:00
Daniel Karzel	4ec2da29a0	Modularize Bob's test setup (separate init for state, event_loop)	2020-12-15 11:43:28 +11:00
Daniel Karzel	9a930af33f	Remove duplicated restart+refund test, move tests into separate files	2020-12-15 11:43:28 +11:00
Daniel Karzel	91d4d5da25	Cleanup swap execution to not return EventLoopHandle, refactor both_refund test	2020-12-15 11:43:28 +11:00
Daniel Karzel	3692046758	Bob's recover function	2020-12-15 11:43:27 +11:00
Daniel Karzel	bf39c34ada	Alice restart and refund test if restarted before encsig learner	2020-12-15 11:43:27 +11:00