}
@Override
- public MonitorEvent[] release_pending_monitor_events() {
+ public TwoTuple_OutPointCVec_MonitorEventZZ[] release_pending_monitor_events() {
synchronized (monitors) {
assert monitors.size() <= 1;
for (ChannelMonitor mon : monitors.values()) {
- return mon.get_and_clear_pending_monitor_events();
+ TwoTuple_OutPointCVec_MonitorEventZZ[] res = new TwoTuple_OutPointCVec_MonitorEventZZ[1];
+ res[0] = TwoTuple_OutPointCVec_MonitorEventZZ.of(mon.get_funding_txo().get_a(), mon.get_and_clear_pending_monitor_events());
+ return res;
}
}
- return new MonitorEvent[0];
+ return new TwoTuple_OutPointCVec_MonitorEventZZ[0];
}
};
Watch watch = Watch.new_impl(watch_impl);
final KeysInterface keys_interface;
final ChainMonitor chain_monitor;
NetworkGraph router;
- NetGraphMsgHandler route_handler;
+ P2PGossipSync route_handler;
final Watch chain_watch;
final HashSet<String> filter_additions;
Option_FilterZ filter;
}
}
private void setup_route_handler() {
- this.route_handler = NetGraphMsgHandler.of(this.router, Option_AccessZ.some(Access.new_impl(new Access.AccessInterface() {
+ this.route_handler = P2PGossipSync.of(this.router, Option_AccessZ.some(Access.new_impl(new Access.AccessInterface() {
@Override
public Result_TxOutAccessErrorZ get_utxo(byte[] genesis_hash, long short_channel_id) {
// We don't exchange any gossip, so should never actually get called, but providing a Some(Access)
}
Peer(byte seed) {
this(null, seed);
- this.router = NetworkGraph.of(new byte[32]);
+ this.router = NetworkGraph.of(new byte[32], this.logger);
this.setup_route_handler();
if (use_chan_manager_constructor) {
this.keys_interface, this.fee_estimator, this.chain_monitor, this.router, this.tx_broadcaster, this.logger);
}
ProbabilisticScoringParameters params = ProbabilisticScoringParameters.with_default();
- ProbabilisticScorer default_scorer = ProbabilisticScorer.of(params, this.router);
- Result_ProbabilisticScorerDecodeErrorZ score_res = ProbabilisticScorer.read(default_scorer.write(), params, this.router);
+ ProbabilisticScorer default_scorer = ProbabilisticScorer.of(params, this.router, this.logger);
+ Result_ProbabilisticScorerDecodeErrorZ score_res = ProbabilisticScorer.read(default_scorer.write(), params, this.router, this.logger);
assert score_res.is_ok();
Score score = ((Result_ProbabilisticScorerDecodeErrorZ.Result_ProbabilisticScorerDecodeErrorZ_OK) score_res).res.as_Score();
MultiThreadedLockableScore scorer = null;
}
@Override public void persist_manager(byte[] channel_manager_bytes) { assert channel_manager_bytes.length > 1; }
@Override public void persist_network_graph(byte[] graph_bytes) { assert graph_bytes.length > 1; }
+ @Override public void persist_scorer(byte[] scorer_bytes) { assert scorer_bytes.length > 1; }
}, scorer);
this.chan_manager = constructor.channel_manager;
this.peer_manager = constructor.peer_manager;
}
}), MultiThreadedLockableScore.of(Score.new_impl(new Score.ScoreInterface() {
@Override public void payment_path_failed(RouteHop[] path, long scid) {}
- @Override public long channel_penalty_msat(long short_channel_id, long send_amt_msat, long channel_capacity_msat, NodeId source, NodeId target) { return 0; }
+ @Override public long channel_penalty_msat(long short_channel_id, NodeId source, NodeId target, ChannelUsage usage) { return 0; }
@Override public void payment_path_successful(RouteHop[] path) {}
@Override public byte[] write() { assert false; return null; }
})), logger, EventHandler.new_impl(new EventHandler.EventHandlerInterface() {
pending_manager_events.notifyAll();
}
}
- }), RetryAttempts.of(0));
+ }), Retry.attempts(0));
}
}
this.router = this.constructor.net_graph;
setup_route_handler();
MultiThreadedLockableScore scorer = null;
- if (use_invoice_payer) { scorer = MultiThreadedLockableScore.of(ProbabilisticScorer.of(ProbabilisticScoringParameters.with_default(), this.router).as_Score()); }
+ if (use_invoice_payer) { scorer = MultiThreadedLockableScore.of(ProbabilisticScorer.of(ProbabilisticScoringParameters.with_default(), this.router, this.logger).as_Score()); }
constructor.chain_sync_completed(new ChannelManagerConstructor.EventHandler() {
@Override public void handle_event(Event event) {
synchronized (pending_manager_events) {
}
@Override public void persist_manager(byte[] channel_manager_bytes) { assert channel_manager_bytes.length > 1; }
@Override public void persist_network_graph(byte[] graph_bytes) { assert graph_bytes.length > 1; }
+ @Override public void persist_scorer(byte[] scorer_bytes) { assert scorer_bytes.length > 1; }
}, scorer);
this.chan_manager = constructor.channel_manager;
this.payer = constructor.payer;
assert false;
}
} else {
- this.router = NetworkGraph.of(new byte[32]);
+ this.router = NetworkGraph.of(new byte[32], this.logger);
this.setup_route_handler();
ChannelMonitor[] monitors = new ChannelMonitor[1];
assert orig.monitors.size() == 1;
return UtilMethods.find_route(payer, params, router, first_hops, logger, scorer, new byte[32]);
}
}), MultiThreadedLockableScore.of(Score.new_impl(new Score.ScoreInterface() {
- @Override public long channel_penalty_msat(long short_channel_id, long send_amt_msat, long channel_capacity_msat, NodeId source, NodeId target) { return 0; }
+ @Override public long channel_penalty_msat(long short_channel_id, NodeId source, NodeId target, ChannelUsage usage) { return 0; }
@Override public void payment_path_failed(RouteHop[] path, long scid) {}
@Override public void payment_path_successful(RouteHop[] path) {}
@Override public byte[] write() { assert false; return null; }
pending_manager_events.notifyAll();
}
}
- }), RetryAttempts.of(0));
+ }), Retry.attempts(0));
}
}
this.node_id = chan_manager.get_our_node_id();
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(100000), new Script(funding_spk));
- Result_NoneAPIErrorZ funding_res = peer1.chan_manager.funding_transaction_generated(chan_id, funding.bitcoinSerialize());
+ Result_NoneAPIErrorZ funding_res = peer1.chan_manager.funding_transaction_generated(chan_id, peer2.node_id, funding.bitcoinSerialize());
assert funding_res instanceof Result_NoneAPIErrorZ.Result_NoneAPIErrorZ_OK;
maybe_exchange_peer_messages(peer1, peer2);
assert Arrays.equals(peer1_chans[0].get_channel_id(), funding.getTxId().getReversedBytes());
assert Arrays.equals(peer2_chans[0].get_channel_id(), funding.getTxId().getReversedBytes());
- Result_InvoiceSignOrCreationErrorZ invoice = UtilMethods.create_invoice_from_channelmanager(peer2.chan_manager, peer2.keys_interface, Currency.LDKCurrency_Bitcoin, Option_u64Z.some(10000000), "Invoice Description");
+ Result_InvoiceSignOrCreationErrorZ invoice = UtilMethods.create_invoice_from_channelmanager(peer2.chan_manager, peer2.keys_interface, Currency.LDKCurrency_Bitcoin, Option_u64Z.some(10000000), "Invoice Description", 7200);
assert invoice instanceof Result_InvoiceSignOrCreationErrorZ.Result_InvoiceSignOrCreationErrorZ_OK;
System.out.println("Got invoice: " + ((Result_InvoiceSignOrCreationErrorZ.Result_InvoiceSignOrCreationErrorZ_OK) invoice).res.to_str());
RouteParameters route_params = RouteParameters.of(payee, 10000000, 42);
Result_RouteLightningErrorZ route_res = UtilMethods.find_route(
peer1.chan_manager.get_our_node_id(), route_params, peer1.router,
- peer1_chans, peer1.logger, Scorer.with_default().as_Score(), new byte[32]);
+ peer1_chans, peer1.logger, ProbabilisticScorer.of(ProbabilisticScoringParameters.with_default(), peer1.router, peer1.logger).as_Score(), new byte[32]);
assert route_res instanceof Result_RouteLightningErrorZ.Result_RouteLightningErrorZ_OK;
Route route = ((Result_RouteLightningErrorZ.Result_RouteLightningErrorZ_OK) route_res).res;
assert route.get_paths().length == 1;
assert !Arrays.equals(payment_preimage, new byte[32]);
state.peer2.chan_manager.claim_funds(payment_preimage);
+ events = state.peer2.get_manager_events(1, state.peer1, state.peer2);
+ assert events[0] instanceof Event.PaymentClaimed;
+ assert ((Event.PaymentClaimed)events[0]).purpose instanceof PaymentPurpose.InvoicePayment;
+ payment_preimage = ((PaymentPurpose.InvoicePayment)((Event.PaymentClaimed)events[0]).purpose).payment_preimage;
+ assert !Arrays.equals(payment_preimage, new byte[32]);
+
events = state.peer1.get_manager_events(2, state.peer1, state.peer2);
assert events[0] instanceof Event.PaymentSent;
assert Arrays.equals(((Event.PaymentSent) events[0]).payment_preimage, payment_preimage);
ChannelDetails[] peer1_chans = state.peer1.chan_manager.list_channels();
if (nice_close) {
- Result_NoneAPIErrorZ close_res = state.peer1.chan_manager.close_channel(peer1_chans[0].get_channel_id());
+ Result_NoneAPIErrorZ close_res = state.peer1.chan_manager.close_channel(peer1_chans[0].get_channel_id(), state.peer2.node_id);
assert close_res instanceof Result_NoneAPIErrorZ.Result_NoneAPIErrorZ_OK;
maybe_exchange_peer_messages(state.peer1, state.peer2);
synchronized (state.peer1.broadcast_set) {
synchronized (state.peer2.broadcast_set) {
while (state.peer2.broadcast_set.size() != 1) state.peer2.broadcast_set.wait();
}
-
- assert state.peer1.broadcast_set.size() == 1;
- assert state.peer2.broadcast_set.size() == 1;
} else {
state.peer1.chan_manager.force_close_all_channels();
maybe_exchange_peer_messages(state.peer1, state.peer2);
synchronized (state.peer2.broadcast_set) {
while (state.peer2.broadcast_set.size() != 1) state.peer2.broadcast_set.wait();
}
-
- assert state.peer1.broadcast_set.size() == 1;
- assert state.peer2.broadcast_set.size() == 1;
}
+ assert state.peer1.broadcast_set.size() == 1;
+ assert state.peer2.broadcast_set.size() == 1;
+
events = state.peer2.get_manager_events(1, state.peer1, state.peer2);
assert events[0] instanceof Event.ChannelClosed;
events = state.peer1.get_manager_events(1, state.peer1, state.peer2);
projects / ldk-java / blobdiff