Merge #1451 #4215

Job	Run time
sqlx_test	57s
build (x86_64-unknown-linux-gnu, ubuntu-latest)	3m 41s
docker_tests (happy_path)	4m 24s
build (armv7-unknown-linux-gnueabihf, ubuntu-latest)	11m 31s
bdk_test	1m 40s
docker_tests (happy_path_restart_bob_after_xmr_locked)	4m 43s
static_analysis	1m 32s
build (x86_64-apple-darwin, macos-latest)	3m 18s
docker_tests (happy_path_restart_bob_before_xmr_locked)	4m 28s
build (x86_64-pc-windows-msvc, windows-latest)	4m 35s
docker_tests (happy_path_restart_alice_after_xmr_locked)	3m 55s
test (ubuntu-latest)	15m 9s
docker_tests (alice_and_bob_refund_using_cancel_and_refund_command)	3m 44s
test (macos-latest)	11m 44s
docker_tests (alice_and_bob_refund_using_cancel_then_refund_command)	4m 54s
docker_tests (alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired)	4m 7s
docker_tests (punish)	4m 46s
docker_tests (alice_punishes_after_restart_bob_dead)	4m 5s
docker_tests (alice_manually_punishes_after_bob_dead)	4m 3s
docker_tests (alice_refunds_after_restart_bob_refunded)	4m 36s
docker_tests (ensure_same_swap_id)	3m 35s
docker_tests (concurrent_bobs_before_xmr_lock_proof_sent)	7m 35s
docker_tests (alice_manually_redeems_after_enc_sig_learned)	4m 14s
	1h 57m 16s

Provide feedback