Merge #1429 #4104

Job	Run time
bdk_test	6m 37s
sqlx_test	1m 25s
build (x86_64-unknown-linux-gnu, ubuntu-latest)	8m 47s
build (armv7-unknown-linux-gnueabihf, ubuntu-latest)	10m 43s
build (x86_64-apple-darwin, macos-latest)	10m 47s
build (x86_64-pc-windows-msvc, windows-latest)	4m 46s
docker_tests (happy_path)	8m 43s
docker_tests (happy_path_restart_bob_after_xmr_locked)	8m 58s
docker_tests (happy_path_restart_bob_before_xmr_locked)	8m 39s
docker_tests (happy_path_restart_alice_after_xmr_locked)	8m 52s
docker_tests (alice_and_bob_refund_using_cancel_and_refund_command)	9m 11s
docker_tests (alice_and_bob_refund_using_cancel_then_refund_command)	8m 57s
docker_tests (alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired)	9m 11s
docker_tests (punish)	8m 57s
docker_tests (alice_punishes_after_restart_bob_dead)	9m 10s
docker_tests (alice_manually_punishes_after_bob_dead)	9m 11s
docker_tests (alice_refunds_after_restart_bob_refunded)	8m 59s
docker_tests (ensure_same_swap_id)	8m 32s
docker_tests (concurrent_bobs_before_xmr_lock_proof_sent)	9m 10s
docker_tests (alice_manually_redeems_after_enc_sig_learned)	9m 10s
static_analysis	5m 43s
test (ubuntu-latest)	9m 35s
test (macos-latest)	10m 55s
	3h 14m 58s

Provide feedback