Daniel Karzel
9a80dbb514
Revert database changes, accidentally committed
2020-12-03 21:11:26 +11:00
Daniel Karzel
a8d25aa62d
Track state of application through more logging
2020-12-03 20:45:44 +11:00
Daniel Karzel
2e1d10c457
Explicitly set the network in the wallet when creating the wallet.rs
...
Implement trait on the wallet to enforce Network can be retrieved,
for the test wallets always just return Regtest, for the wallets
created in main currently always set to Bitcoin (mainnet).
2020-12-03 20:45:07 +11:00
Daniel Karzel
aa0a2e326c
Change hardcoded bitcoin fee estimate to overpay by approx. 1.5 given current network rates
2020-12-03 16:58:12 +11:00
Daniel Karzel
64b7c392ef
Adapt timelocks to be 24 blocks and add explanatory comment
2020-12-03 15:53:56 +11:00
Daniel Karzel
e9abea6ee3
Comment test because of conflicting bitcoin libs (to be solved later)
...
We use bitcoin 0.23 internally, but bitcoincore_rpc_json 0.12 depends on bitcoin 0.25
We need bitcoincore_rpc_json in version 0.12 because we use functionality that was
only added in 0.12.
2020-12-03 15:00:17 +11:00
Daniel Karzel
708988b5c2
Print Alice peer id when starting swap as Alice
...
In the current setup Bob dials Alice, and thus requires her peer id.
2020-12-02 22:07:27 +11:00
Daniel Karzel
3e60a514c4
Pull in bitcoin harness to be able to use @teizinger JSON RPC client
...
@d4nte adapted the harness, but I was not able to use that commit straight away because of bitcoin version conflicts.
Pull the harness in for now until the mainnet swap is done, then potentially upgrade bitcoin.
2020-12-02 19:11:12 +11:00
Daniel Karzel
3dd8817884
Fix logging, add amounts
2020-12-02 19:06:51 +11:00
Daniel Karzel
74af2b57eb
Pass in existing bitcoind wallet name
2020-12-02 10:17:38 +11:00
Daniel Karzel
95524ce967
Adapt the CLI, replace execution with refactored one
2020-12-01 23:13:01 +11:00
Daniel Karzel
65e910e1c1
Merge pull request #46 from comit-network/update-ux-validation-add-peers-manually
...
Adding peers manually could enhance privacy
2020-12-01 17:16:40 +11:00
Daniel Karzel
dc8421fef7
Merge pull request #47 from comit-network/feedback-feature-list
...
Add a list of potential features proposed by the community
2020-12-01 17:16:29 +11:00
rishflab
a9bb4e6bed
Merge pull request #41 from rishflab/automated
...
Simplify swap and recovery execution
2020-12-01 16:20:07 +11:00
rishflab
1c401aad31
Fix clippy warnings and formatting
2020-12-01 15:38:24 +11:00
rishflab
cdffb619dc
Merge pull request #48 from comit-network/revert-35-no-transfer-proof
...
Revert "No need to send Monero transfer proof from Alice to Bob"
2020-12-01 15:33:13 +11:00
Daniel Karzel
7a30555aa9
Clarify what manual check for tainted coins could mean
2020-12-01 15:27:29 +11:00
Daniel Karzel
5246eece9e
Add link to track where and when this feature was mentioned
2020-12-01 15:27:29 +11:00
Daniel Karzel
958c80c262
Add a list of potential features proposed by the community
...
To help us track what is possible and should be added.
2020-12-01 15:27:29 +11:00
Daniel Karzel
406ddc6b15
Work in review comments
2020-12-01 15:27:00 +11:00
Daniel Karzel
83b6b78d17
Adding peers manually could enhance privacy
...
This opens up different use cases and might preserve more privacy.
Validate if it is important for users to be able to control who to add (and how).
2020-12-01 15:27:00 +11:00
rishflab
fcec465bdb
Revert "No need to send Monero transfer proof from Alice to Bob"
2020-12-01 14:52:05 +11:00
rishflab
b06321a40f
WIP: cleanup
2020-12-01 14:46:53 +11:00
rishflab
47c3ddc6f7
Fix happy path test
...
Poll bob swarm to send encsig after calling send message3. Comment
out unimplmented wait for transaction finality trait. Dial alice.
2020-12-01 14:30:02 +11:00
rishflab
729e65da5b
Merge pull request #49 from comit-network/cargo-lock
...
Push cargo lock to git as we are building a binary
2020-12-01 13:49:03 +11:00
rishflab
fa243e2fd7
Merge pull request #5 from D4nte/rishflab-automated
...
Save state0 in the swarm to process message0
2020-12-01 10:57:43 +11:00
Franck Royer
2abeba17f9
Save state0 in the swarm to process message0
2020-12-01 10:41:10 +11:00
Franck Royer
62db4fb430
Push cargo lock to git as we are building a binary
2020-12-01 09:31:41 +11:00
rishflab
d8218a7bea
Remove mspc channel from new executor
2020-11-30 15:16:56 +11:00
Franck Royer
2db9ebd28b
make new_swarm public
2020-11-30 15:13:20 +11:00
Franck Royer
9e13034e54
Extract execution details from driving loop
2020-11-30 15:13:20 +11:00
rishflab
24631d464d
Add test for recursive executor
2020-11-30 15:13:20 +11:00
rishflab
dca15b6872
Removed unused binary
2020-11-30 15:13:20 +11:00
rishflab
3b005bd15c
Resolve rebase issues, restructure code and fix warnings
2020-11-30 15:13:20 +11:00
Franck Royer
437c1cbb80
Started to extract some steps
...
Tealised that the whole point is for them to be idempotent to be useful
2020-11-27 09:34:36 +11:00
Franck Royer
66866f8fbd
Remove rng argument
2020-11-27 09:34:36 +11:00
Franck Royer
6c0df836ca
Deal with Btc Punished.
2020-11-27 09:34:36 +11:00
Franck Royer
6437b529eb
Punish Bob if t2 is reached
2020-11-27 09:34:36 +11:00
Franck Royer
8ff1824126
Remove abort function
2020-11-27 09:34:36 +11:00
Franck Royer
58ca33dd04
Remove warnings
2020-11-27 09:34:36 +11:00
Franck Royer
c501d84278
Park abort function for now
2020-11-27 09:34:36 +11:00
Franck Royer
4c4a10098c
Complete Refund path
2020-11-27 09:34:36 +11:00
Franck Royer
bff83bbe99
Progress on Cancellation path
2020-11-27 09:34:36 +11:00
Franck Royer
8e31a3af6a
Add steps from EncSignLearned
2020-11-27 09:34:36 +11:00
Franck Royer
8976a03b3d
Implemented Alice transition from BtcLocked to XmrLocked
2020-11-27 09:34:35 +11:00
Franck Royer
75e7fedfed
Implemented Alice transition from Negotiated to BtcLocked
2020-11-27 09:34:35 +11:00
Franck Royer
c4cd64d134
Implemented Alice transition from Started to Negotiated
2020-11-27 09:34:35 +11:00
Franck Royer
0fe5131a8a
Fix import format
2020-11-27 09:34:35 +11:00
rishflab
ae94b170fd
Cleanup
...
Move state machine executors into seperate files
Remove check for ack message from Alice. Seems like a bad idea to
rely on an acknowledgement message instead of looking at the
blockchain.
Fix warnings
2020-11-27 09:34:35 +11:00
rishflab
ff7daf16f3
WIP: Test simplified swap execution
2020-11-27 09:21:21 +11:00
