Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-11-30 20:46:33 -05:00
Code Issues Projects Releases Packages Wiki Activity
2420 commits 74 branches 28 tags 90 MiB
Commit graph

2420 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lorenzo Tucci
959a309d0e
Merge branch 'rpc-server' of github.com:yamabiiko/xmr-btc-swap into rpc-server 2023-09-22 23:29:35 +03:00
Lorenzo Tucci
ec0bc8cd39
fixing test_cli_arguments and other tests 2023-09-22 23:28:49 +03:00
binarybaron
f367c2ba49 Rename get_raw_history tp get_raw_states 2023-09-08 12:53:33 +02:00
binarybaron
2ec465aec7 Merge branch 'rpc-server' of https://github.com/yamabiiko/xmr-btc-swap into rpc-server 2023-09-08 12:52:04 +02:00
Lorenzo Tucci
a6f2180b1b
fix rpc tests, only check for RPC errors and not returned values 2023-09-01 17:15:24 +03:00
Lorenzo Tucci
ccf9b0c31f
fix compile issues for tests and use serial_test crate 2023-09-01 12:31:39 +03:00
Lorenzo Tucci
9b08f71bb8
merge upstream and fix some tests 2023-09-01 12:06:13 +03:00
binarybaron
c6b76cc859 Update wallet.rs 2023-08-30 21:01:19 +02:00
binarybaron
7c69ed5d2b Return additonal info on GetSwapInfo 2023-08-30 01:34:07 +02:00
binarybaron
aa74b1ff4c Wait for swap to be suspended after sending signal 2023-08-28 12:23:12 +02:00
binarybaron
05577e3713 Rename Method::RawHistory to Method::GetRawStates 2023-08-28 12:23:12 +02:00
binarybaron
e13ed6f5c1 Add get_monero_recovery_info RPC endpoint 
- Add `get_monero_recovery_info` RPC endpoint
- format PrivateViewKey using Display
 2023-08-28 11:08:05 +02:00
binarybaron
f942a4e1ea Remove unused shutdown channel 2023-08-28 11:08:05 +02:00
binarybaron
011dd3441d use Span::current() to pass down to tracing span to spawned tasks 2023-08-28 11:08:05 +02:00
binarybaron
86ac0579f0 Sync bitcoin wallet before initial max_giveable call 2023-08-28 11:08:05 +02:00
binarybaron
1ec16c6bc1 Add tracing span attribute log_reference_id to logs caused by rpc call 2023-08-28 11:08:05 +02:00
binarybaron
fb4265b2ea Remove notes 2023-08-28 11:08:04 +02:00
binarybaron
a104c5aa7b Wait for swap to be suspended after sending signal 2023-08-28 11:02:04 +02:00
binarybaron
9c9644fe1b Rename Method::RawHistory to Method::GetRawStates 2023-08-28 11:02:04 +02:00
binarybaron
4623a08ebf Add get_monero_recovery_info RPC endpoint 
- Add `get_monero_recovery_info` RPC endpoint
- format PrivateViewKey using Display
 2023-08-28 11:02:04 +02:00
binarybaron
63afad0874 Remove unused shutdown channel 2023-08-28 11:02:04 +02:00
binarybaron
8719896fdb use Span::current() to pass down to tracing span to spawned tasks 2023-08-24 18:17:41 +02:00
binarybaron
dac9d96c39 Sync bitcoin wallet before initial max_giveable call 2023-08-24 14:26:28 +02:00
binarybaron
4bcdb1995a Add tracing span attribute log_reference_id to logs caused by rpc call 2023-08-23 00:37:25 +02:00
binarybaron
b98108df06 Update request.rs 2023-08-20 00:40:21 +02:00
binarybaron
4150f47655 Add note regarding Request, Method structs 2023-08-20 00:38:56 +02:00
binarybaron
9b503f3367 Ensure correct tracing spans 2023-08-20 00:18:44 +02:00
binarybaron
bbcfffab6d WIP: Struct for concurrent swaps manager 2023-08-16 17:59:44 +02:00
binarybaron
ec65ea2b27 Merge branch 'rpc-server' of https://github.com/yamabiiko/xmr-btc-swap into rpc-server 2023-08-14 16:54:14 +02:00
binarybaron
5ca2a9ab5a Replace get_swap_start_date, get_seller, get_expired_timelock with one get_swap_info rpc method 2023-08-14 16:49:14 +02:00
Lorenzo Tucci
969c58e987 initiating swaps in a separate task and handling shutdown signals with broadcast queues 2023-08-14 11:31:54 +02:00
Lorenzo Tucci
6a9f72a857 initiating swaps in a separate task and handling shutdown signals with broadcast queues 2023-08-14 11:21:04 +02:00
binarybaron
1b13608d96 Add get_swap_expired_timelock timelock, other small refactoring 
- Add get_swap_expired_timelock endpoint to return expired timelock if one exists. Fails if bitcoin lock tx has not yet published or if swap is already finished.
- Rename current_epoch to expired_timelock to enforce consistent method names
- Add blocks left until current expired timelock expires (next timelock expires) to ExpiredTimelock struct
- Change .expect() to .unwrap() in rpc server method register because those will only fail if we register the same method twice which will never happen
 2023-08-12 23:26:08 +02:00
binarybaron
433bf824f9 Append all cli logs to single log file 
After careful consideration, I've concluded that it's not practical/possible to ensure that the previous behaviour (one log file per swap) is preserved due to limitations of the tracing-subscriber crate and a big in the built in JSON formatter
 2023-08-12 23:26:08 +02:00
binarybaron
f804254f94 Return wallet descriptor to RPC API caller 2023-08-11 15:39:46 +02:00
binarybaron
ffbbe24010 Use RwLock instead of Mutex to allow for parallel reads and add get_current_swap endpoint 2023-08-11 15:29:59 +02:00
binarybaron
849e6e7a14 Disallow concurrent swaps 2023-08-11 11:53:07 +02:00
binarybaron
7d2b7bee92 Combine Cmd and Params 2023-08-11 10:50:13 +02:00
binarybaron
63c1edbdd3 Add cancel_refund RPC endpoint 2023-08-10 15:17:35 +02:00
binarybaron
7193866c30 dprint fmt 2023-08-10 00:15:16 +02:00
binarybaron
13945cbd8f Update Cargo.lock 2023-08-09 22:59:00 +02:00
binarybaron
75bc64d248 Merge branch 'master' into rpc-server 2023-08-09 22:52:14 +02:00
binarybaron
96cc194b46 Pass server_address properly to RpcServer 2023-08-09 22:49:13 +02:00
binarybaron
186b242db5 Add called api method and swap_id to tracing for context, reduced boilerplate 2023-08-09 22:30:41 +02:00
bors[bot]
20afb35d5b
Merge #1423 
1423: Release version 0.12.2 r=delta1 a=comit-botty-mc-botface

Hi `@delta1!`

This PR was created in response to a manual trigger of the release workflow here: 5794466350.
I've updated the changelog and bumped the versions in the manifest files in this commit: 94febeca03.

Merging this PR will create a GitHub release and upload any assets that are created as part of the release build.

Co-authored-by: COMIT Botty McBotface <botty@coblox.tech>
 2023-08-08 10:28:43 +00:00
COMIT Botty McBotface
94febeca03 Prepare release 0.12.2 2023-08-08 08:17:28 +00:00
bors[bot]
2d95e8854a
Merge #1422 
1422: ci: add rustfmt to draft-new-release r=delta1 a=delta1

fixing the draft new release action, churn in dprint means that now rustfmt is run separately so it needs to be installed at this step 

previous failure: 1568323870 

Co-authored-by: Byron Hambly <bhambly@blockstream.com>
 2023-08-08 07:51:42 +00:00
Byron Hambly
bde151f535
ci: add rustfmt to draft-new-release since changes to dprint 2023-08-08 09:48:44 +02:00
bors[bot]
cf95f465a5
Merge #1421 
1421: ci: fix dprint version for draft action r=delta1 a=delta1

This should fix the dprint issue in the draft release action - [link to failing action](1562456196) 

Co-authored-by: Byron Hambly <bhambly@blockstream.com>
 2023-08-07 15:05:47 +00:00
Byron Hambly
e741de1c08
ci: fix dprint version for draft action 2023-08-07 15:31:09 +02:00