Merge #1418 #4060

Job	Run time
sqlx_test	1m 11s
bdk_test	2m 8s
build (x86_64-unknown-linux-gnu, ubuntu-latest)	4m 32s
build (armv7-unknown-linux-gnueabihf, ubuntu-latest)	12m 1s
build (x86_64-apple-darwin, macos-latest)	3m 28s
build (x86_64-pc-windows-msvc, windows-latest)	4m 1s
docker_tests (happy_path)	4m 11s
docker_tests (happy_path_restart_bob_after_xmr_locked)	3m 52s
docker_tests (happy_path_restart_bob_before_xmr_locked)	4m 11s
docker_tests (happy_path_restart_alice_after_xmr_locked)	3m 59s
docker_tests (alice_and_bob_refund_using_cancel_and_refund_command)	3m 54s
docker_tests (alice_and_bob_refund_using_cancel_then_refund_command)	4m 14s
docker_tests (alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired)	3m 39s
docker_tests (punish)	4m 0s
docker_tests (alice_punishes_after_restart_bob_dead)	3m 57s
docker_tests (alice_manually_punishes_after_bob_dead)	4m 13s
docker_tests (alice_refunds_after_restart_bob_refunded)	3m 55s
docker_tests (ensure_same_swap_id)	3m 17s
docker_tests (concurrent_bobs_before_xmr_lock_proof_sent)	4m 12s
docker_tests (alice_manually_redeems_after_enc_sig_learned)	3m 55s
static_analysis	1m 13s
test (ubuntu-latest)	14m 26s
test (macos-latest)	11m 51s
	1h 50m 20s

Provide feedback