import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
final long route_handler;
final long message_handler;
final long peer_manager;
- HashMap<byte[], Long> monitors;
+ HashMap<String, Long> monitors; // Wow I forgot just how terrible Java is - we can't put a byte array here.
+ byte[] node_id;
Peer(byte seed) {
logger = bindings.LDKLogger_new((String arg)-> System.out.println(seed + ": " + arg));
@Override
public long watch_channel(long funding_txo, long monitor) {
synchronized (monitors) {
- assert monitors.put(bindings.OutPoint_get_txid(funding_txo), monitor) == null;
+ assert monitors.put(Arrays.toString(bindings.OutPoint_get_txid(funding_txo)), monitor) == null;
}
bindings.OutPoint_free(funding_txo);
return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
@Override
public long update_channel(long funding_txo, long update) {
synchronized (monitors) {
- bindings.ChannelMonitor_update_monitor(monitors.get(bindings.OutPoint_get_txid(funding_txo)), update, tx_broadcaster, logger);
+ 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, logger);
+ assert bindings.LDKCResult_NoneMonitorUpdateErrorZ_result_ok(update_res);
+ bindings.CResult_NoneMonitorUpdateErrorZ_free(update_res);
}
bindings.OutPoint_free(funding_txo);
- bindings.ChannelMonitorUpdate_free(update);
+ //bindings.ChannelMonitorUpdate_free(update); We'll need this after 681
return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
}
@Override
public long release_pending_monitor_events() {
+ synchronized (monitors) {
+ assert monitors.size() <= 1;
+ for (Long mon : monitors.values()) {
+ return bindings.ChannelMonitor_get_and_clear_pending_monitor_events(mon);
+ }
+ }
return bindings.new_empty_slice_vec();
}
});
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);
+ 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.peer_manager = bindings.PeerManager_new(message_handler, bindings.LDKKeysInterface_call_get_node_secret(keys_interface), random_data, logger);
}
- void connect_block(Block b, Transaction t) {
+ void connect_block(Block b, Transaction t, int height) {
byte[] header = b.bitcoinSerialize();
- long txn = bindings.LDKCVecTempl_C2TupleTempl_usize__Transaction_new(
+ long txn;
+ if (t != null)
+ txn = bindings.LDKCVecTempl_C2TupleTempl_usize__Transaction_new(
new long[] {bindings.C2Tuple_usizeTransactionZ_new(1, bindings.new_txpointer_copy_data(t.bitcoinSerialize()))});
- bindings.ChannelManager_block_connected(chan_manager, header, txn, 1);
+ else
+ txn = bindings.LDKCVecTempl_C2TupleTempl_usize__Transaction_new(new long[0]);
+ bindings.ChannelManager_block_connected(chan_manager, header, txn, height);
synchronized (monitors) {
for (Long mon : monitors.values()) {
- txn = bindings.LDKCVecTempl_C2TupleTempl_usize__Transaction_new(
+ if (t != null)
+ txn = bindings.LDKCVecTempl_C2TupleTempl_usize__Transaction_new(
new long[] {bindings.C2Tuple_usizeTransactionZ_new(1, bindings.new_txpointer_copy_data(t.bitcoinSerialize()))});
- long ret = bindings.ChannelMonitor_block_connected(mon, header, txn, 1, tx_broadcaster, fee_estimator, logger);
+ else
+ txn = bindings.LDKCVecTempl_C2TupleTempl_usize__Transaction_new(new long[0]);
+ long ret = bindings.ChannelMonitor_block_connected(mon, header, txn, height, tx_broadcaster, fee_estimator, logger);
bindings.CVec_C2Tuple_TxidCVec_TxOutZZZ_free(ret);
}
}
@Override public long hash() { return 1; }
});
- long init_vec = bindings.PeerManager_new_outbound_connection(peer1.peer_manager, bindings.ChannelManager_get_our_node_id(peer2.chan_manager), descriptor1.val);
+ 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));
long con_res = bindings.PeerManager_new_inbound_connection(peer2.peer_manager, descriptor2);
while (!list.isEmpty()) { list.poll().join(); }
- long cc_res = bindings.ChannelManager_create_channel(peer1.chan_manager, bindings.ChannelManager_get_our_node_id(peer2.chan_manager), 10000, 1000, 42, 0);
+ 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);
bindings.CResult_NoneAPIErrorZ_free(cc_res);
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.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));
- bindings.ChannelManager_funding_transaction_generated(peer1.chan_manager, chan_id, bindings.OutPoint_new(funding.getTxId().getBytes(), (short) 0));
+ bindings.ChannelManager_funding_transaction_generated(peer1.chan_manager, chan_id, bindings.OutPoint_new(funding.getTxId().getReversedBytes(), (short) 0));
bindings.PeerManager_process_events(peer1.peer_manager);
while (!list.isEmpty()) { list.poll().join(); }
bindings.CVec_EventZ_free(events);
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);
- peer2.connect_block(b, 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}));
+ 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(); }
long peer1_chans = bindings.ChannelManager_list_channels(peer1.chan_manager);
long peer2_chans = bindings.ChannelManager_list_channels(peer2.chan_manager);
long[] peer_1_chan_info = bindings.LDKCVecTempl_ChannelDetails_arr_info(peer1_chans);
assert peer_1_chan_info.length == 1;
assert bindings.ChannelDetails_get_channel_value_satoshis(peer_1_chan_info[0]) == 10000;
- assert !bindings.ChannelDetails_get_is_live(peer_1_chan_info[0]);
- assert Arrays.equals(bindings.ChannelDetails_get_channel_id(peer_1_chan_info[0]), funding.getTxId().getBytes());
- assert Arrays.equals(bindings.ChannelDetails_get_channel_id(bindings.LDKCVecTempl_ChannelDetails_arr_info(peer2_chans)[0]), funding.getTxId().getBytes());
- bindings.CVec_ChannelDetailsZ_free(peer1_chans);
+ assert bindings.ChannelDetails_get_is_live(peer_1_chan_info[0]);
+ assert Arrays.equals(bindings.ChannelDetails_get_channel_id(peer_1_chan_info[0]), funding.getTxId().getReversedBytes());
+ assert Arrays.equals(bindings.ChannelDetails_get_channel_id(bindings.LDKCVecTempl_ChannelDetails_arr_info(peer2_chans)[0]), funding.getTxId().getReversedBytes());
bindings.CVec_ChannelDetailsZ_free(peer2_chans);
+ 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,
+ bindings.LDKCVecTempl_RouteHint_new(new long[0]), 1000, 42, peer1.logger);
+ bindings.CVec_ChannelDetailsZ_free(peer1_chans);
+ 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_inner(route), payment_hash, new byte[32]);
+ bindings.CResult_RouteLightningErrorZ_free(route);
+ assert bindings.LDKCResult_NonePaymentSendFailureZ_result_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(); }
+
+ long peer2_events = bindings.LDKEventsProvider_call_get_and_clear_pending_events(peer2.chan_manager_events);
+ bindings.VecOrSliceDef event_arr_info = bindings.LDKCVecTempl_Event_arr_info(peer2_events);
+ assert event_arr_info.datalen == 1;
+ bindings.LDKEvent forwardable = bindings.LDKEvent_ref_from_ptr(event_arr_info.dataptr);
+ assert forwardable instanceof bindings.LDKEvent.PendingHTLCsForwardable;
+ bindings.CVec_EventZ_free(peer2_events);
+ bindings.ChannelManager_process_pending_htlc_forwards(peer2.chan_manager);
+
+ peer2_events = bindings.LDKEventsProvider_call_get_and_clear_pending_events(peer2.chan_manager_events);
+ event_arr_info = bindings.LDKCVecTempl_Event_arr_info(peer2_events);
+ assert event_arr_info.datalen == 1;
+ bindings.LDKEvent payment_recvd = bindings.LDKEvent_ref_from_ptr(event_arr_info.dataptr);
+ 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.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(); }
+
+ long peer1_events = bindings.LDKEventsProvider_call_get_and_clear_pending_events(peer1.chan_manager_events);
+ event_arr_info = bindings.LDKCVecTempl_Event_arr_info(peer1_events);
+ assert event_arr_info.datalen == 1;
+ bindings.LDKEvent sent = bindings.LDKEvent_ref_from_ptr(event_arr_info.dataptr);
+ assert sent instanceof bindings.LDKEvent.PaymentSent;
+ assert Arrays.equals(((bindings.LDKEvent.PaymentSent)sent).payment_preimage, payment_preimage);
+ bindings.CVec_EventZ_free(peer1_events);
+
peer1.free();
peer2.free();
bindings.SocketDescriptor_free(descriptor2);