Update CI/Cargo.toml references to 0.0.122
[ldk-c-bindings] / lightning-c-bindings / demo.cpp
index c5c4b6914c010986646a606d3f80986fa3288e1f..f9284ee3cb9f377ba1240258d31490218b0a5d77 100644 (file)
@@ -97,14 +97,15 @@ const uint8_t block_2[81] = {
        0x00, // transaction count
 };
 
-void print_log(const void *this_arg, const LDKRecord *record) {
-       LDK::Str mod = Record_get_module_path(record);
-       LDK::Str str = Record_get_args(record);
-       printf("%p - %.*s:%d - %.*s\n", this_arg, (int)mod->len, mod->chars, Record_get_line(record), (int)str->len, str->chars);
+void print_log(const void *this_arg, LDKRecord record_arg) {
+       LDK::Record record(std::move(record_arg));
+       LDK::Str mod = Record_get_module_path(&record);
+       LDK::Str str = Record_get_args(&record);
+       printf("%p - %.*s:%d - %.*s\n", this_arg, (int)mod->len, mod->chars, Record_get_line(&record), (int)str->len, str->chars);
 }
 
 uint32_t get_fee(const void *this_arg, LDKConfirmationTarget target) {
-       if (target == LDKConfirmationTarget_Background) {
+       if (target == LDKConfirmationTarget_AnchorChannelFee || target == LDKConfirmationTarget_MinAllowedAnchorChannelRemoteFee) {
                return 253;
        } else {
                return 507;
@@ -132,12 +133,12 @@ struct NodeMonitors {
        void ConnectBlock(const uint8_t (*header)[80], uint32_t height, LDKCVec_C2Tuple_usizeTransactionZZ tx_data, LDKBroadcasterInterface broadcast, LDKFeeEstimator fee_est) {
                std::unique_lock<std::mutex> l(mut);
                for (auto& mon : mons) {
-                       LDK::CVec_TransactionOutputsZ res = ChannelMonitor_block_connected(&mon.second, header, tx_data, height, broadcast, fee_est, *logger);
+                       LDK::CVec_TransactionOutputsZ res = ChannelMonitor_block_connected(&mon.second, header, tx_data, height, broadcast, fee_est, logger);
                }
        }
 };
 
-LDKChannelMonitorUpdateStatus add_channel_monitor(const void *this_arg, LDKOutPoint funding_txo_arg, LDKChannelMonitor monitor_arg) {
+LDKCResult_ChannelMonitorUpdateStatusNoneZ add_channel_monitor(const void *this_arg, LDKOutPoint funding_txo_arg, LDKChannelMonitor monitor_arg) {
        // First bind the args to C++ objects so they auto-free
        LDK::ChannelMonitor mon(std::move(monitor_arg));
        LDK::OutPoint funding_txo(std::move(funding_txo_arg));
@@ -146,7 +147,7 @@ LDKChannelMonitorUpdateStatus add_channel_monitor(const void *this_arg, LDKOutPo
        std::unique_lock<std::mutex> l(arg->mut);
 
        arg->mons.push_back(std::make_pair(std::move(funding_txo), std::move(mon)));
-       return ChannelMonitorUpdateStatus_completed();
+       return CResult_ChannelMonitorUpdateStatusNoneZ_ok(ChannelMonitorUpdateStatus_completed());
 }
 static std::atomic_int mons_updated(0);
 LDKChannelMonitorUpdateStatus update_channel_monitor(const void *this_arg, LDKOutPoint funding_txo_arg, const LDKChannelMonitorUpdate *update) {
@@ -164,7 +165,7 @@ LDKChannelMonitorUpdateStatus update_channel_monitor(const void *this_arg, LDKOu
                        LDKBroadcasterInterface broadcaster = {
                                .broadcast_transactions = broadcast_txn,
                        };
-                       LDK::CResult_NoneNoneZ res = ChannelMonitor_update_monitor(&mon.second, update, &broadcaster, fee_est, arg->logger);
+                       LDK::CResult_NoneNoneZ res = ChannelMonitor_update_monitor(&mon.second, update, &broadcaster, &fee_est, arg->logger);
                        assert(res->result_ok);
                }
        }
@@ -187,7 +188,7 @@ LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ monitors_pending_monitor_e
                // Rust Vecs to each other from C++ will require a bit of effort.
                assert(arg->mons.size() == 1);
                LDK::CVec_MonitorEventZ events = ChannelMonitor_get_and_clear_pending_monitor_events(&arg->mons[0].second);
-               LDK::C2Tuple_OutPointScriptZ funding_info = ChannelMonitor_get_funding_txo(&arg->mons[0].second);
+               LDK::C2Tuple_OutPointCVec_u8ZZ funding_info = ChannelMonitor_get_funding_txo(&arg->mons[0].second);
                LDK::OutPoint outpoint = std::move(funding_info->a);
                LDKPublicKey counterparty_node_id = ChannelMonitor_get_counterparty_node_id(&arg->mons[0].second);
                LDK::C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ tuple = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new(std::move(outpoint), std::move(events), std::move(counterparty_node_id));
@@ -229,8 +230,8 @@ public:
                std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting initial handshake completion..." << std::endl;
                while (true) {
                        // Wait for the initial handshakes to complete...
-                       LDK::CVec_C2Tuple_PublicKeyCOption_NetAddressZZZ peers_1 = PeerManager_get_peer_node_ids(&net1);
-                       LDK::CVec_C2Tuple_PublicKeyCOption_NetAddressZZZ peers_2 = PeerManager_get_peer_node_ids(&net2);
+                       LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_1 = PeerManager_get_peer_node_ids(&net1);
+                       LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_2 = PeerManager_get_peer_node_ids(&net2);
                        if (peers_1->datalen == 1 && peers_2->datalen == 1) { break; }
                        std::this_thread::yield();
                }
@@ -242,13 +243,14 @@ public:
 
                // Then disconnect the "main" connection, while another connection is being made.
                PeerManager_disconnect_by_node_id(&net1, ChannelManager_get_our_node_id(&cm2));
+               PeerManager_disconnect_by_node_id(&net2, ChannelManager_get_our_node_id(&cm1));
                assert(!socket_connect(node1_handler, ChannelManager_get_our_node_id(&cm2), (sockaddr*)&listen_addr, sizeof(listen_addr)));
 
                std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting new connection handshake..." << std::endl;
                while (true) {
                        // Wait for the new connection handshake...
-                       LDK::CVec_C2Tuple_PublicKeyCOption_NetAddressZZZ peers_1 = PeerManager_get_peer_node_ids(&net1);
-                       LDK::CVec_C2Tuple_PublicKeyCOption_NetAddressZZZ peers_2 = PeerManager_get_peer_node_ids(&net2);
+                       LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_1 = PeerManager_get_peer_node_ids(&net1);
+                       LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_2 = PeerManager_get_peer_node_ids(&net2);
                        if (peers_1->datalen == 1 && peers_2->datalen == 1) { break; }
                        std::this_thread::yield();
                }
@@ -259,8 +261,8 @@ public:
                while (true) {
                        PeerManager_disconnect_by_node_id(&net1, ChannelManager_get_our_node_id(&cm2));
                        // Wait for the peers to disconnect...
-                       LDK::CVec_C2Tuple_PublicKeyCOption_NetAddressZZZ peers_1 = PeerManager_get_peer_node_ids(&net1);
-                       LDK::CVec_C2Tuple_PublicKeyCOption_NetAddressZZZ peers_2 = PeerManager_get_peer_node_ids(&net2);
+                       LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_1 = PeerManager_get_peer_node_ids(&net1);
+                       LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_2 = PeerManager_get_peer_node_ids(&net2);
                        if (peers_1->datalen == 0 && peers_2->datalen == 0) { break; }
                        std::this_thread::yield();
                }
@@ -275,8 +277,8 @@ public:
                std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting initial handshake completion..." << std::endl;
                while (true) {
                        // Wait for the initial handshakes to complete...
-                       LDK::CVec_C2Tuple_PublicKeyCOption_NetAddressZZZ peers_1 = PeerManager_get_peer_node_ids(&net1);
-                       LDK::CVec_C2Tuple_PublicKeyCOption_NetAddressZZZ peers_2 = PeerManager_get_peer_node_ids(&net2);
+                       LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_1 = PeerManager_get_peer_node_ids(&net1);
+                       LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_2 = PeerManager_get_peer_node_ids(&net2);
                        if (peers_1->datalen == 1 && peers_2->datalen == 1) { break; }
                        std::this_thread::yield();
                }
@@ -354,9 +356,9 @@ public:
                t2 = std::thread(&sock_read_data_thread, pipefds_1_to_2[0], &sock2, &net2);
 
                // Note that we have to bind the result to a C++ class to make sure it gets free'd
-               LDK::CResult_CVec_u8ZPeerHandleErrorZ con_res = PeerManager_new_outbound_connection(&net1, ChannelManager_get_our_node_id(&cm2), sock1, COption_NetAddressZ_none());
+               LDK::CResult_CVec_u8ZPeerHandleErrorZ con_res = PeerManager_new_outbound_connection(&net1, ChannelManager_get_our_node_id(&cm2), sock1, COption_SocketAddressZ_none());
                assert(con_res->result_ok);
-               LDK::CResult_NonePeerHandleErrorZ con_res2 = PeerManager_new_inbound_connection(&net2, sock2, COption_NetAddressZ_none());
+               LDK::CResult_NonePeerHandleErrorZ con_res2 = PeerManager_new_inbound_connection(&net2, sock2, COption_SocketAddressZ_none());
                assert(con_res2->result_ok);
 
                auto writelen = write(pipefds_1_to_2[1], con_res->contents.result->data, con_res->contents.result->datalen);
@@ -365,8 +367,8 @@ public:
                std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting initial handshake completion..." << std::endl;
                while (true) {
                        // Wait for the initial handshakes to complete...
-                       LDK::CVec_C2Tuple_PublicKeyCOption_NetAddressZZZ peers_1 = PeerManager_get_peer_node_ids(&net1);
-                       LDK::CVec_C2Tuple_PublicKeyCOption_NetAddressZZZ peers_2 = PeerManager_get_peer_node_ids(&net2);
+                       LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_1 = PeerManager_get_peer_node_ids(&net1);
+                       LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_2 = PeerManager_get_peer_node_ids(&net2);
                        if (peers_1->datalen == 1 && peers_2->datalen ==1) { break; }
                        std::this_thread::yield();
                }
@@ -386,7 +388,7 @@ public:
 
 struct CustomOnionMsgQueue {
        std::mutex mtx;
-       std::vector<LDK::CustomOnionMessageContents> msgs;
+       std::vector<LDK::OnionMessageContents> msgs;
 };
 
 uint64_t custom_onion_msg_type_id(const void *this_arg) {
@@ -399,32 +401,44 @@ LDKCVec_u8Z custom_onion_msg_bytes(const void *this_arg) {
                .data = bytes, .datalen = 1024
        };
 }
+LDKStr custom_onion_msg_str(const void *this_arg) {
+       return LDKStr {
+               .chars = (const uint8_t*)"Custom Onion Message",
+               .len = 20, .chars_is_owned = false
+       };
+}
 
-LDKCOption_CustomOnionMessageContentsZ handle_custom_onion_message(const void* this_arg, struct LDKCustomOnionMessageContents msg) {
+LDKCOption_OnionMessageContentsZ handle_custom_onion_message(const void* this_arg, struct LDKOnionMessageContents msg) {
        CustomOnionMsgQueue* arg = (CustomOnionMsgQueue*) this_arg;
        std::unique_lock<std::mutex> lck(arg->mtx);
        arg->msgs.push_back(std::move(msg));
-       return COption_CustomOnionMessageContentsZ_none();
+       return COption_OnionMessageContentsZ_none();
 }
 
-LDKCustomOnionMessageContents build_custom_onion_message() {
-       return LDKCustomOnionMessageContents {
+LDKOnionMessageContents build_custom_onion_message() {
+       return LDKOnionMessageContents {
                .this_arg = NULL,
                .tlv_type = custom_onion_msg_type_id,
                .write = custom_onion_msg_bytes,
+               .debug_str = custom_onion_msg_str,
+               .cloned = NULL,
                .free = NULL,
        };
 }
 
-LDKCResult_COption_CustomOnionMessageContentsZDecodeErrorZ read_custom_onion_message(const void* this_arg, uint64_t type, LDKu8slice buf) {
+LDKCResult_COption_OnionMessageContentsZDecodeErrorZ read_custom_onion_message(const void* this_arg, uint64_t type, LDKu8slice buf) {
        assert(type == 8888);
        assert(buf.datalen == 1024);
        uint8_t cmp[1024];
        memset(cmp, 43, 1024);
        assert(!memcmp(cmp, buf.data, 1024));
-       return CResult_COption_CustomOnionMessageContentsZDecodeErrorZ_ok(COption_CustomOnionMessageContentsZ_some(build_custom_onion_message()));
+       return CResult_COption_OnionMessageContentsZDecodeErrorZ_ok(COption_OnionMessageContentsZ_some(build_custom_onion_message()));
 }
 
+LDKCVec_C3Tuple_OnionMessageContentsDestinationBlindedPathZZ release_no_messages(const void* this_arg) {
+       return LDKCVec_C3Tuple_OnionMessageContentsDestinationBlindedPathZZ {
+               .data = NULL, .datalen = 0 };
+}
 
 struct CustomMsgQueue {
        std::vector<LDK::Type> msgs;
@@ -497,7 +511,7 @@ LDKInitFeatures custom_init_features(const void *this_arg, struct LDKPublicKey t
        return InitFeatures_empty();
 }
 
-uint64_t get_chan_score(const void *this_arg, uint64_t scid, const LDKNodeId *src, const LDKNodeId *dst, LDKChannelUsage usage_in, const LDKProbabilisticScoringFeeParameters *params) {
+uint64_t get_chan_score(const void *this_arg, const LDKCandidateRouteHop *hop, LDKChannelUsage usage_in, const LDKProbabilisticScoringFeeParameters *params) {
        LDK::ChannelUsage usage(std::move(usage_in));
        return 42;
 }
@@ -597,7 +611,7 @@ int main() {
                LDK::IgnoringMessageHandler ignoring_handler1 = IgnoringMessageHandler_new();
                LDK::CustomMessageHandler custom_msg_handler1 = IgnoringMessageHandler_as_CustomMessageHandler(&ignoring_handler1);
                LDK::CustomOnionMessageHandler custom_onion_msg_handler1 = IgnoringMessageHandler_as_CustomOnionMessageHandler(&ignoring_handler1);
-               LDK::DefaultMessageRouter mr1 = DefaultMessageRouter_new();
+               LDK::DefaultMessageRouter mr1 = DefaultMessageRouter_new(&net_graph1, KeysManager_as_EntropySource(&keys1));
                LDK::OnionMessenger om1 = OnionMessenger_new(KeysManager_as_EntropySource(&keys1), KeysManager_as_NodeSigner(&keys1), logger1, DefaultMessageRouter_as_MessageRouter(&mr1), IgnoringMessageHandler_as_OffersMessageHandler(&ignoring_handler1), std::move(custom_onion_msg_handler1));
 
                LDK::CVec_ChannelDetailsZ channels = ChannelManager_list_channels(&cm1);
@@ -633,7 +647,7 @@ int main() {
                LDK::IgnoringMessageHandler ignoring_handler2 = IgnoringMessageHandler_new();
                LDK::CustomMessageHandler custom_msg_handler2 = IgnoringMessageHandler_as_CustomMessageHandler(&ignoring_handler2);
                LDK::CustomOnionMessageHandler custom_onion_msg_handler2 = IgnoringMessageHandler_as_CustomOnionMessageHandler(&ignoring_handler2);
-               LDK::DefaultMessageRouter mr2 = DefaultMessageRouter_new();
+               LDK::DefaultMessageRouter mr2 = DefaultMessageRouter_new(&net_graph2, KeysManager_as_EntropySource(&keys2));
                LDK::OnionMessenger om2 = OnionMessenger_new(KeysManager_as_EntropySource(&keys2), KeysManager_as_NodeSigner(&keys2), logger2, DefaultMessageRouter_as_MessageRouter(&mr2), IgnoringMessageHandler_as_OffersMessageHandler(&ignoring_handler2), std::move(custom_onion_msg_handler2));
 
                LDK::CVec_ChannelDetailsZ channels2 = ChannelManager_list_channels(&cm2);
@@ -654,7 +668,7 @@ int main() {
                PeersConnection conn(cm1, cm2, net1, net2);
 
                // Note that we have to bind the result to a C++ class to make sure it gets free'd
-               LDK::CResult__u832APIErrorZ res = ChannelManager_create_channel(&cm1, ChannelManager_get_our_node_id(&cm2), 40000, 1000, U128_new(user_id_1), UserConfig_default());
+               LDK::CResult_ThirtyTwoBytesAPIErrorZ res = ChannelManager_create_channel(&cm1, ChannelManager_get_our_node_id(&cm2), 40000, 1000, U128_new(user_id_1), COption_ThirtyTwoBytesZ_none(), UserConfig_default());
                assert(res->result_ok);
                PeerManager_process_events(&net1);
 
@@ -848,18 +862,16 @@ int main() {
 
                {
                        LDK::CVec_ChannelDetailsZ outbound_channels = ChannelManager_list_usable_channels(&cm1);
-                       LDK::Score chan_scorer = LDKScore {
-                               .this_arg = NULL, .channel_penalty_msat = get_chan_score,
-                               .payment_path_failed = NULL, .payment_path_successful = NULL, .probe_failed = NULL,
-                               .probe_successful = NULL, .write = NULL, .free = NULL,
+                       LDK::ScoreLookUp chan_scorer = LDKScoreLookUp {
+                               .this_arg = NULL, .channel_penalty_msat = get_chan_score, .free = NULL,
                        };
                        LDK::Payee payee = Payee_clear(ChannelManager_get_our_node_id(&cm2), Bolt11Invoice_route_hints(invoice->contents.result),
                                LDKBolt11InvoiceFeatures {
                                        .inner = NULL, .is_owned = false
                                }, Bolt11Invoice_min_final_cltv_expiry_delta(invoice->contents.result));
-                       LDK::RouteParameters route_params = RouteParameters_new(PaymentParameters_new(
-                                       std::move(payee), COption_u64Z_none(), 0xffffffff, 1, 2,
-                                       LDKCVec_u64Z { .data = NULL, .datalen = 0 }),
+                       LDK::RouteParameters route_params = RouteParameters_from_payment_params_and_value(
+                               PaymentParameters_new(std::move(payee), COption_u64Z_none(), 0xffffffff, 1, 2,
+                                       LDKCVec_u64Z { .data = NULL, .datalen = 0 }, LDKCVec_u64Z { .data = NULL, .datalen = 0 }),
                                5000);
                        random_bytes = entropy_source1.get_secure_random_bytes();
                        LDK::ProbabilisticScoringFeeParameters params = ProbabilisticScoringFeeParameters_default();
@@ -918,7 +930,7 @@ int main() {
                        assert(!memcmp(queue.events[0]->payment_claimable.purpose.invoice_payment.payment_secret.data,
                                        Bolt11Invoice_payment_secret(invoice->contents.result), 32));
                        assert(queue.events[0]->payment_claimable.amount_msat == 5000);
-                       assert(queue.events[0]->payment_claimable.purpose.invoice_payment.payment_preimage.tag == LDKCOption_PaymentPreimageZ_Some);
+                       assert(queue.events[0]->payment_claimable.purpose.invoice_payment.payment_preimage.tag == LDKCOption_ThirtyTwoBytesZ_Some);
                        memcpy(payment_preimage.data, queue.events[0]->payment_claimable.purpose.invoice_payment.payment_preimage.some.data, 32);
                        ChannelManager_claim_funds(&cm2, payment_preimage);
 
@@ -931,11 +943,6 @@ int main() {
                }
                PeerManager_process_events(&net2);
                // Wait until we've passed through a full set of monitor updates (ie new preimage + CS/RAA messages)
-               std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting 5 updated monitors..." << std::endl;
-               while (mons_updated != 5) {
-                       std::this_thread::yield();
-               }
-               std::cout << __FILE__ << ":" << __LINE__ << " - " << "5 monitors updated!" << std::endl;
                {
                        EventQueue queue;
                        LDKEventHandler handler = { .this_arg = &queue, .handle_event = handle_event, .free = NULL };
@@ -949,9 +956,14 @@ int main() {
                        assert(queue.events[0]->tag == LDKEvent_PaymentSent);
                        assert(!memcmp(queue.events[0]->payment_sent.payment_preimage.data, payment_preimage.data, 32));
                        assert(queue.events[1]->tag == LDKEvent_PaymentPathSuccessful);
-                       assert(queue.events[1]->payment_path_successful.payment_hash.tag == LDKCOption_PaymentHashZ_Some);
+                       assert(queue.events[1]->payment_path_successful.payment_hash.tag == LDKCOption_ThirtyTwoBytesZ_Some);
                        assert(!memcmp(queue.events[1]->payment_path_successful.payment_hash.some.data, payment_hash.data, 32));
                }
+               std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting 5 updated monitors..." << std::endl;
+               while (mons_updated != 5) {
+                       std::this_thread::yield();
+               }
+               std::cout << __FILE__ << ":" << __LINE__ << " - " << "5 monitors updated!" << std::endl;
 
                conn.stop();
 
@@ -975,7 +987,7 @@ int main() {
        LDK::MultiThreadedLockableScore scorer_mtx1 = MultiThreadedLockableScore_new(std::move(scorer_trait1));
        LDK::LockableScore scorer_mtx_trait1 = MultiThreadedLockableScore_as_LockableScore(&scorer_mtx1);
        LDK::ProbabilisticScoringFeeParameters params = ProbabilisticScoringFeeParameters_default();
-       const LDK::DefaultRouter default_router_1 = DefaultRouter_new(&net_graph1, logger1, entropy_source1.get_secure_random_bytes(), std::move(scorer_mtx_trait1), std::move(params));
+       const LDK::DefaultRouter default_router_1 = DefaultRouter_new(&net_graph1, logger1, KeysManager_as_EntropySource(&keys1), std::move(scorer_mtx_trait1), std::move(params));
        LDKRouter router1 = {
                .this_arg = (void*)&default_router_1,
                .find_route = NULL, // LDK currently doesn't use this, its just a default-impl
@@ -984,8 +996,8 @@ int main() {
        };
 
        LDK::ChannelManagerReadArgs cm1_args = ChannelManagerReadArgs_new(KeysManager_as_EntropySource(&keys1), KeysManager_as_NodeSigner(&keys1), KeysManager_as_SignerProvider(&keys1), fee_est, mon1, broadcast, router1, logger1, UserConfig_default(), std::move(mons_list1));
-       LDK::CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ cm1_read =
-               C2Tuple_BlockHashChannelManagerZ_read(LDKu8slice { .data = cm1_ser->data, .datalen = cm1_ser -> datalen}, std::move(cm1_args));
+       LDK::CResult_C2Tuple_ThirtyTwoBytesChannelManagerZDecodeErrorZ cm1_read =
+               C2Tuple_ThirtyTwoBytesChannelManagerZ_read(LDKu8slice { .data = cm1_ser->data, .datalen = cm1_ser -> datalen}, std::move(cm1_args));
        assert(cm1_read->result_ok);
        LDK::ChannelManager cm1(std::move(cm1_read->contents.result->b));
 
@@ -993,9 +1005,10 @@ int main() {
                .this_arg = NULL,
                .handle_custom_message = NULL, // We only create custom messages, not handle them
                .read_custom_message = NULL, // We only create custom messages, not handle them
+               .release_pending_custom_messages = release_no_messages,
                .free = NULL,
        };
-       LDK::DefaultMessageRouter mr1 = DefaultMessageRouter_new();
+       LDK::DefaultMessageRouter mr1 = DefaultMessageRouter_new(&net_graph1, KeysManager_as_EntropySource(&keys1));
        LDK::IgnoringMessageHandler ignorer_1 = IgnoringMessageHandler_new();
        LDK::OnionMessenger om1 = OnionMessenger_new(KeysManager_as_EntropySource(&keys1), KeysManager_as_NodeSigner(&keys1), logger1, DefaultMessageRouter_as_MessageRouter(&mr1), IgnoringMessageHandler_as_OffersMessageHandler(&ignorer_1), std::move(custom_onion_msg_handler1));
 
@@ -1010,8 +1023,8 @@ int main() {
        LDK::SignerProvider signer_provider2 = KeysManager_as_SignerProvider(&keys2);
 
        LDK::ChannelManagerReadArgs cm2_args = ChannelManagerReadArgs_new(KeysManager_as_EntropySource(&keys2), KeysManager_as_NodeSigner(&keys2), KeysManager_as_SignerProvider(&keys2), fee_est, mon2, broadcast, panic_router, logger2, UserConfig_default(), std::move(mons_list2));
-       LDK::CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ cm2_read =
-               C2Tuple_BlockHashChannelManagerZ_read(LDKu8slice { .data = cm2_ser->data, .datalen = cm2_ser -> datalen}, std::move(cm2_args));
+       LDK::CResult_C2Tuple_ThirtyTwoBytesChannelManagerZDecodeErrorZ cm2_read =
+               C2Tuple_ThirtyTwoBytesChannelManagerZ_read(LDKu8slice { .data = cm2_ser->data, .datalen = cm2_ser -> datalen}, std::move(cm2_args));
        assert(cm2_read->result_ok);
        LDK::ChannelManager cm2(std::move(cm2_read->contents.result->b));
 
@@ -1020,9 +1033,10 @@ int main() {
                .this_arg = &peer_2_custom_onion_messages,
                .handle_custom_message = handle_custom_onion_message,
                .read_custom_message = read_custom_onion_message,
+               .release_pending_custom_messages = release_no_messages,
                .free = NULL,
        };
-       LDK::DefaultMessageRouter mr2 = DefaultMessageRouter_new();
+       LDK::DefaultMessageRouter mr2 = DefaultMessageRouter_new(&net_graph2, KeysManager_as_EntropySource(&keys2));
        LDK::IgnoringMessageHandler ignorer_2 = IgnoringMessageHandler_new();
        LDK::OnionMessenger om2 = OnionMessenger_new(KeysManager_as_EntropySource(&keys2), KeysManager_as_NodeSigner(&keys2), logger2, DefaultMessageRouter_as_MessageRouter(&mr2), IgnoringMessageHandler_as_OffersMessageHandler(&ignorer_2), custom_onion_msg_handler2);
 
@@ -1093,7 +1107,17 @@ int main() {
                }, 3600, COption_u16Z_none());
        assert(invoice_res2->result_ok);
        const LDKBolt11Invoice *invoice2 = invoice_res2->contents.result;
-       LDK::CResult_PaymentIdPaymentErrorZ invoice_pay_res = pay_invoice(invoice2, Retry_attempts(0), &cm1);
+       LDK::CResult_C3Tuple_ThirtyTwoBytesRecipientOnionFieldsRouteParametersZNoneZ pay_params =
+               payment_parameters_from_invoice(invoice2);
+       LDK::RecipientOnionFields invoice2_recipient(std::move(pay_params->contents.result->b));
+       LDK::RouteParameters invoice2_params(std::move(pay_params->contents.result->c));
+       assert(pay_params->result_ok);
+       LDKThirtyTwoBytes payment_id;
+       memset(&payment_id, 0, 32);
+       LDK::CResult_NoneRetryableSendFailureZ invoice_pay_res = ChannelManager_send_payment(
+               &cm1, std::move(pay_params->contents.result->a), std::move(invoice2_recipient),
+               std::move(payment_id), std::move(invoice2_params), Retry_attempts(0)
+       );
        assert(invoice_pay_res->result_ok);
        PeerManager_process_events(&net1);
 
@@ -1128,7 +1152,7 @@ int main() {
                        assert(!memcmp(event_data->purpose.invoice_payment.payment_secret.data,
                                        Bolt11Invoice_payment_secret(invoice2), 32));
                        assert(event_data->amount_msat == 10000);
-                       assert(event_data->purpose.invoice_payment.payment_preimage.tag == LDKCOption_PaymentPreimageZ_Some);
+                       assert(event_data->purpose.invoice_payment.payment_preimage.tag == LDKCOption_ThirtyTwoBytesZ_Some);
                        ChannelManager_claim_funds(&cm2, event_data->purpose.invoice_payment.payment_preimage.some);
 
                        queue2.events.clear();
@@ -1175,16 +1199,12 @@ int main() {
        LDK::CVec_ChannelDetailsZ chans_after_close2 = ChannelManager_list_channels(&cm2);
        assert(chans_after_close2->datalen == 0);
 
-       assert(OnionMessenger_send_onion_message(&om1,
-                       OnionMessagePath_new(
-                               LDKCVec_PublicKeyZ { .data = NULL, .datalen = 0, },
-                               Destination_node(ChannelManager_get_our_node_id(&cm2))
-                       ),
-                       LDKOnionMessageContents {
-                               .tag = LDKOnionMessageContents_Custom,
-                               .custom = build_custom_onion_message()
-                       }, LDKBlindedPath { .inner = NULL, .is_owned = true })
-               .result_ok);
+       LDK::CResult_SendSuccessSendErrorZ om_send_res =
+               OnionMessenger_send_onion_message(&om1,
+                       build_custom_onion_message(),
+                       Destination_node(ChannelManager_get_our_node_id(&cm2)),
+                       LDKBlindedPath { .inner = NULL, .is_owned = true });
+       assert(om_send_res->result_ok);
        PeerManager_process_events(&net1);
        std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting onion message..." << std::endl;
        while (true) {