Merge #1416 #4045

Job	Run time
sqlx_test	8m 2s
static_analysis	7m 35s
bdk_test	6m 37s
build (x86_64-unknown-linux-gnu, ubuntu-latest)	8m 28s
build (armv7-unknown-linux-gnueabihf, ubuntu-latest)	12m 20s
build (x86_64-apple-darwin, macos-latest)	12m 6s
build (x86_64-pc-windows-msvc, windows-latest)	12m 36s
docker_tests (happy_path)	8m 49s
docker_tests (happy_path_restart_bob_after_xmr_locked)	9m 40s
docker_tests (happy_path_restart_bob_before_xmr_locked)	8m 26s
docker_tests (happy_path_restart_alice_after_xmr_locked)	10m 3s
docker_tests (alice_and_bob_refund_using_cancel_and_refund_command)	9m 59s
docker_tests (alice_and_bob_refund_using_cancel_then_refund_command)	8m 41s
docker_tests (alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired)	8m 12s
docker_tests (punish)	9m 23s
docker_tests (alice_punishes_after_restart_bob_dead)	8m 37s
docker_tests (alice_manually_punishes_after_bob_dead)	8m 29s
docker_tests (alice_refunds_after_restart_bob_refunded)	8m 55s
docker_tests (ensure_same_swap_id)	8m 13s
docker_tests (concurrent_bobs_before_xmr_lock_proof_sent)	14m 10s
docker_tests (alice_manually_redeems_after_enc_sig_learned)	9m 15s
test (ubuntu-latest)	17m 26s
test (macos-latest)	20m 48s
	3h 56m 50s

Provide feedback