Merge from upstream

[binarybaron]

• fix(cli): allow bitcoin-change-address to be omitted when making request to rpc server comit-network/xmr-btc-swap#1728 merged into this repo with feat(gui, swap): allow change-address to be omitted and default to internal wallet #68
• feat: Enhance history command with more swap details comit-network/xmr-btc-swap#1725
• feat(asb): Retry locking Monero comit-network/xmr-btc-swap#1731
• fix(asb): Allow history command to be run while asb is running comit-network/xmr-btc-swap#1724
• Allow history command to be executed while asb is running by opening database in read-only mode comit-network/xmr-btc-swap#1722
• allow --change-address to be omitted and default to internal wallet address comit-network/xmr-btc-swap#1709 merged into this repo with feat(gui, swap): allow change-address to be omitted and default to internal wallet #68
• fix: Format cooperative redeem reject using thiserror comit-network/xmr-btc-swap#1716