import org.bitcoinj.core.*;
import org.bitcoinj.script.Script;
import org.junit.jupiter.api.Test;
+import org.ldk.enums.Network;
+import org.ldk.enums.Recipient;
import org.ldk.impl.bindings;
-import org.ldk.enums.*;
-import org.ldk.structs.Result_NoneChannelMonitorUpdateErrZ;
+import java.lang.ref.Reference;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
final long chan_manager_events;
final long chan_handler;
final long router;
+ final long router_wrapper;
final long route_handler;
final long message_handler;
+ final long custom_message_handler;
final long peer_manager;
HashMap<String, Long> monitors; // Wow I forgot just how terrible Java is - we can't put a byte array here.
byte[] node_id;
bindings.LDKBroadcasterInterface broad_trait;
bindings.LDKLogger log_trait;
bindings.LDKWatch watcher;
- ArrayList<Long> results_to_free;
Peer(byte seed) {
- this.log_trait = (String arg)-> System.out.println(seed + ": " + arg);
+ this.log_trait = (long arg) -> {
+ System.out.println(seed + ": " + bindings.Record_get_args(arg));
+ bindings.Record_free(arg);
+ };
logger = bindings.LDKLogger_new(this.log_trait);
this.fee_est = confirmation_target -> 0;
this.fee_estimator = bindings.LDKFeeEstimator_new(this.fee_est);
this.broad_trait = tx -> {
// We should broadcast
};
- this.results_to_free = new ArrayList<>();
this.tx_broadcaster = bindings.LDKBroadcasterInterface_new(this.broad_trait);
this.monitors = new HashMap<>();
this.watcher = new bindings.LDKWatch() {
assert monitors.put(Arrays.toString(bindings.OutPoint_get_txid(funding_txo)), monitor) == null;
}
bindings.OutPoint_free(funding_txo);
- long res = bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
- results_to_free.add(res);
- return res;
+ return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
}
@Override
String txid = Arrays.toString(bindings.OutPoint_get_txid(funding_txo));
assert monitors.containsKey(txid);
long update_res = bindings.ChannelMonitor_update_monitor(monitors.get(txid), update, tx_broadcaster, fee_estimator, logger);
- assert bindings.LDKCResult_NoneMonitorUpdateErrorZ_result_ok(update_res);
- bindings.CResult_NoneMonitorUpdateErrorZ_free(update_res);
+ assert bindings.CResult_NoneNoneZ_is_ok(update_res);
+ bindings.CResult_NoneNoneZ_free(update_res);
}
bindings.OutPoint_free(funding_txo);
bindings.ChannelMonitorUpdate_free(update);
- long res = bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
- results_to_free.add(res);
- return res;
+ return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
}
@Override
this.keys = bindings.KeysManager_new(key_seed, System.currentTimeMillis() / 1000, (int)(System.currentTimeMillis() * 1000) & 0xffffffff);
this.keys_interface = bindings.KeysManager_as_KeysInterface(keys);
this.config = bindings.UserConfig_default();
- this.chan_manager = bindings.ChannelManager_new(LDKNetwork.LDKNetwork_Bitcoin, fee_estimator, chain_monitor, tx_broadcaster, logger, keys_interface, config, 1);
+ long params = bindings.ChainParameters_new(Network.LDKNetwork_Bitcoin, bindings.BestBlock_new(new byte[32], 0));
+ this.chan_manager = bindings.ChannelManager_new(fee_estimator, chain_monitor, tx_broadcaster, logger, keys_interface, config, params);
this.node_id = bindings.ChannelManager_get_our_node_id(chan_manager);
this.chan_manager_events = bindings.ChannelManager_as_EventsProvider(chan_manager);
this.chan_handler = bindings.ChannelManager_as_ChannelMessageHandler(chan_manager);
- this.router = bindings.NetGraphMsgHandler_new(new byte[32], 0, logger);
- this.route_handler = bindings.NetGraphMsgHandler_as_RoutingMessageHandler(router);
+ this.router = bindings.NetworkGraph_new(new byte[32]);
+ this.router_wrapper = bindings.NetGraphMsgHandler_new(router, bindings.COption_AccessZ_none(), logger);
+ this.route_handler = bindings.NetGraphMsgHandler_as_RoutingMessageHandler(router_wrapper);
this.message_handler = bindings.MessageHandler_new(chan_handler, route_handler);
+ this.custom_message_handler = bindings.IgnoringMessageHandler_new();
byte[] random_data = new byte[32];
for (byte i = 0; i < 32; i++) { random_data[i] = (byte) ((i ^ seed) ^ 0xf0); }
- this.peer_manager = bindings.PeerManager_new(message_handler, bindings.KeysInterface_get_node_secret(keys_interface), random_data, logger);
+
+ long node_id_result = bindings.KeysInterface_get_node_secret(keys_interface, Recipient.LDKRecipient_Node);
+ assert bindings.CResult_SecretKeyNoneZ_is_ok(node_id_result);
+ this.peer_manager = bindings.PeerManager_new(message_handler, bindings.CResult_SecretKeyNoneZ_get_ok(node_id_result),
+ random_data, logger, bindings.IgnoringMessageHandler_as_CustomMessageHandler(this.custom_message_handler));
+ bindings.CResult_SecretKeyNoneZ_free(node_id_result);
}
void connect_block(Block b, Transaction t, int height) {
- byte[] header = Arrays.copyOfRange(b.bitcoinSerialize(), 0, 80);
- long[] txn;
- if (t != null)
- txn = new long[]{bindings.C2Tuple_usizeTransactionZ_new(1, t.bitcoinSerialize())};
- else
- txn = new long[0];
- bindings.ChannelManager_block_connected(chan_manager, header, txn, height);
+ long listen = bindings.ChannelManager_as_Listen(chan_manager);
+ bindings.Listen_block_connected(listen, b.bitcoinSerialize(), height);
+ bindings.Listen_free(listen);
synchronized (monitors) {
for (Long mon : monitors.values()) {
+ long[] txn;
if (t != null)
txn = new long[]{bindings.C2Tuple_usizeTransactionZ_new(1, t.bitcoinSerialize())};
else
txn = new long[0];
+ byte[] header = Arrays.copyOfRange(b.bitcoinSerialize(), 0, 80);
long[] ret = bindings.ChannelMonitor_block_connected(mon, header, txn, height, tx_broadcaster, fee_estimator, logger);
for (long r : ret) {
bindings.C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(r);
bindings.ChannelManager_free(chan_manager);
bindings.EventsProvider_free(chan_manager_events);
bindings.ChannelMessageHandler_free(chan_handler);
- bindings.NetGraphMsgHandler_free(router);
+ bindings.NetworkGraph_free(router);
+ bindings.NetGraphMsgHandler_free(router_wrapper);
bindings.RoutingMessageHandler_free(route_handler);
//MessageHandler was actually moved into the route_handler!: bindings.MessageHandler_free(message_handler);
bindings.PeerManager_free(peer_manager);
bindings.ChannelMonitor_free(mon);
}
}
- for (Long res : results_to_free) {
- bindings.CResult_NoneChannelMonitorUpdateErrZ_free(res);
- }
}
}
void do_read_event(ConcurrentLinkedQueue<Thread> list, long pm, long descriptor, byte[] arr) {
Thread thread = new Thread(() -> {
long res = bindings.PeerManager_read_event(pm, descriptor, arr);
- assert bindings.LDKCResult_boolPeerHandleErrorZ_result_ok(res);
+ assert bindings.CResult_boolPeerHandleErrorZ_is_ok(res);
//assert bindings.deref_bool(bindings.LDKCResult_boolPeerHandleErrorZ_get_inner(res));
bindings.CResult_boolPeerHandleErrorZ_free(res);
});
list.add(thread);
}
+ void deliver_peer_messages(ConcurrentLinkedQueue<Thread> list, long peer1, long peer2) throws InterruptedException {
+ bindings.PeerManager_process_events(peer1);
+ bindings.PeerManager_process_events(peer2);
+ while (!list.isEmpty()) {
+ list.poll().join();
+ bindings.PeerManager_process_events(peer1);
+ bindings.PeerManager_process_events(peer2);
+ }
+ }
+
@Test
void test_message_handler() throws InterruptedException {
Peer peer1 = new Peer((byte) 1);
descriptor1.val = bindings.LDKSocketDescriptor_new(sock2);
long init_vec = bindings.PeerManager_new_outbound_connection(peer1.peer_manager, peer2.node_id, descriptor1.val);
- assert(bindings.LDKCResult_CVec_u8ZPeerHandleErrorZ_result_ok(init_vec));
+ assert(bindings.CResult_CVec_u8ZPeerHandleErrorZ_is_ok(init_vec));
long con_res = bindings.PeerManager_new_inbound_connection(peer2.peer_manager, descriptor2);
- assert(bindings.LDKCResult_NonePeerHandleErrorZ_result_ok(con_res));
+ assert(bindings.CResult_NonePeerHandleErrorZ_is_ok(con_res));
bindings.CResult_NonePeerHandleErrorZ_free(con_res);
- do_read_event(list, peer2.peer_manager, descriptor2, bindings.LDKCResult_CVec_u8ZPeerHandleErrorZ_get_ok(init_vec));
+ do_read_event(list, peer2.peer_manager, descriptor2, bindings.CResult_CVec_u8ZPeerHandleErrorZ_get_ok(init_vec));
bindings.CResult_CVec_u8ZPeerHandleErrorZ_free(init_vec);
- while (!list.isEmpty()) { list.poll().join(); }
+ deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager);
long cc_res = bindings.ChannelManager_create_channel(peer1.chan_manager, peer2.node_id, 10000, 1000, 42, 0);
- assert bindings.LDKCResult_NoneAPIErrorZ_result_ok(cc_res);
+ assert bindings.CResult_NoneAPIErrorZ_is_ok(cc_res);
bindings.CResult_NoneAPIErrorZ_free(cc_res);
- bindings.PeerManager_process_events(peer1.peer_manager);
- while (!list.isEmpty()) { list.poll().join(); }
- bindings.PeerManager_process_events(peer2.peer_manager);
- while (!list.isEmpty()) { list.poll().join(); }
+ deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager);
+
+ ArrayList<Long> events = new ArrayList();
+ bindings.LDKEventHandler events_adder = events::add;
+ long handler = bindings.LDKEventHandler_new(events_adder);
- long events[] = bindings.EventsProvider_get_and_clear_pending_events(peer1.chan_manager_events);
- assert events.length == 1;
- bindings.LDKEvent event = bindings.LDKEvent_ref_from_ptr(events[0]);
+ bindings.EventsProvider_process_pending_events(peer1.chan_manager_events, handler);
+ assert events.size() == 1;
+ bindings.LDKEvent event = bindings.LDKEvent_ref_from_ptr(events.get(0));
assert event instanceof bindings.LDKEvent.FundingGenerationReady;
assert ((bindings.LDKEvent.FundingGenerationReady)event).channel_value_satoshis == 10000;
assert ((bindings.LDKEvent.FundingGenerationReady)event).user_channel_id == 42;
byte[] funding_spk = ((bindings.LDKEvent.FundingGenerationReady)event).output_script;
assert funding_spk.length == 34 && funding_spk[0] == 0 && funding_spk[1] == 32; // P2WSH
byte[] chan_id = ((bindings.LDKEvent.FundingGenerationReady)event).temporary_channel_id;
- bindings.CVec_EventZ_free(events);
+ bindings.Event_free(events.remove(0));
Transaction funding = new Transaction(NetworkParameters.fromID(NetworkParameters.ID_MAINNET));
funding.addInput(new TransactionInput(NetworkParameters.fromID(NetworkParameters.ID_MAINNET), funding, new byte[0]));
funding.getInputs().get(0).setWitness(new TransactionWitness(2)); // Make sure we don't complain about lack of witness
funding.getInput(0).getWitness().setPush(0, new byte[] {0x1});
funding.addOutput(Coin.SATOSHI.multiply(10000), new Script(funding_spk));
- long funding_txo = bindings.OutPoint_new(funding.getTxId().getReversedBytes(), (short) 0);
- bindings.ChannelManager_funding_transaction_generated(peer1.chan_manager, chan_id, funding_txo);
- bindings.OutPoint_free(funding_txo);
-
- bindings.PeerManager_process_events(peer1.peer_manager);
- while (!list.isEmpty()) { list.poll().join(); }
- bindings.PeerManager_process_events(peer2.peer_manager);
- while (!list.isEmpty()) { list.poll().join(); }
+ bindings.ChannelManager_funding_transaction_generated(peer1.chan_manager, chan_id, funding.bitcoinSerialize());
- events = bindings.EventsProvider_get_and_clear_pending_events(peer1.chan_manager_events);
- assert events.length == 1;
- event = bindings.LDKEvent_ref_from_ptr(events[0]);
- assert event instanceof bindings.LDKEvent.FundingBroadcastSafe;
- bindings.CVec_EventZ_free(events);
+ deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager);
Block b = new Block(NetworkParameters.fromID(NetworkParameters.ID_MAINNET), 2, Sha256Hash.ZERO_HASH, Sha256Hash.ZERO_HASH, 42, 0, 0, Arrays.asList(new Transaction[]{funding}));
peer1.connect_block(b, funding, 1);
peer2.connect_block(b, funding, 1);
for (int height = 2; height < 10; height++) {
- b = new Block(NetworkParameters.fromID(NetworkParameters.ID_MAINNET), 2, b.getHash(), Sha256Hash.ZERO_HASH, 42, 0, 0, Arrays.asList(new Transaction[]{funding}));
+ b = new Block(NetworkParameters.fromID(NetworkParameters.ID_MAINNET), 2, b.getHash(), Sha256Hash.ZERO_HASH, 42, 0, 0, Arrays.asList(new Transaction[0]));
peer1.connect_block(b, null, height);
peer2.connect_block(b, null, height);
}
- bindings.PeerManager_process_events(peer1.peer_manager);
- bindings.PeerManager_process_events(peer2.peer_manager);
- while (!list.isEmpty()) { list.poll().join(); }
+ deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager);
long[] peer1_chans = bindings.ChannelManager_list_channels(peer1.chan_manager);
long[] peer2_chans = bindings.ChannelManager_list_channels(peer2.chan_manager);
assert peer1_chans.length == 1;
assert peer2_chans.length == 1;
assert bindings.ChannelDetails_get_channel_value_satoshis(peer1_chans[0]) == 10000;
- assert bindings.ChannelDetails_get_is_live(peer1_chans[0]);
+ assert bindings.ChannelDetails_get_is_usable(peer1_chans[0]);
assert Arrays.equals(bindings.ChannelDetails_get_channel_id(peer1_chans[0]), funding.getTxId().getReversedBytes());
assert Arrays.equals(bindings.ChannelDetails_get_channel_id(peer2_chans[0]), funding.getTxId().getReversedBytes());
for (long chan : peer2_chans) bindings.ChannelDetails_free(chan);
- byte[] payment_preimage = new byte[32];
- for (int i = 0; i < 32; i++) payment_preimage[i] = (byte) (i ^ 0x0f);
- byte[] payment_hash = Sha256Hash.hash(payment_preimage);
- long netgraph = bindings.NetGraphMsgHandler_read_locked_graph(peer1.router);
- long route = bindings.get_route(peer1.node_id, bindings.LockedNetworkGraph_graph(netgraph), peer2.node_id, peer1_chans,
- new long[0], 1000, 42, peer1.logger);
+ long no_min_val = bindings.COption_u64Z_none();
+ long inbound_payment = bindings.ChannelManager_create_inbound_payment(peer2.chan_manager, no_min_val, 7200);
+ assert bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(inbound_payment);
+ long payment_tuple = bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(inbound_payment);
+ bindings.COption_u64Z_free(no_min_val);
+ long scorer = bindings.Scorer_default();
+ long scorer_interface = bindings.Scorer_as_Score(scorer);
+
+ long no_u64 = bindings.COption_u64Z_none();
+ long invoice_features = bindings.InvoiceFeatures_known();
+ long payee = bindings.PaymentParameters_new(peer2.node_id, invoice_features, new long[0], no_u64, 6*24*14);
+ bindings.InvoiceFeatures_free(invoice_features);
+ bindings.COption_u64Z_free(no_u64);
+ long route_params = bindings.RouteParameters_new(payee, 1000, 42);
+ long route = bindings.find_route(peer1.node_id, route_params, peer1.router, peer1_chans,
+ peer1.logger, scorer_interface);
+ bindings.RouteParameters_free(route_params);
+ bindings.PaymentParameters_free(payee);
+ bindings.Score_free(scorer_interface);
+ bindings.Scorer_free(scorer);
+
for (long chan : peer1_chans) bindings.ChannelDetails_free(chan);
- assert bindings.LDKCResult_RouteLightningErrorZ_result_ok(route);
- bindings.LockedNetworkGraph_free(netgraph);
- long payment_res = bindings.ChannelManager_send_payment(peer1.chan_manager, bindings.LDKCResult_RouteLightningErrorZ_get_ok(route), payment_hash, new byte[32]);
+ assert bindings.CResult_RouteLightningErrorZ_is_ok(route);
+ long payment_res = bindings.ChannelManager_send_payment(peer1.chan_manager, bindings.CResult_RouteLightningErrorZ_get_ok(route),
+ bindings.C2Tuple_PaymentHashPaymentSecretZ_get_a(payment_tuple), bindings.C2Tuple_PaymentHashPaymentSecretZ_get_b(payment_tuple));
bindings.CResult_RouteLightningErrorZ_free(route);
- assert bindings.LDKCResult_NonePaymentSendFailureZ_result_ok(payment_res);
+ bindings.CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(inbound_payment);
+ assert bindings.CResult_NonePaymentSendFailureZ_is_ok(payment_res);
bindings.CResult_NonePaymentSendFailureZ_free(payment_res);
- bindings.PeerManager_process_events(peer1.peer_manager);
- while (!list.isEmpty()) { list.poll().join(); }
- bindings.PeerManager_process_events(peer2.peer_manager);
- while (!list.isEmpty()) { list.poll().join(); }
- bindings.PeerManager_process_events(peer1.peer_manager);
- while (!list.isEmpty()) { list.poll().join(); }
+ deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager);
- long[] peer2_events = bindings.EventsProvider_get_and_clear_pending_events(peer2.chan_manager_events);
- assert peer2_events.length == 1;
- bindings.LDKEvent forwardable = bindings.LDKEvent_ref_from_ptr(peer2_events[0]);
+ bindings.EventsProvider_process_pending_events(peer2.chan_manager_events, handler);
+ assert events.size() == 1;
+ bindings.LDKEvent forwardable = bindings.LDKEvent_ref_from_ptr(events.get(0));
assert forwardable instanceof bindings.LDKEvent.PendingHTLCsForwardable;
- bindings.CVec_EventZ_free(peer2_events);
+ bindings.Event_free(events.remove(0));
bindings.ChannelManager_process_pending_htlc_forwards(peer2.chan_manager);
- peer2_events = bindings.EventsProvider_get_and_clear_pending_events(peer2.chan_manager_events);
- assert peer2_events.length == 1;
- bindings.LDKEvent payment_recvd = bindings.LDKEvent_ref_from_ptr(peer2_events[0]);
+ bindings.EventsProvider_process_pending_events(peer2.chan_manager_events, handler);
+ assert events.size() == 1;
+ bindings.LDKEvent payment_recvd = bindings.LDKEvent_ref_from_ptr(events.get(0));
assert payment_recvd instanceof bindings.LDKEvent.PaymentReceived;
- assert bindings.ChannelManager_claim_funds(peer2.chan_manager, payment_preimage, new byte[32], ((bindings.LDKEvent.PaymentReceived)payment_recvd).amt);
- bindings.CVec_EventZ_free(peer2_events);
+ bindings.LDKPaymentPurpose purpose = bindings.LDKPaymentPurpose_ref_from_ptr(((bindings.LDKEvent.PaymentReceived) payment_recvd).purpose);
+ assert purpose instanceof bindings.LDKPaymentPurpose.InvoicePayment;
+ assert bindings.ChannelManager_claim_funds(peer2.chan_manager, ((bindings.LDKPaymentPurpose.InvoicePayment) purpose).payment_preimage);
+ bindings.Event_free(events.remove(0));
- bindings.PeerManager_process_events(peer2.peer_manager);
- while (!list.isEmpty()) { list.poll().join(); }
- bindings.PeerManager_process_events(peer1.peer_manager);
- while (!list.isEmpty()) { list.poll().join(); }
+ deliver_peer_messages(list, peer1.peer_manager, peer2.peer_manager);
- long[] peer1_events = bindings.EventsProvider_get_and_clear_pending_events(peer1.chan_manager_events);
- assert peer1_events.length == 1;
- bindings.LDKEvent sent = bindings.LDKEvent_ref_from_ptr(peer1_events[0]);
+ bindings.EventsProvider_process_pending_events(peer1.chan_manager_events, handler);
+ assert events.size() == 2;
+ bindings.LDKEvent sent = bindings.LDKEvent_ref_from_ptr(events.get(0));
assert sent instanceof bindings.LDKEvent.PaymentSent;
- assert Arrays.equals(((bindings.LDKEvent.PaymentSent)sent).payment_preimage, payment_preimage);
- bindings.CVec_EventZ_free(peer1_events);
+ bindings.Event_free(events.remove(0));
+ bindings.LDKEvent sent_path = bindings.LDKEvent_ref_from_ptr(events.get(0));
+ assert sent_path instanceof bindings.LDKEvent.PaymentPathSuccessful;
+ bindings.Event_free(events.remove(0));
+ Reference.reachabilityFence(events_adder);
+
+ bindings.EventHandler_free(handler);
peer1.free();
peer2.free();
projects / ldk-java / blobdiff