Merge #1418 #4061

Job	Run time
bdk_test	2m 8s
sqlx_test	51s
docker_tests (happy_path)	4m 14s
docker_tests (happy_path_restart_bob_after_xmr_locked)	4m 35s
docker_tests (happy_path_restart_bob_before_xmr_locked)	4m 26s
docker_tests (happy_path_restart_alice_after_xmr_locked)	4m 22s
docker_tests (alice_and_bob_refund_using_cancel_and_refund_command)	4m 27s
docker_tests (alice_and_bob_refund_using_cancel_then_refund_command)	3m 44s
docker_tests (alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired)	4m 30s
docker_tests (punish)	5m 1s
docker_tests (alice_punishes_after_restart_bob_dead)	4m 48s
docker_tests (alice_manually_punishes_after_bob_dead)	4m 59s
docker_tests (alice_refunds_after_restart_bob_refunded)	4m 5s
docker_tests (ensure_same_swap_id)	3m 48s
docker_tests (concurrent_bobs_before_xmr_lock_proof_sent)	7m 22s
docker_tests (alice_manually_redeems_after_enc_sig_learned)	3m 55s
build (x86_64-unknown-linux-gnu, ubuntu-latest)	4m 2s
build (armv7-unknown-linux-gnueabihf, ubuntu-latest)	10m 11s
build (x86_64-apple-darwin, macos-latest)	3m 34s
build (x86_64-pc-windows-msvc, windows-latest)	5m 47s
static_analysis	1m 20s
test (ubuntu-latest)	12m 14s
test (macos-latest)	12m 14s
	1h 56m 37s

Provide feedback