Commit Graph

508 Commits (1876d17ba456bcbc03b8854f5ed2444243ade75a)

Author SHA1 Message Date
Daniel Karzel 77ec7e502f Distinguish permanent and transient error when watching tx 4 years ago
rishflab b66bb00c77 Remove stale code 4 years ago
rishflab bc1d2bda54 Test URL creation for default electrum HTTP API 4 years ago
rishflab d296c22ecf Log bitcoin deposit address on startup 4 years ago
rishflab 4768c79070 Derive bitcoin private key from seed 4 years ago
Thomas Eizinger a51194b9fa Instantiate electrum client with custom config with 2 retries
The default number of retries is 1. Unfortunately, the way this config
value is interpreted doesn't actually lead to a retry. We have to set
it to 2 to actually make it retry.

See https://github.com/bitcoindevkit/rust-electrum-client/issues/47.
4 years ago
rishflab 180e778df9 Allow blockchain calls to fail
Prior to this change, functions could not fail early on permanent errors eg. parsing a url. Merged error enums.
4 years ago
rishflab a0ef1f96ec Replace bitcoind wallet with bdk wallet
The bitcoind wallet required the user to run a bitcoind node. It was replaced with a bdk wallet which allows the user to connect to an electrum instance hosted remotely. An electrum and bitcoind testcontainer were created to the test the bdk wallet. The electrum container reads the blockdata from the bitcoind testcontainer through a shared volume. bitcoind-harness was removed as bitcoind initialisation code was moved into test_utils. The bdk wallet differs from the bitcoind wallet in that it needs to be manually synced with an electrum node. We synchronise the wallet once upon initialisation to prevent a potentially long running blocking task from interrupting protocol execution. The electrum HTTP API was used to get the latest block height and the transaction block height as this functionality was not present in the bdk wallet API or it required the bdk wallet to be re-synced to get an up to date value.
4 years ago
bors[bot] 4d8e801c1e
Merge #190
190: Do not pass Monero amount to the CLI r=D4nte a=D4nte

The CLI user only pass the Bitcoin amount they want to sell.

The CLI then do a quote request to nectar which provides the Monero amount the taker can get.

Co-authored-by: Franck Royer <franck@coblox.tech>
4 years ago
bors[bot] 5d215caf35
Merge #188
188: Tor cleanup r=da-kami a=da-kami

We never removed Tor install from CI. I don't think it should be necessary given that Tor was removed in code.

Co-authored-by: Daniel Karzel <daniel@comit.network>
4 years ago
Franck Royer f36f5acaf1
Remove unnecessary async block 4 years ago
Franck Royer 73c52ffb61
Remove unused structs 4 years ago
Franck Royer 2dbd43e2c0
Only pass btc amount to CLI
The CLI requests a quote to nectar to know how much xmr it can get.
Also align terminology with the sequence diagram.
4 years ago
Franck Royer 144da75270
Remove redundant data 4 years ago
Franck Royer fb3b2aa546
Remove unnecessary pub qualifier 4 years ago
Franck Royer b4e2e11dde
Remove unnecessary fields 4 years ago
Franck Royer d6effb7d39
Remove unnecessary pub qualifiers 4 years ago
Franck Royer b8a84aa34b
Avoid possible mix up between timelocks
Introduce new type to ensure no mix up happens when ordering the fields
in function calls.
4 years ago
Franck Royer 9a321a4f09
Move transaction types in dedicated modules
To allow the related timelock to be defined with the
transaction that uses it. This will allow the access to the
timelock's struct inner field with defining `From` impl.
4 years ago
Franck Royer 65e0e5b731
Use Remote handle to access ongoing swaps on Alice 4 years ago
bors[bot] a0753e24dc
Merge #189
189: The first message is more of a quote request than a swap request r=D4nte a=D4nte



Co-authored-by: Franck Royer <franck@coblox.tech>
4 years ago
Franck Royer 5d78556665
Give a more specific name to the CLI binary: `swap-cli`
The current binary name is very generic `cli`. `swap-cli` better
describes what this binary does.
4 years ago
Franck Royer 8fada42074
Make `config` argument global
The `config` argument apply to all commands. It is now optional and
needs to be passed before a command.
E.g. `cli --config ./config.toml history`
4 years ago
Franck Royer 83dcf4ba3c
Add `nectar` binary 4 years ago
Daniel Karzel c166232daf Remove unnecessary mention of Tor in comment 4 years ago
Franck Royer 9ded728879
The first message is actually a quote or rate request 4 years ago
Franck Royer ee43125bdd
Add `nectar` binary 4 years ago
Franck Royer fac5b59d17
Remove unnecessary specification of the types 4 years ago
Franck Royer 7805a6d684
Move cli specific modules under cli folder
nectar will also have its own folder with a separate config.
4 years ago
Franck Royer 901c9e89c9
No evident added value of having separate `Seed` structs
Hence, reducing complexity of the codebase. Note that the seed will be
used by both nectar and the cli whereas the config mod will be different
so this changes helps with the next step of having a dedicated config
module for each binary.
4 years ago
Franck Royer 7d392c3086
This files contains `Command` and `Arguments` structs 4 years ago
Franck Royer 45dccb8be2
Rename the config struct `Config` 4 years ago
Franck Royer eb39add5ff
Fix typo 4 years ago
Franck Royer 6e6dc320b4
Alice event loop now handles the creation of new swaps 4 years ago
Franck Royer 15eb9a2fe4
Remove punish test
The punish test needs re-work due to the fact that Alice runs continuously

Currently focusing on the CLI (Bob), so we can re-introduce this test
once we want to ensure that nectar (Alice) punishes.
4 years ago
Franck Royer 3bc8b58b6a
Remove Bob restart tests after communication
The test do not work without acks as we stop the event loop as soon
as a message is considered as "sent" when actually the event loop
and swarm may not have yet sent the message.

The ack allow to avoid this issue as the message was considered "sent"
only once the other party sent a response. However, the ack brings
other issue so a review needs to be done to select the appropriate
solution.
4 years ago
Franck Royer fd9f633a77
Remove Alice restarts tests
Current focus is on CLI UX. Fair amount of change needs to happen to
cater for Alice (nectar) restart scenarios.
4 years ago
Franck Royer bfc19d5628
Remove acknowledgements processing
We are aware of issues of timeouts when waiting for acknowledgements.
Also, to properly supports acks in a multiple swap context, we need to
revert to doing event processing on the behaviour so that we can link
leverage the `RequestResponse` libp2p behaviour and link the messages
requests ids to swap ids when receiving an ack or response.

Acks are usefully for specific scenarios where we queue a message on the
behaviour to be sent, save as sent in the DB but crash before the
message is actually sent. With acks we are able to resume the swap,
without ack, the swap will abort (refund).
4 years ago
Franck Royer cc8b855117
Make it possible to clone a handle
This will be used for new swaps.
4 years ago
Franck Royer 1b2be804ed
Remove unnecessary channels
`alice::swap::run_until` will be called once the execution setup is
done. The steps before are directly handled by the event loop,
hence no channels are needed for said steps: connection established,
swap request/response & execution setup.
4 years ago
Franck Royer f5ca5faabf
Process execution setup failure similarly to other failures
By merging it in the failure event of the root behaviour.
4 years ago
Franck Royer 4ade5df0e5
Remove unnecessary impl block 4 years ago
Franck Royer 60e0b9382c
Introduced from float API for Monero quantities 4 years ago
Franck Royer b5b990257a
Move `Behaviour` in dedicated module 4 years ago
Franck Royer 87be9aeb2a
Prepare separation of event loop initialisation to swap initialisation
As for Alice, the event loop will be started with the program and will
be the one starting swaps (`run_until`) based on libp2p events (swap
request).
4 years ago
Franck Royer 530b9b2ea8
Remove possible mix up of timelocks when using `State0::new` 4 years ago
Franck Royer f35ed436ce
Allow `EventLoop` to hold a database ready to pass to `alice::Buider`
The `EventLoop` will use the `Builder` interface to instantiate a
`Swap` upon receiving a `SwapRequest` and successfully doing an
execution setup.
Before this change, the `EventLoop` would have to hold the path to the
db and re-open the db everytime it wants to construct a swap.

With this change, we can open the DB once and then hold a
`Arc<Database>` in the `EventLoop` and pass it to new `Swap`s structs.
4 years ago
Franck Royer 39a46baa2c
Preemptively box cancel tx to avoid size difference in enum 4 years ago
Franck Royer 69363e43a3
Preemptively box encrypted signature to avoid size difference in enum 4 years ago
Franck Royer fd084b764d
Move generation of keys inside `State0::new`
The event loop will now use this function so I want to simplify its
usage to avoid having to instantiate too many items to use it.
4 years ago
Franck Royer 788445964a
Move main.rs to cli.rs to prepare for nectar binary 4 years ago
Franck Royer 311ba74cd6
Remove sell-xmr from CLI 4 years ago
Daniel Karzel 0a0bce1552 Rename temporary wallet to blockchain monitoring wallet 4 years ago
Daniel Karzel 1e29433bd2 Open or create temporary Monero wallet upon wallet initialization 4 years ago
Daniel Karzel dac4443bbd Add functionality to open monero wallet through rpc 4 years ago
Daniel Karzel 62605a318a Add CreateWallet trait to expose create_wallet 4 years ago
Daniel Karzel 53fcd9224c Give finding the refund tx priority over waiting for the punish transaction to be finalized.
This was introduced due to a CI run, where Bob included tx_refund, but Alice had waited until T2 had expired,
and then went for punishing Bob instead of refunding.
Weirdly, Alice's punich transaction did not fail in that scenario.
4 years ago
Daniel Karzel 86290649e7 work in review comments 4 years ago
Daniel Karzel c930ad84a4 Add --force flag for cancel and refund 4 years ago
Daniel Karzel 02f8eb7f18 Add test for cancel/refund before timelock expired 4 years ago
Daniel Karzel 2d5d70d856 Timeout for Alice waiting for ack for sending transfer proof
If dialing Bob fails Alice waits for the acknowledgement of the transfer proof indefinitely.
The timout prevents her execution from hanging.
Added a ToDo to re-visit the ack receivers. They don't add value at the moment and should be removed.
4 years ago
Daniel Karzel c9adbde5d5 Add test for Bob's manual cancel and refund 4 years ago
Daniel Karzel ad2aefc2a5 Refund Command 4 years ago
Daniel Karzel 0600a7048e Cancel command 4 years ago
Franck Royer dee8c1e335
Remove scopes 4 years ago
Franck Royer a48823a665
Re-organise Alice state to be more coherent with the msg sequence 4 years ago
Franck Royer eefb1b3b16
Use event_process = false for Bob
As we do not process the event, we can just implement the needed `From`
traits.
4 years ago
Franck Royer a7b89e2fe4
Use event_process = false for Alice
As we do not process the event, we can just implement the needed `From`
traits.
4 years ago
Franck Royer 554ae6c00e
Remove Request Response types
These are actually not needed and forces us to cater for variants when
processing requests and responses.
4 years ago
Franck Royer 5a5a1c05f7
Set appropriate name to codec 4 years ago
Franck Royer a11e894b31
Prepend all libp2p protocols with "comit" 4 years ago
Franck Royer cfc5cb5206
Remove dead code and combine swap request & one shot codecs 4 years ago
Franck Royer fc2d8d3861
Rename alice::Message0 to Message0
There is now only one message0
4 years ago
Franck Royer 88bf080dc0
rename alice::Message0 to Message1 4 years ago
Franck Royer 18f326ddd1
Rename bob::Message1 to Message2
As per sequence diagram.
4 years ago
Franck Royer 0d1be52966
Rename alice::Message1 to Message3
As per sequence diagram.
4 years ago
Franck Royer e74efd38b5
Rename bob::Message2 to Message4
As per sequence diagram.
4 years ago
Franck Royer 081237bb6f
Remove unused behaviours 4 years ago
Franck Royer ecb54958ee
Preemptively Box few messages 4 years ago
Franck Royer 3fa4ffa82c
Implement new behaviour for execution setup 4 years ago
Franck Royer 9ae050abf8
Use correct variable name 4 years ago
Franck Royer c316ea5244
Upgrade toolchain
Needed to use libp2p-async-await
4 years ago
Franck Royer e82383bcf6
Avoid carrying rng 4 years ago
Philipp Hoenisch 25bf5df122
Merge pull request #172 from comit-network/dead-code
Remove dead code
4 years ago
Philipp Hoenisch 8743527df9
Remove dead code 4 years ago
Daniel Karzel b27363e386 Use correct default data directory 4 years ago
Daniel Karzel 5cb4f3c99d rename configuration to config 4 years ago
Daniel Karzel 89b3775e05 Rename config to execution_params 4 years ago
Daniel Karzel 802dc61e7e Configuration for RPC urls and Bitcoin wallet name 4 years ago
Franck Royer f1c07fbb6d
Remove incorrect todo 4 years ago
Franck Royer c25d5ff07e
Improve network logging 4 years ago
Franck Royer f9f17b0e23
Do not consider transfer proof sent until it's ack'd 4 years ago
Franck Royer b968c98805
remove unnecessary logs 4 years ago
Franck Royer cc76b201b5
Do not consider encrypted signature sent until it's ack'd 4 years ago
Franck Royer 5af3532cbf
Fix log messages 4 years ago
Franck Royer 108cc1e6cc
Use trait instead of passing struct 4 years ago
Franck Royer 704a8e7b01
Add swap id to tracing context 4 years ago
Franck Royer b8a9356d1b
Change expiries depending on the test goal 4 years ago
Franck Royer 49b8d19e41
test: Log state on failure 4 years ago
rishflab 0b69573129
Run tests on one thread, increase T1 4 years ago