* After doing so (and syncing the blockchain on the channel manager as well), you should call chain_sync_completed()
* and then continue to normal application operation.
*/
- public final TwoTuple_BlockHashChannelMonitorZ[] channel_monitors;
+ public final TwoTuple_ThirtyTwoBytesChannelMonitorZ[] channel_monitors;
/**
* A PeerManager which is constructed to pass messages and handle connections to peers.
*
public PeerManager peer_manager = null;
/**
* A NioPeerHandler which manages a background thread to handle socket events and pass them to the peer_manager.
- *
- * This is `null` until `chain_sync_completed` is called.
+ *
+ * This is `null` until `chain_sync_completed` is called.
*/
public NioPeerHandler nio_peer_handler = null;
private final Logger logger;
private final EntropySource entropy_source;
private final NodeSigner node_signer;
+ private final Router router;
/**
* Exposes the `ProbabilisticScorer` wrapped inside a lock. Don't forget to `close` this lock when you're done with
* it so normal scoring operation can continue.
*/
public class ScorerWrapper implements AutoCloseable {
- private final Score lock;
+ private final ScoreUpdate lock;
public final ProbabilisticScorer prob_scorer;
- private ScorerWrapper(Score lock, ProbabilisticScorer prob_scorer) {
+ private ScorerWrapper(ScoreUpdate lock, ProbabilisticScorer prob_scorer) {
this.lock = lock; this.prob_scorer = prob_scorer;
}
@Override public void close() throws Exception {
* you're done with it.
*/
public ScorerWrapper get_locked_scorer() {
- return new ScorerWrapper(this.scorer.as_LockableScore().lock(), this.prob_scorer);
+ return new ScorerWrapper(this.scorer.as_LockableScore().write_lock(), this.prob_scorer);
}
/**
this.scorer = MultiThreadedLockableScore.of(this.prob_scorer.as_Score());
assert(scoring_fee_params != null);
- DefaultRouter default_router = DefaultRouter.of(this.net_graph, logger, entropy_source.get_secure_random_bytes(), scorer.as_LockableScore(), scoring_fee_params);
- Router router;
+ DefaultRouter default_router = DefaultRouter.of(this.net_graph, logger, entropy_source, scorer.as_LockableScore(), scoring_fee_params);
if (router_wrapper != null) {
router = Router.new_impl(new Router.RouterInterface() {
- @Override public Result_RouteLightningErrorZ find_route(byte[] payer, RouteParameters route_params, ChannelDetails[] first_hops, InFlightHtlcs inflight_htlcs) {
+ @Override
+ public Result_RouteLightningErrorZ find_route(byte[] payer, RouteParameters route_params, ChannelDetails[] first_hops, InFlightHtlcs inflight_htlcs) {
return router_wrapper.find_route(payer, route_params, first_hops, inflight_htlcs, null, null, default_router);
}
- @Override public Result_RouteLightningErrorZ find_route_with_id(byte[] payer, RouteParameters route_params, ChannelDetails[] first_hops, InFlightHtlcs inflight_htlcs, byte[] payment_hash, byte[] payment_id) {
+
+ @Override
+ public Result_RouteLightningErrorZ find_route_with_id(byte[] payer, RouteParameters route_params, ChannelDetails[] first_hops, InFlightHtlcs inflight_htlcs, byte[] payment_hash, byte[] payment_id) {
return router_wrapper.find_route(payer, route_params, first_hops, inflight_htlcs, payment_hash, payment_id, default_router);
}
+
+ @Override
+ public Result_CVec_C2Tuple_BlindedPayInfoBlindedPathZZNoneZ create_blinded_payment_paths(byte[] recipient, ChannelDetails[] first_hops, ReceiveTlvs tlvs, long amount_msats) {
+ return default_router.as_Router().create_blinded_payment_paths(recipient, first_hops, tlvs, amount_msats);
+ }
+ }, new MessageRouter.MessageRouterInterface() {
+ @Override public Result_OnionMessagePathNoneZ find_path(byte[] sender, byte[][] peers, Destination destination) {
+ return default_router.as_MessageRouter().find_path(sender, peers, destination);
+ }
+ @Override public Result_CVec_BlindedPathZNoneZ create_blinded_paths(byte[] recipient, byte[][] peers) {
+ return default_router.as_MessageRouter().create_blinded_paths(recipient, peers);
+ }
});
} else {
router = default_router.as_Router();
}
final ChannelMonitor[] monitors = new ChannelMonitor[channel_monitors_serialized.length];
- this.channel_monitors = new TwoTuple_BlockHashChannelMonitorZ[monitors.length];
+ this.channel_monitors = new TwoTuple_ThirtyTwoBytesChannelMonitorZ[monitors.length];
HashSet<OutPoint> monitor_funding_set = new HashSet();
for (int i = 0; i < monitors.length; i++) {
- Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ res = UtilMethods.C2Tuple_BlockHashChannelMonitorZ_read(channel_monitors_serialized[i], entropy_source, signer_provider);
- if (res instanceof Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_Err) {
+ Result_C2Tuple_ThirtyTwoBytesChannelMonitorZDecodeErrorZ res = UtilMethods.C2Tuple_ThirtyTwoBytesChannelMonitorZ_read(channel_monitors_serialized[i], entropy_source, signer_provider);
+ if (res instanceof Result_C2Tuple_ThirtyTwoBytesChannelMonitorZDecodeErrorZ.Result_C2Tuple_ThirtyTwoBytesChannelMonitorZDecodeErrorZ_Err) {
throw new InvalidSerializedDataException("Serialized ChannelMonitor was corrupt");
}
- byte[] block_hash = ((Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_OK)res).res.get_a();
- monitors[i] = ((Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_OK) res).res.get_b();
- this.channel_monitors[i] = TwoTuple_BlockHashChannelMonitorZ.of(block_hash, monitors[i]);
+ byte[] block_hash = ((Result_C2Tuple_ThirtyTwoBytesChannelMonitorZDecodeErrorZ.Result_C2Tuple_ThirtyTwoBytesChannelMonitorZDecodeErrorZ_OK)res).res.get_a();
+ monitors[i] = ((Result_C2Tuple_ThirtyTwoBytesChannelMonitorZDecodeErrorZ.Result_C2Tuple_ThirtyTwoBytesChannelMonitorZDecodeErrorZ_OK) res).res.get_b();
+ this.channel_monitors[i] = TwoTuple_ThirtyTwoBytesChannelMonitorZ.of(block_hash, monitors[i]);
if (!monitor_funding_set.add(monitors[i].get_funding_txo().get_a()))
throw new InvalidSerializedDataException("Set of ChannelMonitors contained duplicates (ie the same funding_txo was set on multiple monitors)");
}
- Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ res =
- UtilMethods.C2Tuple_BlockHashChannelManagerZ_read(channel_manager_serialized, entropy_source,
+ Result_C2Tuple_ThirtyTwoBytesChannelManagerZDecodeErrorZ res =
+ UtilMethods.C2Tuple_ThirtyTwoBytesChannelManagerZ_read(channel_manager_serialized, entropy_source,
node_signer, signer_provider, fee_estimator, chain_monitor.as_Watch(),
tx_broadcaster, router, logger, config, monitors);
if (!res.is_ok()) {
throw new InvalidSerializedDataException("Serialized ChannelManager was corrupt");
}
- this.channel_manager = ((Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_OK)res).res.get_b();
- this.channel_manager_latest_block_hash = ((Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ.Result_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_OK)res).res.get_a();
+ this.channel_manager = ((Result_C2Tuple_ThirtyTwoBytesChannelManagerZDecodeErrorZ.Result_C2Tuple_ThirtyTwoBytesChannelManagerZDecodeErrorZ_OK)res).res.get_b();
+ this.channel_manager_latest_block_hash = ((Result_C2Tuple_ThirtyTwoBytesChannelManagerZDecodeErrorZ.Result_C2Tuple_ThirtyTwoBytesChannelManagerZDecodeErrorZ_OK)res).res.get_a();
this.chain_monitor = chain_monitor;
this.logger = logger;
if (filter != null) {
for (ChannelMonitor monitor : monitors) {
- monitor.load_outputs_to_watch(filter);
+ monitor.load_outputs_to_watch(filter, logger);
}
}
}
this.scorer = MultiThreadedLockableScore.of(this.prob_scorer.as_Score());
assert(scoring_fee_params != null);
- DefaultRouter default_router = DefaultRouter.of(this.net_graph, logger, entropy_source.get_secure_random_bytes(), scorer.as_LockableScore(), scoring_fee_params);
- Router router;
+ DefaultRouter default_router = DefaultRouter.of(this.net_graph, logger, entropy_source, scorer.as_LockableScore(), scoring_fee_params);
if (router_wrapper != null) {
router = Router.new_impl(new Router.RouterInterface() {
@Override public Result_RouteLightningErrorZ find_route(byte[] payer, RouteParameters route_params, ChannelDetails[] first_hops, InFlightHtlcs inflight_htlcs) {
@Override public Result_RouteLightningErrorZ find_route_with_id(byte[] payer, RouteParameters route_params, ChannelDetails[] first_hops, InFlightHtlcs inflight_htlcs, byte[] payment_hash, byte[] payment_id) {
return router_wrapper.find_route(payer, route_params, first_hops, inflight_htlcs, payment_hash, payment_id, default_router);
}
+
+ @Override
+ public Result_CVec_C2Tuple_BlindedPayInfoBlindedPathZZNoneZ create_blinded_payment_paths(byte[] recipient, ChannelDetails[] first_hops, ReceiveTlvs tlvs, long amount_msats) {
+ return default_router.as_Router().create_blinded_payment_paths(recipient, first_hops, tlvs, amount_msats);
+ }
+ }, new MessageRouter.MessageRouterInterface() {
+ @Override public Result_OnionMessagePathNoneZ find_path(byte[] sender, byte[][] peers, Destination destination) {
+ return default_router.as_MessageRouter().find_path(sender, peers, destination);
+ }
+ @Override public Result_CVec_BlindedPathZNoneZ create_blinded_paths(byte[] recipient, byte[][] peers) {
+ return default_router.as_MessageRouter().create_blinded_paths(recipient, peers);
+ }
});
} else {
router = default_router.as_Router();
}
- channel_monitors = new TwoTuple_BlockHashChannelMonitorZ[0];
+ channel_monitors = new TwoTuple_ThirtyTwoBytesChannelMonitorZ[0];
channel_manager_latest_block_hash = null;
this.chain_monitor = chain_monitor;
BestBlock block = BestBlock.of(current_blockchain_tip_hash, current_blockchain_tip_height);
*/
public void chain_sync_completed(EventHandler event_handler, boolean use_p2p_graph_sync) {
if (background_processor != null) { return; }
- for (TwoTuple_BlockHashChannelMonitorZ monitor: channel_monitors) {
+ for (TwoTuple_ThirtyTwoBytesChannelMonitorZ monitor: channel_monitors) {
this.chain_monitor.as_Watch().watch_channel(monitor.get_b().get_funding_txo().get_a(), monitor.get_b());
}
org.ldk.structs.EventHandler ldk_handler = org.ldk.structs.EventHandler.new_impl(event_handler::handle_event);
routing_msg_handler = graph_msg_handler.as_RoutingMessageHandler();
else
routing_msg_handler = ignoring_handler.as_RoutingMessageHandler();
+ OnionMessenger messenger = OnionMessenger.of(this.entropy_source, this.node_signer, this.logger, this.channel_manager.as_NodeIdLookUp(), this.router.get_message_router(), channel_manager.as_OffersMessageHandler(), IgnoringMessageHandler.of().as_CustomOnionMessageHandler());
this.peer_manager = PeerManager.of(channel_manager.as_ChannelMessageHandler(),
- routing_msg_handler, ignoring_handler.as_OnionMessageHandler(),
+ routing_msg_handler, messenger.as_OnionMessageHandler(),
ignoring_handler.as_CustomMessageHandler(), (int)(System.currentTimeMillis() / 1000),
this.entropy_source.get_secure_random_bytes(), logger, this.node_signer);
background_processor = BackgroundProcessor.start(Persister.new_impl(new Persister.PersisterInterface() {
@Override
- public Result_NoneErrorZ persist_manager(ChannelManager channel_manager) {
+ public Result_NoneIOErrorZ persist_manager(ChannelManager channel_manager) {
event_handler.persist_manager(channel_manager.write());
- return Result_NoneErrorZ.ok();
+ return Result_NoneIOErrorZ.ok();
}
@Override
- public Result_NoneErrorZ persist_graph(NetworkGraph network_graph) {
+ public Result_NoneIOErrorZ persist_graph(NetworkGraph network_graph) {
event_handler.persist_network_graph(network_graph.write());
- return Result_NoneErrorZ.ok();
+ return Result_NoneIOErrorZ.ok();
}
@Override
- public Result_NoneErrorZ persist_scorer(WriteableScore scorer) {
+ public Result_NoneIOErrorZ persist_scorer(WriteableScore scorer) {
event_handler.persist_scorer(scorer.write());
- return Result_NoneErrorZ.ok();
+ return Result_NoneIOErrorZ.ok();
}
}), ldk_handler, this.chain_monitor, this.channel_manager, gossip_sync, peer_manager, this.logger, writeable_score);
}
projects / ldk-java / blobdiff