Add missing `rustc` `metadata` override for `lightning_types`

[ldk-c-bindings] / lightning-c-bindings / demo.cpp

diff --git a/lightning-c-bindings/demo.cpp b/lightning-c-bindings/demo.cpp
index f9284ee3cb9f377ba1240258d31490218b0a5d77..7d8f3e6101dd246d79f6bbe6395798bf95900f14 100644 (file)
--- a/lightning-c-bindings/demo.cpp
+++ b/lightning-c-bindings/demo.cpp
@@ -174,12 +174,12 @@ LDKChannelMonitorUpdateStatus update_channel_monitor(const void *this_arg, LDKOu
        mons_updated += 1;
        return ChannelMonitorUpdateStatus_completed();
 }
        mons_updated += 1;
        return ChannelMonitorUpdateStatus_completed();
 }

-LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ monitors_pending_monitor_events(const void *this_arg) {
+LDKCVec_C4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZZ monitors_pending_monitor_events(const void *this_arg) {

        NodeMonitors* arg = (NodeMonitors*) this_arg;
        std::unique_lock<std::mutex> l(arg->mut);
 
        if (arg->mons.size() == 0) {
        NodeMonitors* arg = (NodeMonitors*) this_arg;
        std::unique_lock<std::mutex> l(arg->mut);
 
        if (arg->mons.size() == 0) {

-               return LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ {
+               return LDKCVec_C4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZZ {

                        .data = NULL,
                        .datalen = 0,
                };
                        .data = NULL,
                        .datalen = 0,
                };


@@ -191,9 +191,12 @@ LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ monitors_pending_monitor_e
                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::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));
-               auto vec = LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ {
-                       .data = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)malloc(sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ)),
+               LDKThirtyTwoBytes channel_id;
+               memset(&channel_id, 0, sizeof(channel_id));
+               LDK::ChannelId chan_id = ChannelId_new(channel_id);
+               LDK::C4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZ tuple = C4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZ_new(std::move(outpoint), std::move(chan_id), std::move(events), std::move(counterparty_node_id));
+               auto vec = LDKCVec_C4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZZ {
+                       .data = (LDKC4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZ*)malloc(sizeof(LDKC4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZ)),

                        .datalen = 1,
                };
                vec.data[0] = std::move(tuple);
                        .datalen = 1,
                };
                vec.data[0] = std::move(tuple);


@@ -204,9 +207,10 @@ LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ monitors_pending_monitor_e
 struct EventQueue {
        std::vector<LDK::Event> events;
 };
 struct EventQueue {
        std::vector<LDK::Event> events;
 };

-void handle_event(const void *this_arg, LDKEvent event) {
+LDKCResult_NoneReplayEventZ handle_event(const void *this_arg, LDKEvent event) {

        EventQueue* arg = (EventQueue*) this_arg;
        arg->events.push_back(std::move(event));
        EventQueue* arg = (EventQueue*) this_arg;
        arg->events.push_back(std::move(event));

+       return CResult_NoneReplayEventZ_ok();

 }
 
 #ifdef REAL_NET
 }
 
 #ifdef REAL_NET


@@ -230,8 +234,8 @@ public:
                std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting initial handshake completion..." << std::endl;
                while (true) {
                        // Wait for the initial handshakes to complete...
                std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting initial handshake completion..." << std::endl;
                while (true) {
                        // Wait for the initial handshakes to complete...

-                       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);
+                       LDK::CVec_PeerDetailsZ peers_1 = PeerManager_list_peers(&net1);
+                       LDK::CVec_PeerDetailsZ peers_2 = PeerManager_list_peers(&net2);

                        if (peers_1->datalen == 1 && peers_2->datalen == 1) { break; }
                        std::this_thread::yield();
                }
                        if (peers_1->datalen == 1 && peers_2->datalen == 1) { break; }
                        std::this_thread::yield();
                }


@@ -249,8 +253,8 @@ public:
                std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting new connection handshake..." << std::endl;
                while (true) {
                        // Wait for the new connection handshake...
                std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting new connection handshake..." << std::endl;
                while (true) {
                        // Wait for the new connection handshake...

-                       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);
+                       LDK::CVec_PeerDetailsZ peers_1 = PeerManager_list_peers(&net1);
+                       LDK::CVec_PeerDetailsZ peers_2 = PeerManager_list_peers(&net2);

                        if (peers_1->datalen == 1 && peers_2->datalen == 1) { break; }
                        std::this_thread::yield();
                }
                        if (peers_1->datalen == 1 && peers_2->datalen == 1) { break; }
                        std::this_thread::yield();
                }


@@ -261,8 +265,8 @@ public:
                while (true) {
                        PeerManager_disconnect_by_node_id(&net1, ChannelManager_get_our_node_id(&cm2));
                        // Wait for the peers to disconnect...
                while (true) {
                        PeerManager_disconnect_by_node_id(&net1, ChannelManager_get_our_node_id(&cm2));
                        // Wait for the peers to disconnect...

-                       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);
+                       LDK::CVec_PeerDetailsZ peers_1 = PeerManager_list_peers(&net1);
+                       LDK::CVec_PeerDetailsZ peers_2 = PeerManager_list_peers(&net2);

                        if (peers_1->datalen == 0 && peers_2->datalen == 0) { break; }
                        std::this_thread::yield();
                }
                        if (peers_1->datalen == 0 && peers_2->datalen == 0) { break; }
                        std::this_thread::yield();
                }


@@ -277,8 +281,8 @@ public:
                std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting initial handshake completion..." << std::endl;
                while (true) {
                        // Wait for the initial handshakes to complete...
                std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting initial handshake completion..." << std::endl;
                while (true) {
                        // Wait for the initial handshakes to complete...

-                       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);
+                       LDK::CVec_PeerDetailsZ peers_1 = PeerManager_list_peers(&net1);
+                       LDK::CVec_PeerDetailsZ peers_2 = PeerManager_list_peers(&net2);

                        if (peers_1->datalen == 1 && peers_2->datalen == 1) { break; }
                        std::this_thread::yield();
                }
                        if (peers_1->datalen == 1 && peers_2->datalen == 1) { break; }
                        std::this_thread::yield();
                }


@@ -367,8 +371,8 @@ public:
                std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting initial handshake completion..." << std::endl;
                while (true) {
                        // Wait for the initial handshakes to complete...
                std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting initial handshake completion..." << std::endl;
                while (true) {
                        // Wait for the initial handshakes to complete...

-                       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);
+                       LDK::CVec_PeerDetailsZ peers_1 = PeerManager_list_peers(&net1);
+                       LDK::CVec_PeerDetailsZ peers_2 = PeerManager_list_peers(&net2);

                        if (peers_1->datalen == 1 && peers_2->datalen ==1) { break; }
                        std::this_thread::yield();
                }
                        if (peers_1->datalen == 1 && peers_2->datalen ==1) { break; }
                        std::this_thread::yield();
                }


@@ -408,11 +412,13 @@ LDKStr custom_onion_msg_str(const void *this_arg) {
        };
 }
 
        };
 }
 

-LDKCOption_OnionMessageContentsZ handle_custom_onion_message(const void* this_arg, struct LDKOnionMessageContents msg) {
+LDKCOption_C2Tuple_OnionMessageContentsResponseInstructionZZ handle_custom_onion_message(const void* this_arg, struct LDKOnionMessageContents msg, LDKCOption_CVec_u8ZZ context, LDKResponder responder) {
+       LDK::Responder resp(std::move(responder));
+       LDK::COption_CVec_u8ZZ ctx(std::move(context));

        CustomOnionMsgQueue* arg = (CustomOnionMsgQueue*) this_arg;
        std::unique_lock<std::mutex> lck(arg->mtx);
        arg->msgs.push_back(std::move(msg));
        CustomOnionMsgQueue* arg = (CustomOnionMsgQueue*) this_arg;
        std::unique_lock<std::mutex> lck(arg->mtx);
        arg->msgs.push_back(std::move(msg));

-       return COption_OnionMessageContentsZ_none();
+       return COption_C2Tuple_OnionMessageContentsResponseInstructionZZ_none();

 }
 
 LDKOnionMessageContents build_custom_onion_message() {
 }
 
 LDKOnionMessageContents build_custom_onion_message() {


@@ -435,9 +441,10 @@ LDKCResult_COption_OnionMessageContentsZDecodeErrorZ read_custom_onion_message(c
        return CResult_COption_OnionMessageContentsZDecodeErrorZ_ok(COption_OnionMessageContentsZ_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 };
+LDKCVec_C2Tuple_OnionMessageContentsMessageSendInstructionsZZ release_no_messages(const void* this_arg) {
+       return LDKCVec_C2Tuple_OnionMessageContentsMessageSendInstructionsZZ {
+               .data = NULL, .datalen = 0
+       };

 }
 
 struct CustomMsgQueue {
 }
 
 struct CustomMsgQueue {


@@ -485,6 +492,11 @@ LDKCVec_C2Tuple_PublicKeyTypeZZ never_send_custom_msgs(const void* this_arg) {
                .data = NULL, .datalen = 0
        };
 }
                .data = NULL, .datalen = 0
        };
 }

+void peer_disconnected(const void* this_arg, struct LDKPublicKey _their_node_id) {}
+LDKCResult_NoneNoneZ accept_peer_connected(const void* this_arg, struct LDKPublicKey _their_node_id, const struct LDKInit *msg, bool inbound) {
+       return CResult_NoneNoneZ_ok();
+}
+

 
 LDKCVec_C2Tuple_PublicKeyTypeZZ create_custom_msg(const void* this_arg) {
        const LDKPublicKey *counterparty_node_id = (const LDKPublicKey *)this_arg;
 
 LDKCVec_C2Tuple_PublicKeyTypeZZ create_custom_msg(const void* this_arg) {
        const LDKPublicKey *counterparty_node_id = (const LDKPublicKey *)this_arg;


@@ -611,8 +623,9 @@ 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::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::AsyncPaymentsMessageHandler async_msg_handler1 = IgnoringMessageHandler_as_AsyncPaymentsMessageHandler(&ignoring_handler1);

                LDK::DefaultMessageRouter mr1 = DefaultMessageRouter_new(&net_graph1, KeysManager_as_EntropySource(&keys1));
                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::OnionMessenger om1 = OnionMessenger_new(KeysManager_as_EntropySource(&keys1), KeysManager_as_NodeSigner(&keys1), logger1, ChannelManager_as_NodeIdLookUp(&cm1), DefaultMessageRouter_as_MessageRouter(&mr1), IgnoringMessageHandler_as_OffersMessageHandler(&ignoring_handler1), std::move(async_msg_handler1), std::move(custom_onion_msg_handler1));

 
                LDK::CVec_ChannelDetailsZ channels = ChannelManager_list_channels(&cm1);
                assert(channels->datalen == 0);
 
                LDK::CVec_ChannelDetailsZ channels = ChannelManager_list_channels(&cm1);
                assert(channels->datalen == 0);


@@ -625,9 +638,9 @@ int main() {
                // Demo getting a channel key and check that its returning real pubkeys:
                LDKSixteenBytes user_id_1 { .data = {45, 0, 0, 0, 0, 0, 0, 0, 44, 0, 0, 0, 0, 0, 0, 0} };
                LDKThirtyTwoBytes chan_signer_id1 = signer_provider1.generate_channel_keys_id(false, 42, U128_new(user_id_1));
                // Demo getting a channel key and check that its returning real pubkeys:
                LDKSixteenBytes user_id_1 { .data = {45, 0, 0, 0, 0, 0, 0, 0, 44, 0, 0, 0, 0, 0, 0, 0} };
                LDKThirtyTwoBytes chan_signer_id1 = signer_provider1.generate_channel_keys_id(false, 42, U128_new(user_id_1));

-               LDK::WriteableEcdsaChannelSigner chan_signer1 = signer_provider1.derive_channel_signer(42, chan_signer_id1);
-               chan_signer1->EcdsaChannelSigner.ChannelSigner.set_pubkeys(&chan_signer1->EcdsaChannelSigner.ChannelSigner); // Make sure pubkeys is defined
-               LDKPublicKey payment_point = ChannelPublicKeys_get_payment_point(&chan_signer1->EcdsaChannelSigner.ChannelSigner.pubkeys);
+               LDK::EcdsaChannelSigner chan_signer1 = signer_provider1.derive_channel_signer(42, chan_signer_id1);
+               chan_signer1->ChannelSigner.set_pubkeys(&chan_signer1->ChannelSigner); // Make sure pubkeys is defined
+               LDKPublicKey payment_point = ChannelPublicKeys_get_payment_point(&chan_signer1->ChannelSigner.pubkeys);

                assert(memcmp(&payment_point, &null_pk, sizeof(null_pk)));
 
                // Instantiate classes for node 2:
                assert(memcmp(&payment_point, &null_pk, sizeof(null_pk)));
 
                // Instantiate classes for node 2:


@@ -648,7 +661,7 @@ int main() {
                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(&net_graph2, KeysManager_as_EntropySource(&keys2));
                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(&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::OnionMessenger om2 = OnionMessenger_new(KeysManager_as_EntropySource(&keys2), KeysManager_as_NodeSigner(&keys2), logger2, ChannelManager_as_NodeIdLookUp(&cm2), DefaultMessageRouter_as_MessageRouter(&mr2), IgnoringMessageHandler_as_OffersMessageHandler(&ignoring_handler2), IgnoringMessageHandler_as_AsyncPaymentsMessageHandler(&ignoring_handler2), std::move(custom_onion_msg_handler2));

 
                LDK::CVec_ChannelDetailsZ channels2 = ChannelManager_list_channels(&cm2);
                assert(channels2->datalen == 0);
 
                LDK::CVec_ChannelDetailsZ channels2 = ChannelManager_list_channels(&cm2);
                assert(channels2->datalen == 0);


@@ -668,7 +681,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
                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_ThirtyTwoBytesAPIErrorZ res = ChannelManager_create_channel(&cm1, ChannelManager_get_our_node_id(&cm2), 40000, 1000, U128_new(user_id_1), COption_ThirtyTwoBytesZ_none(), UserConfig_default());
+               LDK::CResult_ChannelIdAPIErrorZ res = ChannelManager_create_channel(&cm1, ChannelManager_get_our_node_id(&cm2), 40000, 1000, U128_new(user_id_1), LDKChannelId { .inner = NULL, .is_owned = false }, UserConfig_default());

                assert(res->result_ok);
                PeerManager_process_events(&net1);
 
                assert(res->result_ok);
                PeerManager_process_events(&net1);
 


@@ -708,7 +721,7 @@ int main() {
                                assert(!memcmp(queue.events[0]->funding_generation_ready.output_script.data, channel_open_block + 58 + 81, 34));
                                LDKTransaction funding_transaction { .data = const_cast<uint8_t*>(channel_open_block + 81), .datalen = sizeof(channel_open_block) - 81, .data_is_owned = false };
 
                                assert(!memcmp(queue.events[0]->funding_generation_ready.output_script.data, channel_open_block + 58 + 81, 34));
                                LDKTransaction funding_transaction { .data = const_cast<uint8_t*>(channel_open_block + 81), .datalen = sizeof(channel_open_block) - 81, .data_is_owned = false };
 

-                               LDK::CResult_NoneAPIErrorZ fund_res = ChannelManager_funding_transaction_generated(&cm1, &queue.events[0]->funding_generation_ready.temporary_channel_id.data, queue.events[0]->funding_generation_ready.counterparty_node_id, funding_transaction);
+                               LDK::CResult_NoneAPIErrorZ fund_res = ChannelManager_funding_transaction_generated(&cm1, ChannelId_clone(&queue.events[0]->funding_generation_ready.temporary_channel_id), queue.events[0]->funding_generation_ready.counterparty_node_id, funding_transaction);

                                assert(fund_res->result_ok);
                                break;
                        }
                                assert(fund_res->result_ok);
                                break;
                        }


@@ -737,7 +750,7 @@ int main() {
                        ev1.process_pending_events(handler);
                        if (queue.events.size() == 1) {
                                assert(queue.events[0]->tag == LDKEvent_ChannelPending);
                        ev1.process_pending_events(handler);
                        if (queue.events.size() == 1) {
                                assert(queue.events[0]->tag == LDKEvent_ChannelPending);

-                               assert(!memcmp(queue.events[0]->channel_pending.channel_id.data, expected_chan_id, 32));
+                               assert(!memcmp(ChannelId_get_a(&queue.events[0]->channel_pending.channel_id), expected_chan_id, 32));

                                break;
                        }
                        std::this_thread::yield();
                                break;
                        }
                        std::this_thread::yield();


@@ -752,7 +765,7 @@ int main() {
                        ev2.process_pending_events(handler);
                        if (queue.events.size() == 1) {
                                assert(queue.events[0]->tag == LDKEvent_ChannelPending);
                        ev2.process_pending_events(handler);
                        if (queue.events.size() == 1) {
                                assert(queue.events[0]->tag == LDKEvent_ChannelPending);

-                               assert(!memcmp(queue.events[0]->channel_pending.channel_id.data, expected_chan_id, 32));
+                               assert(!memcmp(ChannelId_get_a(&queue.events[0]->channel_pending.channel_id), expected_chan_id, 32));

                                break;
                        }
                        std::this_thread::yield();
                                break;
                        }
                        std::this_thread::yield();


@@ -793,7 +806,7 @@ int main() {
                        ev2.process_pending_events(handler);
                        if (queue.events.size() == 1) {
                                assert(queue.events[0]->tag == LDKEvent_ChannelReady);
                        ev2.process_pending_events(handler);
                        if (queue.events.size() == 1) {
                                assert(queue.events[0]->tag == LDKEvent_ChannelReady);

-                               assert(!memcmp(queue.events[0]->channel_ready.channel_id.data, expected_chan_id, 32));
+                               assert(!memcmp(ChannelId_get_a(&queue.events[0]->channel_ready.channel_id), expected_chan_id, 32));

                                break;
                        }
                        std::this_thread::yield();
                                break;
                        }
                        std::this_thread::yield();


@@ -807,7 +820,7 @@ int main() {
                        ev1.process_pending_events(handler);
                        if (queue.events.size() == 1) {
                                assert(queue.events[0]->tag == LDKEvent_ChannelReady);
                        ev1.process_pending_events(handler);
                        if (queue.events.size() == 1) {
                                assert(queue.events[0]->tag == LDKEvent_ChannelReady);

-                               assert(!memcmp(queue.events[0]->channel_ready.channel_id.data, expected_chan_id, 32));
+                               assert(!memcmp(ChannelId_get_a(&queue.events[0]->channel_ready.channel_id), expected_chan_id, 32));

                                break;
                        }
                        std::this_thread::yield();
                                break;
                        }
                        std::this_thread::yield();


@@ -823,7 +836,8 @@ int main() {
                                const LDKChannelDetails *channel = &outbound_channels->data[0];
                                LDK::ChannelCounterparty counterparty = ChannelDetails_get_counterparty(channel);
 
                                const LDKChannelDetails *channel = &outbound_channels->data[0];
                                LDK::ChannelCounterparty counterparty = ChannelDetails_get_counterparty(channel);
 

-                               assert(!memcmp(ChannelDetails_get_channel_id(channel), expected_chan_id, 32));
+                               LDK::ChannelId chan_id = ChannelDetails_get_channel_id(channel);
+                               assert(!memcmp(ChannelId_get_a(&chan_id), expected_chan_id, 32));

                                assert(!memcmp(
                                        ChannelCounterparty_get_node_id(&counterparty).compressed_form,
                                        ChannelManager_get_our_node_id(&cm2).compressed_form, 33));
                                assert(!memcmp(
                                        ChannelCounterparty_get_node_id(&counterparty).compressed_form,
                                        ChannelManager_get_our_node_id(&cm2).compressed_form, 33));


@@ -870,16 +884,16 @@ int main() {
                                        .inner = NULL, .is_owned = false
                                }, Bolt11Invoice_min_final_cltv_expiry_delta(invoice->contents.result));
                        LDK::RouteParameters route_params = RouteParameters_from_payment_params_and_value(
                                        .inner = NULL, .is_owned = false
                                }, Bolt11Invoice_min_final_cltv_expiry_delta(invoice->contents.result));
                        LDK::RouteParameters route_params = RouteParameters_from_payment_params_and_value(

-                               PaymentParameters_new(std::move(payee), COption_u64Z_none(), 0xffffffff, 1, 2,
+                               PaymentParameters_new(std::move(payee), COption_u64Z_none(), 0xffffffff, 1, 20, 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();
 
                                        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();
 

-                       LDK::CResult_RouteLightningErrorZ route = find_route(ChannelManager_get_our_node_id(&cm1), &route_params, &net_graph2, &outbound_channels, logger1, &chan_scorer, &params, &random_bytes.data);
+                       LDK::CResult_RouteLightningErrorZ route_res = find_route(ChannelManager_get_our_node_id(&cm1), &route_params, &net_graph2, &outbound_channels, logger1, &chan_scorer, &params, &random_bytes.data);

 
 

-                       assert(route->result_ok);
-                       LDK::CVec_PathZ paths = Route_get_paths(route->contents.result);
+                       assert(route_res->result_ok);
+                       LDK::CVec_PathZ paths = Route_get_paths(route_res->contents.result);

                        assert(paths->datalen == 1);
                        LDK::CVec_RouteHopZ hops = Path_get_hops(&paths->data[0]);
                        assert(hops->datalen == 1);
                        assert(paths->datalen == 1);
                        LDK::CVec_RouteHopZ hops = Path_get_hops(&paths->data[0]);
                        assert(hops->datalen == 1);


@@ -888,8 +902,9 @@ int main() {
                        assert(RouteHop_get_short_channel_id(&hops->data[0]) == channel_scid);
                        LDKThirtyTwoBytes payment_secret;
                        memcpy(payment_secret.data, Bolt11Invoice_payment_secret(invoice->contents.result), 32);
                        assert(RouteHop_get_short_channel_id(&hops->data[0]) == channel_scid);
                        LDKThirtyTwoBytes payment_secret;
                        memcpy(payment_secret.data, Bolt11Invoice_payment_secret(invoice->contents.result), 32);

+                       LDK::Route route(Route_clone(route_res->contents.result));

                        LDK::CResult_NonePaymentSendFailureZ send_res = ChannelManager_send_payment_with_route(&cm1,
                        LDK::CResult_NonePaymentSendFailureZ send_res = ChannelManager_send_payment_with_route(&cm1,

-                               route->contents.result, payment_hash, RecipientOnionFields_secret_only(payment_secret), payment_hash);
+                               std::move(route), payment_hash, RecipientOnionFields_secret_only(payment_secret), payment_hash);

                        assert(send_res->result_ok);
                }
 
                        assert(send_res->result_ok);
                }
 


@@ -926,12 +941,12 @@ int main() {
                        assert(queue.events.size() == 1);
                        assert(queue.events[0]->tag == LDKEvent_PaymentClaimable);
                        assert(!memcmp(queue.events[0]->payment_claimable.payment_hash.data, payment_hash.data, 32));
                        assert(queue.events.size() == 1);
                        assert(queue.events[0]->tag == LDKEvent_PaymentClaimable);
                        assert(!memcmp(queue.events[0]->payment_claimable.payment_hash.data, payment_hash.data, 32));

-                       assert(queue.events[0]->payment_claimable.purpose.tag == LDKPaymentPurpose_InvoicePayment);
-                       assert(!memcmp(queue.events[0]->payment_claimable.purpose.invoice_payment.payment_secret.data,
+                       assert(queue.events[0]->payment_claimable.purpose.tag == LDKPaymentPurpose_Bolt11InvoicePayment);
+                       assert(!memcmp(queue.events[0]->payment_claimable.purpose.bolt11_invoice_payment.payment_secret.data,

                                        Bolt11Invoice_payment_secret(invoice->contents.result), 32));
                        assert(queue.events[0]->payment_claimable.amount_msat == 5000);
                                        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_ThirtyTwoBytesZ_Some);
-                       memcpy(payment_preimage.data, queue.events[0]->payment_claimable.purpose.invoice_payment.payment_preimage.some.data, 32);
+                       assert(queue.events[0]->payment_claimable.purpose.bolt11_invoice_payment.payment_preimage.tag == LDKCOption_ThirtyTwoBytesZ_Some);
+                       memcpy(payment_preimage.data, queue.events[0]->payment_claimable.purpose.bolt11_invoice_payment.payment_preimage.some.data, 32);

                        ChannelManager_claim_funds(&cm2, payment_preimage);
 
                        queue.events.clear();
                        ChannelManager_claim_funds(&cm2, payment_preimage);
 
                        queue.events.clear();


@@ -939,7 +954,7 @@ int main() {
                        assert(queue.events.size() == 1);
                        assert(queue.events[0]->tag == LDKEvent_PaymentClaimed);
                        assert(!memcmp(queue.events[0]->payment_claimed.payment_hash.data, payment_hash.data, 32));
                        assert(queue.events.size() == 1);
                        assert(queue.events[0]->tag == LDKEvent_PaymentClaimed);
                        assert(!memcmp(queue.events[0]->payment_claimed.payment_hash.data, payment_hash.data, 32));

-                       assert(queue.events[0]->payment_claimed.purpose.tag == LDKPaymentPurpose_InvoicePayment);
+                       assert(queue.events[0]->payment_claimed.purpose.tag == LDKPaymentPurpose_Bolt11InvoicePayment);

                }
                PeerManager_process_events(&net2);
                // Wait until we've passed through a full set of monitor updates (ie new preimage + CS/RAA messages)
                }
                PeerManager_process_events(&net2);
                // Wait until we've passed through a full set of monitor updates (ie new preimage + CS/RAA messages)


@@ -1010,7 +1025,7 @@ int main() {
        };
        LDK::DefaultMessageRouter mr1 = DefaultMessageRouter_new(&net_graph1, KeysManager_as_EntropySource(&keys1));
        LDK::IgnoringMessageHandler ignorer_1 = IgnoringMessageHandler_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));
+       LDK::OnionMessenger om1 = OnionMessenger_new(KeysManager_as_EntropySource(&keys1), KeysManager_as_NodeSigner(&keys1), logger1, ChannelManager_as_NodeIdLookUp(&cm1), DefaultMessageRouter_as_MessageRouter(&mr1), IgnoringMessageHandler_as_OffersMessageHandler(&ignorer_1), IgnoringMessageHandler_as_AsyncPaymentsMessageHandler(&ignorer_1), std::move(custom_onion_msg_handler1));

 
        LDK::CVec_ChannelMonitorZ mons_list2 = LDKCVec_ChannelMonitorZ { .data = (LDKChannelMonitor*)malloc(sizeof(LDKChannelMonitor)), .datalen = 1 };
        assert(mons2.mons.size() == 1);
 
        LDK::CVec_ChannelMonitorZ mons_list2 = LDKCVec_ChannelMonitorZ { .data = (LDKChannelMonitor*)malloc(sizeof(LDKChannelMonitor)), .datalen = 1 };
        assert(mons2.mons.size() == 1);


@@ -1038,11 +1053,12 @@ int main() {
        };
        LDK::DefaultMessageRouter mr2 = DefaultMessageRouter_new(&net_graph2, KeysManager_as_EntropySource(&keys2));
        LDK::IgnoringMessageHandler ignorer_2 = IgnoringMessageHandler_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);
+       LDK::OnionMessenger om2 = OnionMessenger_new(KeysManager_as_EntropySource(&keys2), KeysManager_as_NodeSigner(&keys2), logger2, ChannelManager_as_NodeIdLookUp(&cm2), DefaultMessageRouter_as_MessageRouter(&mr2), IgnoringMessageHandler_as_OffersMessageHandler(&ignorer_2), IgnoringMessageHandler_as_AsyncPaymentsMessageHandler(&ignorer_2), custom_onion_msg_handler2);

 
        // Attempt to close the channel...
 
        // Attempt to close the channel...

-       uint8_t chan_id[32];
-       for (int i = 0; i < 32; i++) { chan_id[i] = channel_open_txid[31-i]; }
+       LDKThirtyTwoBytes chan_id_bytes;
+       for (int i = 0; i < 32; i++) { chan_id_bytes.data[i] = channel_open_txid[31-i]; }
+       LDK::ChannelId chan_id = ChannelId_new(chan_id_bytes);

        LDK::CResult_NoneAPIErrorZ close_res = ChannelManager_close_channel(&cm1, &chan_id, ChannelManager_get_our_node_id(&cm2));
        assert(!close_res->result_ok); // Note that we can't close while disconnected!
 
        LDK::CResult_NoneAPIErrorZ close_res = ChannelManager_close_channel(&cm1, &chan_id, ChannelManager_get_our_node_id(&cm2));
        assert(!close_res->result_ok); // Note that we can't close while disconnected!
 


@@ -1052,6 +1068,8 @@ int main() {
                .this_arg = &chan_2_node_id,
                .handle_custom_message = NULL, // We only create custom messages, not handle them
                .get_and_clear_pending_msg = create_custom_msg,
                .this_arg = &chan_2_node_id,
                .handle_custom_message = NULL, // We only create custom messages, not handle them
                .get_and_clear_pending_msg = create_custom_msg,

+               .peer_disconnected = peer_disconnected,
+               .peer_connected = accept_peer_connected,

                .provided_node_features = custom_node_features,
                .provided_init_features = custom_init_features,
                .CustomMessageReader = LDKCustomMessageReader {
                .provided_node_features = custom_node_features,
                .provided_init_features = custom_init_features,
                .CustomMessageReader = LDKCustomMessageReader {


@@ -1070,6 +1088,8 @@ int main() {
                .this_arg = &peer_2_custom_messages,
                .handle_custom_message = handle_custom_message,
                .get_and_clear_pending_msg = never_send_custom_msgs,
                .this_arg = &peer_2_custom_messages,
                .handle_custom_message = handle_custom_message,
                .get_and_clear_pending_msg = never_send_custom_msgs,

+               .peer_disconnected = peer_disconnected,
+               .peer_connected = accept_peer_connected,

                .provided_node_features = custom_node_features,
                .provided_init_features = custom_init_features,
                .CustomMessageReader = LDKCustomMessageReader {
                .provided_node_features = custom_node_features,
                .provided_init_features = custom_init_features,
                .CustomMessageReader = LDKCustomMessageReader {


@@ -1148,19 +1168,19 @@ int main() {
                        assert(queue2.events[0]->tag == LDKEvent_PaymentClaimable);
                        const struct LDKEvent_LDKPaymentClaimable_Body *event_data = &queue2.events[0]->payment_claimable;
                        assert(!memcmp(event_data->payment_hash.data, Bolt11Invoice_payment_hash(invoice2), 32));
                        assert(queue2.events[0]->tag == LDKEvent_PaymentClaimable);
                        const struct LDKEvent_LDKPaymentClaimable_Body *event_data = &queue2.events[0]->payment_claimable;
                        assert(!memcmp(event_data->payment_hash.data, Bolt11Invoice_payment_hash(invoice2), 32));

-                       assert(event_data->purpose.tag == LDKPaymentPurpose_InvoicePayment);
-                       assert(!memcmp(event_data->purpose.invoice_payment.payment_secret.data,
+                       assert(event_data->purpose.tag == LDKPaymentPurpose_Bolt11InvoicePayment);
+                       assert(!memcmp(event_data->purpose.bolt11_invoice_payment.payment_secret.data,

                                        Bolt11Invoice_payment_secret(invoice2), 32));
                        assert(event_data->amount_msat == 10000);
                                        Bolt11Invoice_payment_secret(invoice2), 32));
                        assert(event_data->amount_msat == 10000);

-                       assert(event_data->purpose.invoice_payment.payment_preimage.tag == LDKCOption_ThirtyTwoBytesZ_Some);
-                       ChannelManager_claim_funds(&cm2, event_data->purpose.invoice_payment.payment_preimage.some);
+                       assert(event_data->purpose.bolt11_invoice_payment.payment_preimage.tag == LDKCOption_ThirtyTwoBytesZ_Some);
+                       ChannelManager_claim_funds(&cm2, event_data->purpose.bolt11_invoice_payment.payment_preimage.some);

 
                        queue2.events.clear();
                        ev2.process_pending_events(handler2);
                        assert(queue2.events.size() == 1);
                        assert(queue2.events[0]->tag == LDKEvent_PaymentClaimed);
                        assert(!memcmp(queue2.events[0]->payment_claimed.payment_hash.data, Bolt11Invoice_payment_hash(invoice2), 32));
 
                        queue2.events.clear();
                        ev2.process_pending_events(handler2);
                        assert(queue2.events.size() == 1);
                        assert(queue2.events[0]->tag == LDKEvent_PaymentClaimed);
                        assert(!memcmp(queue2.events[0]->payment_claimed.payment_hash.data, Bolt11Invoice_payment_hash(invoice2), 32));

-                       assert(queue2.events[0]->payment_claimed.purpose.tag == LDKPaymentPurpose_InvoicePayment);
+                       assert(queue2.events[0]->payment_claimed.purpose.tag == LDKPaymentPurpose_Bolt11InvoicePayment);

 
                        break;
                }
 
                        break;
                }


@@ -1202,8 +1222,7 @@ int main() {
        LDK::CResult_SendSuccessSendErrorZ om_send_res =
                OnionMessenger_send_onion_message(&om1,
                        build_custom_onion_message(),
        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 });
+                       MessageSendInstructions_without_reply_path(Destination_node(ChannelManager_get_our_node_id(&cm2))));

        assert(om_send_res->result_ok);
        PeerManager_process_events(&net1);
        std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting onion message..." << std::endl;
        assert(om_send_res->result_ok);
        PeerManager_process_events(&net1);
        std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting onion message..." << std::endl;