Merge #1398 #4050

Job	Run time
bdk_test	1m 33s
sqlx_test	56s
static_analysis	1m 14s
build (x86_64-unknown-linux-gnu, ubuntu-latest)	4m 13s
build (armv7-unknown-linux-gnueabihf, ubuntu-latest)	9m 29s
build (x86_64-apple-darwin, macos-latest)	5m 38s
build (x86_64-pc-windows-msvc, windows-latest)	6m 6s
test (ubuntu-latest)	16m 8s
test (macos-latest)	11m 21s
docker_tests (happy_path)	8m 33s
docker_tests (happy_path_restart_bob_after_xmr_locked)	9m 54s
docker_tests (happy_path_restart_bob_before_xmr_locked)	11m 6s
docker_tests (happy_path_restart_alice_after_xmr_locked)	8m 33s
docker_tests (alice_and_bob_refund_using_cancel_and_refund_command)	9m 38s
docker_tests (alice_and_bob_refund_using_cancel_then_refund_command)	10m 39s
docker_tests (alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired)	8m 7s
docker_tests (punish)	8m 40s
docker_tests (alice_punishes_after_restart_bob_dead)	10m 35s
docker_tests (alice_manually_punishes_after_bob_dead)	8m 45s
docker_tests (alice_refunds_after_restart_bob_refunded)	11m 6s
docker_tests (ensure_same_swap_id)	8m 24s
docker_tests (concurrent_bobs_before_xmr_lock_proof_sent)	12m 31s
docker_tests (alice_manually_redeems_after_enc_sig_learned)	8m 30s
	3h 11m 39s

Provide feedback