Merge #1404 #4056

Job	Run time
static_analysis	1m 33s
build (x86_64-unknown-linux-gnu, ubuntu-latest)	4m 6s
build (armv7-unknown-linux-gnueabihf, ubuntu-latest)	10m 11s
build (x86_64-apple-darwin, macos-latest)	7m 30s
build (x86_64-pc-windows-msvc, windows-latest)	4m 21s
bdk_test	2m 12s
sqlx_test	1m 23s
docker_tests (happy_path)	4m 44s
docker_tests (happy_path_restart_bob_after_xmr_locked)	4m 48s
docker_tests (happy_path_restart_bob_before_xmr_locked)	4m 20s
docker_tests (happy_path_restart_alice_after_xmr_locked)	4m 59s
docker_tests (alice_and_bob_refund_using_cancel_and_refund_command)	4m 48s
docker_tests (alice_and_bob_refund_using_cancel_then_refund_command)	5m 18s
docker_tests (alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired)	4m 15s
docker_tests (punish)	4m 20s
docker_tests (alice_punishes_after_restart_bob_dead)	4m 51s
docker_tests (alice_manually_punishes_after_bob_dead)	7m 50s
docker_tests (alice_refunds_after_restart_bob_refunded)	4m 0s
docker_tests (ensure_same_swap_id)	4m 0s
docker_tests (concurrent_bobs_before_xmr_lock_proof_sent)	7m 31s
docker_tests (alice_manually_redeems_after_enc_sig_learned)	4m 16s
test (ubuntu-latest)	14m 3s
test (macos-latest)	16m 21s
	2h 11m 40s

Provide feedback