import org.junit.jupiter.api.Test;
import org.ldk.impl.bindings;
import org.ldk.enums.*;
+import org.ldk.structs.Result_NoneChannelMonitorUpdateErrZ;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
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.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);
- return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
+ long res = bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
+ results_to_free.add(res);
+ return res;
}
@Override
synchronized (monitors) {
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);
+ 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);
}
bindings.OutPoint_free(funding_txo);
bindings.ChannelMonitorUpdate_free(update);
- return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
+ long res = bindings.CResult_NoneChannelMonitorUpdateErrZ_ok();
+ results_to_free.add(res);
+ return res;
}
@Override
byte[] key_seed = new byte[32];
for (byte i = 0; i < 32; i++) { key_seed[i] = (byte) (i ^ seed); }
- this.keys = bindings.KeysManager_new(key_seed, LDKNetwork.LDKNetwork_Bitcoin, System.currentTimeMillis() / 1000, (int)(System.currentTimeMillis() * 1000) & 0xffffffff);
+ 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(LDKNetwork.LDKNetwork_Bitcoin, 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(0, logger);
+ this.router = bindings.NetGraphMsgHandler_new(new byte[32], 0, logger);
this.route_handler = bindings.NetGraphMsgHandler_as_RoutingMessageHandler(router);
this.message_handler = bindings.MessageHandler_new(chan_handler, route_handler);
}
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_TxOutZZ_free(r);
+ bindings.C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(r);
}
}
}
bindings.ChannelMonitor_free(mon);
}
}
+ for (Long res : results_to_free) {
+ bindings.CResult_NoneChannelMonitorUpdateErrZ_free(res);
+ }
}
}
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);
}
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,
+ long route = bindings.get_route(peer1.node_id, bindings.LockedNetworkGraph_graph(netgraph), peer2.node_id, 0L, peer1_chans,
new long[0], 1000, 42, peer1.logger);
for (long chan : peer1_chans) bindings.ChannelDetails_free(chan);
assert bindings.LDKCResult_RouteLightningErrorZ_result_ok(route);
projects / ldk-java / blobdiff