Merge pull request #3035 from TheBlueMatt/2024-04-upstream-123-bindings

diff --cc lightning/src/chain/chainmonitor.rs
Simple merge

diff --cc lightning/src/ln/channel.rs
Simple merge

diff --cc lightning/src/ln/channelmanager.rs
Simple merge

diff --cc lightning/src/ln/functional_tests.rs
Simple merge

diff --cc lightning/src/ln/outbound_payment.rs
Simple merge

diff --cc lightning/src/ln/shutdown_tests.rs
Simple merge

diff --cc lightning/src/offers/invoice.rs
Simple merge

diff --cc lightning/src/offers/invoice_request.rs
Simple merge

diff --cc lightning/src/offers/refund.rs
Simple merge