Skip to content

Commit 00b6a5e

Browse files
TheBlueMattTheBlueMatt
committed
Update C/C++ demo to latest LDK API
1 parent 9f69f2f commit 00b6a5e

File tree

2 files changed

+45
-40
lines changed

2 files changed

+45
-40
lines changed

‎lightning-c-bindings/demo.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ LDKCResult_ChannelMonitorUpdateStatusNoneZ add_channel_monitor(const void *this_
3232
LDKChannelMonitorUpdateStatus update_channel_monitor(const void *this_arg, LDKOutPoint funding_txo, const LDKChannelMonitorUpdate *monitor) {
3333
return ChannelMonitorUpdateStatus_completed();
3434
}
35-
LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ monitors_pending_monitor_events(const void *this_arg) {
36-
LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ empty_htlc_vec = {
35+
LDKCVec_C4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZZ monitors_pending_monitor_events(const void *this_arg) {
36+
LDKCVec_C4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZZ empty_htlc_vec = {
3737
.data = NULL,
3838
.datalen = 0,
3939
};

‎lightning-c-bindings/demo.cpp‎

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,12 @@ LDKChannelMonitorUpdateStatus update_channel_monitor(const void *this_arg, LDKOu
174174
mons_updated += 1;
175175
return ChannelMonitorUpdateStatus_completed();
176176
}
177-
LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ monitors_pending_monitor_events(const void *this_arg) {
177+
LDKCVec_C4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZZ monitors_pending_monitor_events(const void *this_arg) {
178178
NodeMonitors* arg = (NodeMonitors*) this_arg;
179179
std::unique_lock<std::mutex> l(arg->mut);
180180

181181
if (arg->mons.size() == 0) {
182-
return LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ {
182+
return LDKCVec_C4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZZ {
183183
.data = NULL,
184184
.datalen = 0,
185185
};
@@ -191,9 +191,12 @@ LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ monitors_pending_monitor_e
191191
LDK::C2Tuple_OutPointCVec_u8ZZ funding_info = ChannelMonitor_get_funding_txo(&arg->mons[0].second);
192192
LDK::OutPoint outpoint = std::move(funding_info->a);
193193
LDKPublicKey counterparty_node_id = ChannelMonitor_get_counterparty_node_id(&arg->mons[0].second);
194-
LDK::C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ tuple = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new(std::move(outpoint), std::move(events), std::move(counterparty_node_id));
195-
auto vec = LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ {
196-
.data = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)malloc(sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ)),
194+
LDKThirtyTwoBytes channel_id;
195+
memset(&channel_id, 0, sizeof(channel_id));
196+
LDK::ChannelId chan_id = ChannelId_new(channel_id);
197+
LDK::C4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZ tuple = C4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZ_new(std::move(outpoint), std::move(chan_id), std::move(events), std::move(counterparty_node_id));
198+
auto vec = LDKCVec_C4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZZ {
199+
.data = (LDKC4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZ*)malloc(sizeof(LDKC4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZ)),
197200
.datalen = 1,
198201
};
199202
vec.data[0] = std::move(tuple);
@@ -230,8 +233,8 @@ class PeersConnection {
230233
std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting initial handshake completion..." << std::endl;
231234
while (true) {
232235
// Wait for the initial handshakes to complete...
233-
LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_1 = PeerManager_get_peer_node_ids(&net1);
234-
LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_2 = PeerManager_get_peer_node_ids(&net2);
236+
LDK::CVec_PeerDetailsZ peers_1 = PeerManager_list_peers(&net1);
237+
LDK::CVec_PeerDetailsZ peers_2 = PeerManager_list_peers(&net2);
235238
if (peers_1->datalen == 1 && peers_2->datalen == 1) { break; }
236239
std::this_thread::yield();
237240
}
@@ -249,8 +252,8 @@ class PeersConnection {
249252
std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting new connection handshake..." << std::endl;
250253
while (true) {
251254
// Wait for the new connection handshake...
252-
LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_1 = PeerManager_get_peer_node_ids(&net1);
253-
LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_2 = PeerManager_get_peer_node_ids(&net2);
255+
LDK::CVec_PeerDetailsZ peers_1 = PeerManager_list_peers(&net1);
256+
LDK::CVec_PeerDetailsZ peers_2 = PeerManager_list_peers(&net2);
254257
if (peers_1->datalen == 1 && peers_2->datalen == 1) { break; }
255258
std::this_thread::yield();
256259
}
@@ -261,8 +264,8 @@ class PeersConnection {
261264
while (true) {
262265
PeerManager_disconnect_by_node_id(&net1, ChannelManager_get_our_node_id(&cm2));
263266
// Wait for the peers to disconnect...
264-
LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_1 = PeerManager_get_peer_node_ids(&net1);
265-
LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_2 = PeerManager_get_peer_node_ids(&net2);
267+
LDK::CVec_PeerDetailsZ peers_1 = PeerManager_list_peers(&net1);
268+
LDK::CVec_PeerDetailsZ peers_2 = PeerManager_list_peers(&net2);
266269
if (peers_1->datalen == 0 && peers_2->datalen == 0) { break; }
267270
std::this_thread::yield();
268271
}
@@ -277,8 +280,8 @@ class PeersConnection {
277280
std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting initial handshake completion..." << std::endl;
278281
while (true) {
279282
// Wait for the initial handshakes to complete...
280-
LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_1 = PeerManager_get_peer_node_ids(&net1);
281-
LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_2 = PeerManager_get_peer_node_ids(&net2);
283+
LDK::CVec_PeerDetailsZ peers_1 = PeerManager_list_peers(&net1);
284+
LDK::CVec_PeerDetailsZ peers_2 = PeerManager_list_peers(&net2);
282285
if (peers_1->datalen == 1 && peers_2->datalen == 1) { break; }
283286
std::this_thread::yield();
284287
}
@@ -367,8 +370,8 @@ class PeersConnection {
367370
std::cout << __FILE__ << ":" << __LINE__ << " - " << "Awaiting initial handshake completion..." << std::endl;
368371
while (true) {
369372
// Wait for the initial handshakes to complete...
370-
LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_1 = PeerManager_get_peer_node_ids(&net1);
371-
LDK::CVec_C2Tuple_PublicKeyCOption_SocketAddressZZZ peers_2 = PeerManager_get_peer_node_ids(&net2);
373+
LDK::CVec_PeerDetailsZ peers_1 = PeerManager_list_peers(&net1);
374+
LDK::CVec_PeerDetailsZ peers_2 = PeerManager_list_peers(&net2);
372375
if (peers_1->datalen == 1 && peers_2->datalen ==1) { break; }
373376
std::this_thread::yield();
374377
}
@@ -612,7 +615,7 @@ int main() {
612615
LDK::CustomMessageHandler custom_msg_handler1 = IgnoringMessageHandler_as_CustomMessageHandler(&ignoring_handler1);
613616
LDK::CustomOnionMessageHandler custom_onion_msg_handler1 = IgnoringMessageHandler_as_CustomOnionMessageHandler(&ignoring_handler1);
614617
LDK::DefaultMessageRouter mr1 = DefaultMessageRouter_new(&net_graph1, KeysManager_as_EntropySource(&keys1));
615-
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));
618+
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(custom_onion_msg_handler1));
616619

617620
LDK::CVec_ChannelDetailsZ channels = ChannelManager_list_channels(&cm1);
618621
assert(channels->datalen == 0);
@@ -648,7 +651,7 @@ int main() {
648651
LDK::CustomMessageHandler custom_msg_handler2 = IgnoringMessageHandler_as_CustomMessageHandler(&ignoring_handler2);
649652
LDK::CustomOnionMessageHandler custom_onion_msg_handler2 = IgnoringMessageHandler_as_CustomOnionMessageHandler(&ignoring_handler2);
650653
LDK::DefaultMessageRouter mr2 = DefaultMessageRouter_new(&net_graph2, KeysManager_as_EntropySource(&keys2));
651-
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));
654+
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), std::move(custom_onion_msg_handler2));
652655

653656
LDK::CVec_ChannelDetailsZ channels2 = ChannelManager_list_channels(&cm2);
654657
assert(channels2->datalen == 0);
@@ -668,7 +671,7 @@ int main() {
668671
PeersConnection conn(cm1, cm2, net1, net2);
669672

670673
// Note that we have to bind the result to a C++ class to make sure it gets free'd
671-
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());
674+
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());
672675
assert(res->result_ok);
673676
PeerManager_process_events(&net1);
674677

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

711-
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);
714+
LDK::CResult_NoneAPIErrorZ fund_res = ChannelManager_funding_transaction_generated(&cm1, &queue.events[0]->funding_generation_ready.temporary_channel_id, queue.events[0]->funding_generation_ready.counterparty_node_id, funding_transaction);
712715
assert(fund_res->result_ok);
713716
break;
714717
}
@@ -737,7 +740,7 @@ int main() {
737740
ev1.process_pending_events(handler);
738741
if (queue.events.size() == 1) {
739742
assert(queue.events[0]->tag == LDKEvent_ChannelPending);
740-
assert(!memcmp(queue.events[0]->channel_pending.channel_id.data, expected_chan_id, 32));
743+
assert(!memcmp(ChannelId_get_a(&queue.events[0]->channel_pending.channel_id), expected_chan_id, 32));
741744
break;
742745
}
743746
std::this_thread::yield();
@@ -752,7 +755,7 @@ int main() {
752755
ev2.process_pending_events(handler);
753756
if (queue.events.size() == 1) {
754757
assert(queue.events[0]->tag == LDKEvent_ChannelPending);
755-
assert(!memcmp(queue.events[0]->channel_pending.channel_id.data, expected_chan_id, 32));
758+
assert(!memcmp(ChannelId_get_a(&queue.events[0]->channel_pending.channel_id), expected_chan_id, 32));
756759
break;
757760
}
758761
std::this_thread::yield();
@@ -793,7 +796,7 @@ int main() {
793796
ev2.process_pending_events(handler);
794797
if (queue.events.size() == 1) {
795798
assert(queue.events[0]->tag == LDKEvent_ChannelReady);
796-
assert(!memcmp(queue.events[0]->channel_ready.channel_id.data, expected_chan_id, 32));
799+
assert(!memcmp(ChannelId_get_a(&queue.events[0]->channel_ready.channel_id), expected_chan_id, 32));
797800
break;
798801
}
799802
std::this_thread::yield();
@@ -807,7 +810,7 @@ int main() {
807810
ev1.process_pending_events(handler);
808811
if (queue.events.size() == 1) {
809812
assert(queue.events[0]->tag == LDKEvent_ChannelReady);
810-
assert(!memcmp(queue.events[0]->channel_ready.channel_id.data, expected_chan_id, 32));
813+
assert(!memcmp(ChannelId_get_a(&queue.events[0]->channel_ready.channel_id), expected_chan_id, 32));
811814
break;
812815
}
813816
std::this_thread::yield();
@@ -823,7 +826,8 @@ int main() {
823826
const LDKChannelDetails *channel = &outbound_channels->data[0];
824827
LDK::ChannelCounterparty counterparty = ChannelDetails_get_counterparty(channel);
825828

826-
assert(!memcmp(ChannelDetails_get_channel_id(channel), expected_chan_id, 32));
829+
LDK::ChannelId chan_id = ChannelDetails_get_channel_id(channel);
830+
assert(!memcmp(ChannelId_get_a(&chan_id), expected_chan_id, 32));
827831
assert(!memcmp(
828832
ChannelCounterparty_get_node_id(&counterparty).compressed_form,
829833
ChannelManager_get_our_node_id(&cm2).compressed_form, 33));
@@ -926,20 +930,20 @@ int main() {
926930
assert(queue.events.size() == 1);
927931
assert(queue.events[0]->tag == LDKEvent_PaymentClaimable);
928932
assert(!memcmp(queue.events[0]->payment_claimable.payment_hash.data, payment_hash.data, 32));
929-
assert(queue.events[0]->payment_claimable.purpose.tag == LDKPaymentPurpose_InvoicePayment);
930-
assert(!memcmp(queue.events[0]->payment_claimable.purpose.invoice_payment.payment_secret.data,
933+
assert(queue.events[0]->payment_claimable.purpose.tag == LDKPaymentPurpose_Bolt11InvoicePayment);
934+
assert(!memcmp(queue.events[0]->payment_claimable.purpose.bolt11_invoice_payment.payment_secret.data,
931935
Bolt11Invoice_payment_secret(invoice->contents.result), 32));
932936
assert(queue.events[0]->payment_claimable.amount_msat == 5000);
933-
assert(queue.events[0]->payment_claimable.purpose.invoice_payment.payment_preimage.tag == LDKCOption_ThirtyTwoBytesZ_Some);
934-
memcpy(payment_preimage.data, queue.events[0]->payment_claimable.purpose.invoice_payment.payment_preimage.some.data, 32);
937+
assert(queue.events[0]->payment_claimable.purpose.bolt11_invoice_payment.payment_preimage.tag == LDKCOption_ThirtyTwoBytesZ_Some);
938+
memcpy(payment_preimage.data, queue.events[0]->payment_claimable.purpose.bolt11_invoice_payment.payment_preimage.some.data, 32);
935939
ChannelManager_claim_funds(&cm2, payment_preimage);
936940

937941
queue.events.clear();
938942
ev2.process_pending_events(handler);
939943
assert(queue.events.size() == 1);
940944
assert(queue.events[0]->tag == LDKEvent_PaymentClaimed);
941945
assert(!memcmp(queue.events[0]->payment_claimed.payment_hash.data, payment_hash.data, 32));
942-
assert(queue.events[0]->payment_claimed.purpose.tag == LDKPaymentPurpose_InvoicePayment);
946+
assert(queue.events[0]->payment_claimed.purpose.tag == LDKPaymentPurpose_Bolt11InvoicePayment);
943947
}
944948
PeerManager_process_events(&net2);
945949
// Wait until we've passed through a full set of monitor updates (ie new preimage + CS/RAA messages)
@@ -1010,7 +1014,7 @@ int main() {
10101014
};
10111015
LDK::DefaultMessageRouter mr1 = DefaultMessageRouter_new(&net_graph1, KeysManager_as_EntropySource(&keys1));
10121016
LDK::IgnoringMessageHandler ignorer_1 = IgnoringMessageHandler_new();
1013-
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));
1017+
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), std::move(custom_onion_msg_handler1));
10141018

10151019
LDK::CVec_ChannelMonitorZ mons_list2 = LDKCVec_ChannelMonitorZ { .data = (LDKChannelMonitor*)malloc(sizeof(LDKChannelMonitor)), .datalen = 1 };
10161020
assert(mons2.mons.size() == 1);
@@ -1038,11 +1042,12 @@ int main() {
10381042
};
10391043
LDK::DefaultMessageRouter mr2 = DefaultMessageRouter_new(&net_graph2, KeysManager_as_EntropySource(&keys2));
10401044
LDK::IgnoringMessageHandler ignorer_2 = IgnoringMessageHandler_new();
1041-
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);
1045+
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), custom_onion_msg_handler2);
10421046

10431047
// Attempt to close the channel...
1044-
uint8_t chan_id[32];
1045-
for (int i = 0; i < 32; i++) { chan_id[i] = channel_open_txid[31-i]; }
1048+
LDKThirtyTwoBytes chan_id_bytes;
1049+
for (int i = 0; i < 32; i++) { chan_id_bytes.data[i] = channel_open_txid[31-i]; }
1050+
LDK::ChannelId chan_id = ChannelId_new(chan_id_bytes);
10461051
LDK::CResult_NoneAPIErrorZ close_res = ChannelManager_close_channel(&cm1, &chan_id, ChannelManager_get_our_node_id(&cm2));
10471052
assert(!close_res->result_ok); // Note that we can't close while disconnected!
10481053

@@ -1148,19 +1153,19 @@ int main() {
11481153
assert(queue2.events[0]->tag == LDKEvent_PaymentClaimable);
11491154
const struct LDKEvent_LDKPaymentClaimable_Body *event_data = &queue2.events[0]->payment_claimable;
11501155
assert(!memcmp(event_data->payment_hash.data, Bolt11Invoice_payment_hash(invoice2), 32));
1151-
assert(event_data->purpose.tag == LDKPaymentPurpose_InvoicePayment);
1152-
assert(!memcmp(event_data->purpose.invoice_payment.payment_secret.data,
1156+
assert(event_data->purpose.tag == LDKPaymentPurpose_Bolt11InvoicePayment);
1157+
assert(!memcmp(event_data->purpose.bolt11_invoice_payment.payment_secret.data,
11531158
Bolt11Invoice_payment_secret(invoice2), 32));
11541159
assert(event_data->amount_msat == 10000);
1155-
assert(event_data->purpose.invoice_payment.payment_preimage.tag == LDKCOption_ThirtyTwoBytesZ_Some);
1156-
ChannelManager_claim_funds(&cm2, event_data->purpose.invoice_payment.payment_preimage.some);
1160+
assert(event_data->purpose.bolt11_invoice_payment.payment_preimage.tag == LDKCOption_ThirtyTwoBytesZ_Some);
1161+
ChannelManager_claim_funds(&cm2, event_data->purpose.bolt11_invoice_payment.payment_preimage.some);
11571162

11581163
queue2.events.clear();
11591164
ev2.process_pending_events(handler2);
11601165
assert(queue2.events.size() == 1);
11611166
assert(queue2.events[0]->tag == LDKEvent_PaymentClaimed);
11621167
assert(!memcmp(queue2.events[0]->payment_claimed.payment_hash.data, Bolt11Invoice_payment_hash(invoice2), 32));
1163-
assert(queue2.events[0]->payment_claimed.purpose.tag == LDKPaymentPurpose_InvoicePayment);
1168+
assert(queue2.events[0]->payment_claimed.purpose.tag == LDKPaymentPurpose_Bolt11InvoicePayment);
11641169

11651170
break;
11661171
}

0 commit comments

Comments
 (0)