X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-c-bindings%2Fdemo.cpp;h=a766e566fda82e7ef1da224119dd4c5d058f5e4f;hb=cb19ca611be3e5a3c366718c17f075872bf0016d;hp=252bae5e294205e2085df4b6c373db33270165db;hpb=f266cd740879d4eacc01982db677bde532a6cf06;p=ldk-c-bindings diff --git a/lightning-c-bindings/demo.cpp b/lightning-c-bindings/demo.cpp index 252bae5..a766e56 100644 --- a/lightning-c-bindings/demo.cpp +++ b/lightning-c-bindings/demo.cpp @@ -20,6 +20,7 @@ extern "C" { #include #include #include +#include const uint8_t valid_node_announcement[] = { 0x94, 0xe4, 0xf5, 0x61, 0x41, 0x24, 0x7d, 0x90, 0x23, 0xa0, 0xc8, 0x34, 0x8c, 0xc4, 0xca, 0x51, @@ -118,10 +119,9 @@ const LDKFeeEstimator fee_est { }; static std::atomic_int num_txs_broadcasted(0); -void broadcast_tx(const void *this_arg, LDKTransaction tx) { +void broadcast_txn(const void *this_arg, LDKCVec_TransactionZ txn) { num_txs_broadcasted += 1; - //TODO - Transaction_free(tx); + CVec_TransactionZ_free(txn); } struct NodeMonitors { @@ -137,7 +137,7 @@ struct NodeMonitors { } }; -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 +146,7 @@ LDKChannelMonitorUpdateStatus add_channel_monitor(const void *this_arg, LDKOutPo std::unique_lock 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) { @@ -162,9 +162,9 @@ LDKChannelMonitorUpdateStatus update_channel_monitor(const void *this_arg, LDKOu !memcmp(OutPoint_get_txid(&mon.first), OutPoint_get_txid(&funding_txo), 32)) { updated = true; LDKBroadcasterInterface broadcaster = { - .broadcast_transaction = broadcast_tx, + .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 +187,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)); @@ -226,13 +226,15 @@ public: assert(!socket_connect(node1_handler, ChannelManager_get_our_node_id(&cm2), (sockaddr*)&listen_addr, sizeof(listen_addr))); + 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(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Initial handshake complete!" << std::endl; // Connect twice, which should auto-disconnect, and is a good test of our disconnect pipeline assert(!socket_connect(node1_handler, ChannelManager_get_our_node_id(&cm2), (sockaddr*)&listen_addr, sizeof(listen_addr))); @@ -242,23 +244,27 @@ public: PeerManager_disconnect_by_node_id(&net1, ChannelManager_get_our_node_id(&cm2)); 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(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "New connection handshake complete!" << std::endl; // Wait for all our sockets to disconnect (making sure we disconnect any new connections)... + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting peer disconnection..." << std::endl; 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(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Peers disconnected!" << std::endl; // Note that the above is somewhat race-y, as node 2 may still think its connected. // Thus, make sure any connections are disconnected on its end as well. PeerManager_disconnect_by_node_id(&net2, ChannelManager_get_our_node_id(&cm1)); @@ -266,13 +272,15 @@ public: // Finally make an actual connection and keep it this time assert(!socket_connect(node1_handler, ChannelManager_get_our_node_id(&cm2), (sockaddr*)&listen_addr, sizeof(listen_addr))); + 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(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Initial handshake complete!" << std::endl; } void stop() { interrupt_socket_handling(node1_handler); @@ -346,21 +354,23 @@ 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); assert(writelen > 0 && uint64_t(writelen) == con_res->contents.result->datalen); + 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(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Initial handshake complete!" << std::endl; } void stop() { @@ -390,10 +400,11 @@ LDKCVec_u8Z custom_onion_msg_bytes(const void *this_arg) { }; } -void handle_custom_onion_message(const void* this_arg, struct LDKCustomOnionMessageContents msg) { +LDKCOption_CustomOnionMessageContentsZ handle_custom_onion_message(const void* this_arg, struct LDKCustomOnionMessageContents msg) { CustomOnionMsgQueue* arg = (CustomOnionMsgQueue*) this_arg; std::unique_lock lck(arg->mtx); arg->msgs.push_back(std::move(msg)); + return COption_CustomOnionMessageContentsZ_none(); } LDKCustomOnionMessageContents build_custom_onion_message() { @@ -445,6 +456,7 @@ LDKCResult_COption_TypeZDecodeErrorZ read_custom_message(const void* this_arg, u .this_arg = NULL, .type_id = custom_msg_type_id, .debug_str = custom_msg_debug, + .write = NULL, // This message should never be written .free = NULL, })); } @@ -477,12 +489,20 @@ LDKCVec_C2Tuple_PublicKeyTypeZZ create_custom_msg(const void* this_arg) { return ret; } -uint64_t get_chan_score(const void *this_arg, uint64_t scid, const LDKNodeId *src, const LDKNodeId *dst, LDKChannelUsage usage_in) { +LDKNodeFeatures custom_node_features(const void *this_arg) { + return NodeFeatures_empty(); +} + +LDKInitFeatures custom_init_features(const void *this_arg, struct LDKPublicKey their_node_id) { + 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) { LDK::ChannelUsage usage(std::move(usage_in)); return 42; } -struct LDKCResult_RouteLightningErrorZ custom_find_route(const void *this_arg, struct LDKPublicKey payer, const struct LDKRouteParameters *NONNULL_PTR route_params, struct LDKCVec_ChannelDetailsZ *first_hops, const struct LDKInFlightHtlcs *in_flights, LDKThirtyTwoBytes payment_id, LDKThirtyTwoBytes payment_hash) { +struct LDKCResult_RouteLightningErrorZ custom_find_route(const void *this_arg, struct LDKPublicKey payer, const struct LDKRouteParameters *NONNULL_PTR route_params, struct LDKCVec_ChannelDetailsZ *first_hops, const struct LDKInFlightHtlcs in_flights, LDKThirtyTwoBytes payment_id, LDKThirtyTwoBytes payment_hash) { const LDK::DefaultRouter *router = (LDK::DefaultRouter *)this_arg; assert(first_hops->datalen == 1); assert(ChannelDetails_get_is_usable(&first_hops->data[0])); @@ -510,7 +530,7 @@ int main() { // Trait implementations: LDKBroadcasterInterface broadcast { .this_arg = NULL, - .broadcast_transaction = broadcast_tx, + .broadcast_transactions = broadcast_txn, .free = NULL, }; @@ -572,21 +592,21 @@ int main() { LDK::EntropySource entropy_source1 = KeysManager_as_EntropySource(&keys1); LDK::SignerProvider signer_provider1 = KeysManager_as_SignerProvider(&keys1); - LDK::ChannelManager cm1 = ChannelManager_new(fee_est, mon1, broadcast, panic_router, logger1, KeysManager_as_EntropySource(&keys1), KeysManager_as_NodeSigner(&keys1), KeysManager_as_SignerProvider(&keys1), UserConfig_default(), ChainParameters_new(network, BestBlock_new(chain_tip, 0))); + LDK::ChannelManager cm1 = ChannelManager_new(fee_est, mon1, broadcast, panic_router, logger1, KeysManager_as_EntropySource(&keys1), KeysManager_as_NodeSigner(&keys1), KeysManager_as_SignerProvider(&keys1), UserConfig_default(), ChainParameters_new(network, BestBlock_new(chain_tip, 0)), 1689638400); 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::OnionMessenger om1 = OnionMessenger_new(KeysManager_as_EntropySource(&keys1), KeysManager_as_NodeSigner(&keys1), logger1, std::move(custom_onion_msg_handler1)); + LDK::DefaultMessageRouter mr1 = DefaultMessageRouter_new(); + 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); assert(channels->datalen == 0); - LDK::MessageHandler msg_handler1 = MessageHandler_new(ChannelManager_as_ChannelMessageHandler(&cm1), P2PGossipSync_as_RoutingMessageHandler(&graph_msg_handler1), OnionMessenger_as_OnionMessageHandler(&om1)); + LDK::MessageHandler msg_handler1 = MessageHandler_new(ChannelManager_as_ChannelMessageHandler(&cm1), P2PGossipSync_as_RoutingMessageHandler(&graph_msg_handler1), OnionMessenger_as_OnionMessageHandler(&om1), std::move(custom_msg_handler1)); random_bytes = entropy_source1.get_secure_random_bytes(); - LDK::PeerManager net1 = PeerManager_new(std::move(msg_handler1), 0xdeadbeef, &random_bytes.data, logger1, std::move(custom_msg_handler1), std::move(node_signer1)); + LDK::PeerManager net1 = PeerManager_new(std::move(msg_handler1), 0xdeadbeef, &random_bytes.data, logger1, std::move(node_signer1)); // 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} }; @@ -608,13 +628,13 @@ int main() { LDK::UserConfig config2 = UserConfig_default(); UserConfig_set_channel_handshake_config(&config2, std::move(handshake_config2)); - LDK::ChannelManager cm2 = ChannelManager_new(fee_est, mon2, broadcast, panic_router, logger2, KeysManager_as_EntropySource(&keys2), KeysManager_as_NodeSigner(&keys2), KeysManager_as_SignerProvider(&keys2), std::move(config2), ChainParameters_new(network, BestBlock_new(chain_tip, 0))); + LDK::ChannelManager cm2 = ChannelManager_new(fee_est, mon2, broadcast, panic_router, logger2, KeysManager_as_EntropySource(&keys2), KeysManager_as_NodeSigner(&keys2), KeysManager_as_SignerProvider(&keys2), std::move(config2), ChainParameters_new(network, BestBlock_new(chain_tip, 0)), 1689638400); 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::OnionMessenger om2 = OnionMessenger_new(KeysManager_as_EntropySource(&keys2), KeysManager_as_NodeSigner(&keys2), logger2, std::move(custom_onion_msg_handler2)); + LDK::DefaultMessageRouter mr2 = DefaultMessageRouter_new(); + 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); assert(channels2->datalen == 0); @@ -625,16 +645,16 @@ int main() { LDK::CResult_boolLightningErrorZ ann_res = net_msgs2->handle_channel_announcement(net_msgs2->this_arg, chan_ann->contents.result); assert(ann_res->result_ok); - LDK::MessageHandler msg_handler2 = MessageHandler_new(ChannelManager_as_ChannelMessageHandler(&cm2), std::move(net_msgs2), OnionMessenger_as_OnionMessageHandler(&om1)); + LDK::MessageHandler msg_handler2 = MessageHandler_new(ChannelManager_as_ChannelMessageHandler(&cm2), std::move(net_msgs2), OnionMessenger_as_OnionMessageHandler(&om1), std::move(custom_msg_handler2)); random_bytes = entropy_source2.get_secure_random_bytes(); - LDK::PeerManager net2 = PeerManager_new(std::move(msg_handler2), 0xdeadbeef, &random_bytes.data, logger2, std::move(custom_msg_handler2), std::move(node_signer2)); + LDK::PeerManager net2 = PeerManager_new(std::move(msg_handler2), 0xdeadbeef, &random_bytes.data, logger2, std::move(node_signer2)); // Open a connection! 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), UserConfig_default()); assert(res->result_ok); PeerManager_process_events(&net1); @@ -644,6 +664,7 @@ int main() { LDKPublicKey chan_open_pk = ChannelCounterparty_get_node_id(&new_channels_counterparty); assert(!memcmp(chan_open_pk.compressed_form, ChannelManager_get_our_node_id(&cm2).compressed_form, 33)); + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting first channel..." << std::endl; while (true) { LDK::CVec_ChannelDetailsZ new_channels_2 = ChannelManager_list_channels(&cm2); if (new_channels_2->datalen == 1) { @@ -655,8 +676,10 @@ int main() { } std::this_thread::yield(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "First channel listed!" << std::endl; LDK::EventsProvider ev1 = ChannelManager_as_EventsProvider(&cm1); + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting FundingGenerationReady event..." << std::endl; while (true) { EventQueue queue; LDKEventHandler handler = { .this_arg = &queue, .handle_event = handle_event, .free = NULL }; @@ -677,14 +700,50 @@ int main() { } std::this_thread::yield(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Received FundingGenerationReady event!" << std::endl; // We observe when the funding signed messages have been exchanged by // waiting for two monitors to be registered. assert(num_txs_broadcasted == 0); PeerManager_process_events(&net1); + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting transaction broadcast..." << std::endl; while (num_txs_broadcasted != 1) { std::this_thread::yield(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Transaction was broadcast!" << std::endl; + + // Note that the channel ID is the same as the channel txid reversed as the output index is 0 + uint8_t expected_chan_id[32]; + for (int i = 0; i < 32; i++) { expected_chan_id[i] = channel_open_txid[31-i]; } + + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting ChannelPending event..." << std::endl; + while (true) { + EventQueue queue; + LDKEventHandler handler = { .this_arg = &queue, .handle_event = handle_event, .free = NULL }; + 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)); + break; + } + std::this_thread::yield(); + } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Received ChannelPending event!" << std::endl; + + LDK::EventsProvider ev2 = ChannelManager_as_EventsProvider(&cm2); + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting ChannelPending event..." << std::endl; + while (true) { + EventQueue queue; + LDKEventHandler handler = { .this_arg = &queue, .handle_event = handle_event, .free = NULL }; + 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)); + break; + } + std::this_thread::yield(); + } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Received ChannelPending event!" << std::endl; LDK::Listen listener1 = ChannelManager_as_Listen(&cm1); listener1->block_connected(listener1->this_arg, LDKu8slice { .data = channel_open_block, .datalen = sizeof(channel_open_block) }, 1); @@ -713,11 +772,7 @@ int main() { PeerManager_process_events(&net1); PeerManager_process_events(&net2); - // Note that the channel ID is the same as the channel txid reversed as the output index is 0 - uint8_t expected_chan_id[32]; - for (int i = 0; i < 32; i++) { expected_chan_id[i] = channel_open_txid[31-i]; } - - LDK::EventsProvider ev2 = ChannelManager_as_EventsProvider(&cm2); + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting ChannelReady event..." << std::endl; while (true) { EventQueue queue; LDKEventHandler handler = { .this_arg = &queue, .handle_event = handle_event, .free = NULL }; @@ -729,7 +784,9 @@ int main() { } std::this_thread::yield(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Received ChannelReady event!" << std::endl; + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting ChannelReady event..." << std::endl; while (true) { EventQueue queue; LDKEventHandler handler = { .this_arg = &queue, .handle_event = handle_event, .free = NULL }; @@ -741,9 +798,11 @@ int main() { } std::this_thread::yield(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Received ChannelReady event!" << std::endl; // Now send funds from 1 to 2! uint64_t channel_scid; + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting usable channel..." << std::endl; while (true) { LDK::CVec_ChannelDetailsZ outbound_channels = ChannelManager_list_usable_channels(&cm1); if (outbound_channels->datalen == 1) { @@ -769,12 +828,13 @@ int main() { } std::this_thread::yield(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Listed usable channel!" << std::endl; LDKCOption_u64Z min_value = { .tag = LDKCOption_u64Z_Some, .some = 5000, }; - LDK::CResult_InvoiceSignOrCreationErrorZ invoice = create_invoice_from_channelmanager(&cm2, + LDK::CResult_Bolt11InvoiceSignOrCreationErrorZ invoice = create_invoice_from_channelmanager(&cm2, KeysManager_as_NodeSigner(&keys2), logger2, LDKCurrency_Bitcoin, min_value, LDKStr { @@ -784,44 +844,51 @@ int main() { }, 3600, COption_u16Z_none()); assert(invoice->result_ok); LDKThirtyTwoBytes payment_hash; - memcpy(payment_hash.data, Invoice_payment_hash(invoice->contents.result), 32); + memcpy(payment_hash.data, Bolt11Invoice_payment_hash(invoice->contents.result), 32); { LDK::CVec_ChannelDetailsZ outbound_channels = ChannelManager_list_usable_channels(&cm1); - LDK::Score chan_scorer = LDKScore { - .this_arg = NULL, .channel_penalty_msat = get_chan_score, .free = NULL + LDK::ScoreLookUp chan_scorer = LDKScoreLookUp { + .this_arg = NULL, .channel_penalty_msat = get_chan_score, .free = NULL, }; - LDK::RouteParameters route_params = RouteParameters_new(PaymentParameters_new( - ChannelManager_get_our_node_id(&cm2), LDKInvoiceFeatures { - .inner = NULL, .is_owned = false - }, Invoice_route_hints(invoice->contents.result), COption_u64Z_none(), 0xffffffff, - 1, 2, LDKCVec_u64Z { .data = NULL, .datalen = 0 }, - Invoice_min_final_cltv_expiry_delta(invoice->contents.result)), + 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_from_payment_params_and_value( + PaymentParameters_new(std::move(payee), COption_u64Z_none(), 0xffffffff, 1, 2, + 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, &random_bytes.data); + LDK::CResult_RouteLightningErrorZ route = find_route(ChannelManager_get_our_node_id(&cm1), &route_params, &net_graph2, &outbound_channels, logger1, &chan_scorer, ¶ms, &random_bytes.data); assert(route->result_ok); - LDK::CVec_CVec_RouteHopZZ paths = Route_get_paths(route->contents.result); + LDK::CVec_PathZ paths = Route_get_paths(route->contents.result); assert(paths->datalen == 1); - assert(paths->data[0].datalen == 1); - assert(!memcmp(RouteHop_get_pubkey(&paths->data[0].data[0]).compressed_form, + LDK::CVec_RouteHopZ hops = Path_get_hops(&paths->data[0]); + assert(hops->datalen == 1); + assert(!memcmp(RouteHop_get_pubkey(&hops->data[0]).compressed_form, ChannelManager_get_our_node_id(&cm2).compressed_form, 33)); - assert(RouteHop_get_short_channel_id(&paths->data[0].data[0]) == channel_scid); + assert(RouteHop_get_short_channel_id(&hops->data[0]) == channel_scid); LDKThirtyTwoBytes payment_secret; - memcpy(payment_secret.data, Invoice_payment_secret(invoice->contents.result), 32); - LDK::CResult_NonePaymentSendFailureZ send_res = ChannelManager_send_payment(&cm1, route->contents.result, payment_hash, payment_secret, payment_hash); + memcpy(payment_secret.data, Bolt11Invoice_payment_secret(invoice->contents.result), 32); + LDK::CResult_NonePaymentSendFailureZ send_res = ChannelManager_send_payment_with_route(&cm1, + route->contents.result, payment_hash, RecipientOnionFields_secret_only(payment_secret), payment_hash); assert(send_res->result_ok); } mons_updated = 0; PeerManager_process_events(&net1); + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting 4 updated monitors..." << std::endl; while (mons_updated != 4) { std::this_thread::yield(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "4 monitors updated!" << std::endl; // Check that we received the payment! + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting PendingHTLCsForwardable event..." << std::endl; while (true) { EventQueue queue; LDKEventHandler handler = { .this_arg = &queue, .handle_event = handle_event, .free = NULL }; @@ -832,6 +899,7 @@ int main() { } std::this_thread::yield(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Received PendingHTLCsForwardable event!" << std::endl; ChannelManager_process_pending_htlc_forwards(&cm2); PeerManager_process_events(&net2); @@ -846,9 +914,10 @@ int main() { 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, - Invoice_payment_secret(invoice->contents.result), 32)); + Bolt11Invoice_payment_secret(invoice->contents.result), 32)); assert(queue.events[0]->payment_claimable.amount_msat == 5000); - memcpy(payment_preimage.data, queue.events[0]->payment_claimable.purpose.invoice_payment.payment_preimage.data, 32); + 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); queue.events.clear(); @@ -860,20 +929,27 @@ int main() { } PeerManager_process_events(&net2); // Wait until we've passed through a full set of monitor updates (ie new preimage + CS/RAA messages) - while (mons_updated != 5) { - std::this_thread::yield(); - } { EventQueue queue; LDKEventHandler handler = { .this_arg = &queue, .handle_event = handle_event, .free = NULL }; - while (queue.events.size() < 2) + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting PaymentSent and PaymentPathSuccessful events..." << std::endl; + while (queue.events.size() < 2) { ev1.process_pending_events(handler); + std::this_thread::yield(); + } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Received PaymentSent and PaymentPathSuccessful events (presumably)!" << std::endl; assert(queue.events.size() == 2); 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(!memcmp(queue.events[1]->payment_path_successful.payment_hash.data, payment_hash.data, 32)); + 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(); @@ -892,11 +968,12 @@ int main() { LDK::EntropySource entropy_source1 = KeysManager_as_EntropySource(&keys1); LDK::SignerProvider signer_provider1 = KeysManager_as_SignerProvider(&keys1); - LDK::ProbabilisticScorer scorer1 = ProbabilisticScorer_new(ProbabilisticScoringParameters_default(), &net_graph1, logger1); + LDK::ProbabilisticScorer scorer1 = ProbabilisticScorer_new(ProbabilisticScoringDecayParameters_default(), &net_graph1, logger1); LDK::Score scorer_trait1 = ProbabilisticScorer_as_Score(&scorer1); LDK::MultiThreadedLockableScore scorer_mtx1 = MultiThreadedLockableScore_new(std::move(scorer_trait1)); LDK::LockableScore scorer_mtx_trait1 = MultiThreadedLockableScore_as_LockableScore(&scorer_mtx1); - const LDK::DefaultRouter default_router_1 = DefaultRouter_new(&net_graph1, logger1, entropy_source1.get_secure_random_bytes(), std::move(scorer_mtx_trait1)); + 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)); LDKRouter router1 = { .this_arg = (void*)&default_router_1, .find_route = NULL, // LDK currently doesn't use this, its just a default-impl @@ -905,8 +982,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)); @@ -916,7 +993,9 @@ int main() { .read_custom_message = NULL, // We only create custom messages, not handle them .free = NULL, }; - LDK::OnionMessenger om1 = OnionMessenger_new(KeysManager_as_EntropySource(&keys1), KeysManager_as_NodeSigner(&keys1), logger1, custom_onion_msg_handler1); + LDK::DefaultMessageRouter mr1 = DefaultMessageRouter_new(); + 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::CVec_ChannelMonitorZ mons_list2 = LDKCVec_ChannelMonitorZ { .data = (LDKChannelMonitor*)malloc(sizeof(LDKChannelMonitor)), .datalen = 1 }; assert(mons2.mons.size() == 1); @@ -929,8 +1008,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)); @@ -941,7 +1020,9 @@ int main() { .read_custom_message = read_custom_onion_message, .free = NULL, }; - LDK::OnionMessenger om2 = OnionMessenger_new(KeysManager_as_EntropySource(&keys2), KeysManager_as_NodeSigner(&keys2), logger2, custom_onion_msg_handler2); + LDK::DefaultMessageRouter mr2 = DefaultMessageRouter_new(); + 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); // Attempt to close the channel... uint8_t chan_id[32]; @@ -950,14 +1031,13 @@ int main() { assert(!close_res->result_ok); // Note that we can't close while disconnected! // Open a connection! - LDK::MessageHandler msg_handler1 = MessageHandler_new(ChannelManager_as_ChannelMessageHandler(&cm1), P2PGossipSync_as_RoutingMessageHandler(&graph_msg_handler1), OnionMessenger_as_OnionMessageHandler(&om1)); - random_bytes = entropy_source1.get_secure_random_bytes(); - LDKPublicKey chan_2_node_id = ChannelManager_get_our_node_id(&cm2); LDKCustomMessageHandler custom_msg_handler1 = { .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, + .provided_node_features = custom_node_features, + .provided_init_features = custom_init_features, .CustomMessageReader = LDKCustomMessageReader { .this_arg = NULL, .read = read_custom_message, @@ -965,14 +1045,17 @@ int main() { }, .free = NULL, }; - LDK::PeerManager net1 = PeerManager_new(std::move(msg_handler1), 0xdeadbeef, &random_bytes.data, logger1, std::move(custom_msg_handler1), std::move(node_signer1)); + LDK::MessageHandler msg_handler1 = MessageHandler_new(ChannelManager_as_ChannelMessageHandler(&cm1), P2PGossipSync_as_RoutingMessageHandler(&graph_msg_handler1), OnionMessenger_as_OnionMessageHandler(&om1), custom_msg_handler1); + random_bytes = entropy_source1.get_secure_random_bytes(); + LDK::PeerManager net1 = PeerManager_new(std::move(msg_handler1), 0xdeadbeef, &random_bytes.data, logger1, std::move(node_signer1)); - LDK::MessageHandler msg_handler2 = MessageHandler_new(ChannelManager_as_ChannelMessageHandler(&cm2), P2PGossipSync_as_RoutingMessageHandler(&graph_msg_handler2), OnionMessenger_as_OnionMessageHandler(&om2)); CustomMsgQueue peer_2_custom_messages; LDKCustomMessageHandler custom_msg_handler2 = { .this_arg = &peer_2_custom_messages, .handle_custom_message = handle_custom_message, .get_and_clear_pending_msg = never_send_custom_msgs, + .provided_node_features = custom_node_features, + .provided_init_features = custom_init_features, .CustomMessageReader = LDKCustomMessageReader { .this_arg = NULL, .read = read_custom_message, @@ -980,21 +1063,25 @@ int main() { }, .free = NULL, }; + LDK::MessageHandler msg_handler2 = MessageHandler_new(ChannelManager_as_ChannelMessageHandler(&cm2), P2PGossipSync_as_RoutingMessageHandler(&graph_msg_handler2), OnionMessenger_as_OnionMessageHandler(&om2), custom_msg_handler2); random_bytes = entropy_source1.get_secure_random_bytes(); - LDK::PeerManager net2 = PeerManager_new(std::move(msg_handler2), 0xdeadbeef, &random_bytes.data, logger2, std::move(custom_msg_handler2), std::move(node_signer2)); + LDK::PeerManager net2 = PeerManager_new(std::move(msg_handler2), 0xdeadbeef, &random_bytes.data, logger2, std::move(node_signer2)); PeersConnection conn(cm1, cm2, net1, net2); + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting usable channel..." << std::endl; while (true) { // Wait for the channels to be considered up once the reestablish messages are processed LDK::CVec_ChannelDetailsZ outbound_channels = ChannelManager_list_usable_channels(&cm1); if (outbound_channels->datalen == 1) { break; } + std::this_thread::yield(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Listed usable channel!" << std::endl; // Send another payment, this time via the retires path - LDK::CResult_InvoiceSignOrCreationErrorZ invoice_res2 = create_invoice_from_channelmanager(&cm2, + LDK::CResult_Bolt11InvoiceSignOrCreationErrorZ invoice_res2 = create_invoice_from_channelmanager(&cm2, KeysManager_as_NodeSigner(&keys2), logger1, LDKCurrency_Bitcoin, COption_u64Z_some(10000), LDKStr { @@ -1003,12 +1090,13 @@ int main() { .chars_is_owned = false }, 3600, COption_u16Z_none()); assert(invoice_res2->result_ok); - const LDKInvoice *invoice2 = invoice_res2->contents.result; - LDK::CResult_PaymentIdPaymentErrorZ invoice_pay_res = pay_invoice(invoice2, Retry_attempts(0), &cm1); + const LDKBolt11Invoice *invoice2 = invoice_res2->contents.result; + LDK::CResult_ThirtyTwoBytesPaymentErrorZ invoice_pay_res = pay_invoice(invoice2, Retry_attempts(0), &cm1); assert(invoice_pay_res->result_ok); PeerManager_process_events(&net1); // Check that we received the payment! + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting PendingHTLCsForwardable event..." << std::endl; while (true) { EventQueue queue2; LDKEventHandler handler2 = { .this_arg = &queue2, .handle_event = handle_event, .free = NULL }; @@ -1020,9 +1108,11 @@ int main() { } std::this_thread::yield(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Received PendingHTLCsForwardable event!" << std::endl; ChannelManager_process_pending_htlc_forwards(&cm2); PeerManager_process_events(&net2); + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting PaymentClaimable/PaymentClaimed event..." << std::endl; while (true) { EventQueue queue2; LDKEventHandler handler2 = { .this_arg = &queue2, .handle_event = handle_event, .free = NULL }; @@ -1031,34 +1121,39 @@ int main() { if (queue2.events.size() == 1) { 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, Invoice_payment_hash(invoice2), 32)); + 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, - Invoice_payment_secret(invoice2), 32)); + Bolt11Invoice_payment_secret(invoice2), 32)); assert(event_data->amount_msat == 10000); - ChannelManager_claim_funds(&cm2, event_data->purpose.invoice_payment.payment_preimage); + 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(); 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, Invoice_payment_hash(invoice2), 32)); + 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); break; } std::this_thread::yield(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Received PaymentClaimable/PaymentClaimed event!" << std::endl; EventQueue queue1; LDKEventHandler handler1 = { .this_arg = &queue1, .handle_event = handle_event, .free = NULL }; + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting PaymentSent and PaymentPathSuccessful events..." << std::endl; while (queue1.events.size() < 2) { PeerManager_process_events(&net2); PeerManager_process_events(&net1); LDK::EventsProvider ev1 = ChannelManager_as_EventsProvider(&cm1); ev1.process_pending_events(handler1); + std::this_thread::yield(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Received PaymentSent and PaymentPathSuccessful events (presumably)!" << std::endl; assert(queue1.events.size() == 2); assert(queue1.events[0]->tag == LDKEvent_PaymentSent); assert(queue1.events[1]->tag == LDKEvent_PaymentPathSuccessful); @@ -1068,28 +1163,34 @@ int main() { close_res = ChannelManager_close_channel(&cm1, &chan_id, ChannelManager_get_our_node_id(&cm2)); assert(close_res->result_ok); PeerManager_process_events(&net1); + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting 2 transaction broadcasts..." << std::endl; while (num_txs_broadcasted != 2) { std::this_thread::yield(); } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Broadcast 2 transactions!" << std::endl; LDK::CVec_ChannelDetailsZ chans_after_close1 = ChannelManager_list_channels(&cm1); assert(chans_after_close1->datalen == 0); LDK::CVec_ChannelDetailsZ chans_after_close2 = ChannelManager_list_channels(&cm2); assert(chans_after_close2->datalen == 0); assert(OnionMessenger_send_onion_message(&om1, - LDKCVec_PublicKeyZ { .data = NULL, .datalen = 0, }, - Destination_node(ChannelManager_get_our_node_id(&cm2)), + 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); PeerManager_process_events(&net1); + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting onion message..." << std::endl; while (true) { std::this_thread::yield(); std::unique_lock lck(peer_2_custom_onion_messages.mtx); if (peer_2_custom_onion_messages.msgs.size() != 0) break; } + std::cout << __FILE__ << ":" << __LINE__ << " - " << "Received onion message!" << std::endl; conn.stop(); @@ -1103,5 +1204,5 @@ int main() { memset(&sk, 42, 32); LDKThirtyTwoBytes kdiv_params; memset(&kdiv_params, 43, 32); - LDK::InMemorySigner signer = InMemorySigner_new(sk, sk, sk, sk, sk, random_bytes, 42, kdiv_params); + LDK::InMemorySigner signer = InMemorySigner_new(sk, sk, sk, sk, sk, random_bytes, 42, kdiv_params, kdiv_params); }