X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-c-bindings%2Fdemo.c;h=31754d86c02503c03a1ce97882df94dce88391fb;hb=HEAD;hp=92d422bf92e97f3f1c5bb0ee194e2874e83ed5c1;hpb=db5b7699744779437a98e17198f502920bfa2e7e;p=ldk-c-bindings

diff --git a/lightning-c-bindings/demo.c b/lightning-c-bindings/demo.c
index 92d422b..c5993ce 100644
--- a/lightning-c-bindings/demo.c
+++ b/lightning-c-bindings/demo.c
@@ -4,35 +4,36 @@
 #include <stdio.h>
 #include <string.h>
 
-void print_log(const void *this_arg, const LDKRecord *record) {
-	LDKStr mod = Record_get_module_path(record);
-	LDKStr str = Record_get_args(record);
-	printf("%.*s:%d - %.*s\n", (int)mod.len, mod.chars, Record_get_line(record), (int)str.len, str.chars);
+void print_log(const void *this_arg, const LDKRecord record) {
+	LDKStr mod = Record_get_module_path(&record);
+	LDKStr str = Record_get_args(&record);
+	printf("%.*s:%d - %.*s\n", (int)mod.len, mod.chars, Record_get_line(&record), (int)str.len, str.chars);
 	Str_free(str);
 	Str_free(mod);
+	Record_free(record);
 }
 
 uint32_t get_fee(const void *this_arg, LDKConfirmationTarget target) {
-	if (target == LDKConfirmationTarget_Background) {
+	if (target == LDKConfirmationTarget_AnchorChannelFee || target == LDKConfirmationTarget_MinAllowedAnchorChannelRemoteFee) {
 		return 253;
 	} else {
 		return 507;
 	}
 }
 
-void broadcast_tx(const void *this_arg, LDKTransaction tx) {
+void broadcast_txn(const void *this_arg, LDKCVec_TransactionZ txn) {
 	//TODO
-	Transaction_free(tx);
+	CVec_TransactionZ_free(txn);
 }
 
-LDKChannelMonitorUpdateStatus add_channel_monitor(const void *this_arg, LDKOutPoint funding_txo, LDKChannelMonitor monitor) {
-	return ChannelMonitorUpdateStatus_completed();
+LDKCResult_ChannelMonitorUpdateStatusNoneZ add_channel_monitor(const void *this_arg, LDKOutPoint funding_txo, LDKChannelMonitor monitor) {
+	return CResult_ChannelMonitorUpdateStatusNoneZ_ok(ChannelMonitorUpdateStatus_completed());
 }
 LDKChannelMonitorUpdateStatus update_channel_monitor(const void *this_arg, LDKOutPoint funding_txo, const LDKChannelMonitorUpdate *monitor) {
 	return ChannelMonitorUpdateStatus_completed();
 }
-LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ monitors_pending_monitor_events(const void *this_arg) {
-	LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ empty_htlc_vec = {
+LDKCVec_C4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZZ monitors_pending_monitor_events(const void *this_arg) {
+	LDKCVec_C4Tuple_OutPointChannelIdCVec_MonitorEventZPublicKeyZZ empty_htlc_vec = {
 		.data = NULL,
 		.datalen = 0,
 	};
@@ -44,12 +45,12 @@ void never_handle_event(const void *this_arg, const struct LDKEvent event) {
 	assert(false);
 }
 
-LDKCResult_RouteLightningErrorZ do_find_route(const void *this_arg, LDKPublicKey payer, const LDKRouteParameters *route_params, LDKCVec_ChannelDetailsZ *first_hops, const LDKInFlightHtlcs *inflight_htlcs) {
+LDKCResult_RouteLightningErrorZ do_find_route(const void *this_arg, LDKPublicKey payer, const LDKRouteParameters *route_params, LDKCVec_ChannelDetailsZ *first_hops, const LDKInFlightHtlcs inflight_htlcs) {
 	LDKStr reason = { .chars = (const unsigned char*)"", .len = 0, .chars_is_owned = false };
 	return CResult_RouteLightningErrorZ_err(LightningError_new(reason, ErrorAction_ignore_error()));
 }
 
-LDKCResult_RouteLightningErrorZ do_find_route_with_id(const void *this_arg, LDKPublicKey payer, const LDKRouteParameters *route_params, LDKCVec_ChannelDetailsZ *first_hops, const LDKInFlightHtlcs *inflight_htlcs, struct LDKThirtyTwoBytes payment_hash, struct LDKThirtyTwoBytes payment_id) {
+LDKCResult_RouteLightningErrorZ do_find_route_with_id(const void *this_arg, LDKPublicKey payer, const LDKRouteParameters *route_params, LDKCVec_ChannelDetailsZ *first_hops, const LDKInFlightHtlcs inflight_htlcs, struct LDKThirtyTwoBytes payment_hash, struct LDKThirtyTwoBytes payment_id) {
 	LDKStr reason = { .chars = (const unsigned char*)"", .len = 0, .chars_is_owned = false };
 	return CResult_RouteLightningErrorZ_err(LightningError_new(reason, ErrorAction_ignore_error()));
 }
@@ -82,7 +83,7 @@ int main() {
 
 	LDKBroadcasterInterface broadcast = {
 		.this_arg = NULL,
-		.broadcast_transaction = broadcast_tx,
+		.broadcast_transactions = broadcast_txn,
 		.free = NULL,
 	};
 
@@ -102,7 +103,7 @@ int main() {
 	LDKThirtyTwoBytes chain_tip;
 	memset(&chain_tip, 0, 32);
 	LDKChainParameters chain = ChainParameters_new(net, BestBlock_new(chain_tip, 0));
-	LDKChannelManager cm = ChannelManager_new(fee_est, mon, broadcast, router, logger, entropy_source, node_signer, signer_provider, config, chain);
+	LDKChannelManager cm = ChannelManager_new(fee_est, mon, broadcast, router, logger, entropy_source, node_signer, signer_provider, config, chain, 42);
 
 	LDKCVec_ChannelDetailsZ channels = ChannelManager_list_channels(&cm);
 	assert((unsigned long)channels.data < 4096); // There's an offset, but it should still be an offset against null in the 0 page