Pay plugin

CHANGELOG.md

@@ -10,10 +10,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 
 - plugins: fully enabled, and ready for you to write some!
+- plugins: `pay` is now a plugin.
 - lightning-cli: `help <cmd>` finds man pages even if `make install` not run.
 - JSON API: `waitsendpay` now has an `erring_direction` field.
 - JSON API: `listpeers` now has a `direction` field in `channels`.
 - JSON API: `listchannels` now takes a `source` option to filter by node id.
+- JSON API: New command `paystatus` gives detailed information on `pay` commands.
 
 ### Changed
 

Makefile

@@ -216,6 +216,7 @@ include lightningd/Makefile
 include cli/Makefile
 include doc/Makefile
 include devtools/Makefile
+include plugins/Makefile
 
 # Git doesn't maintain timestamps, so we only regen if git says we should.
 CHANGED_FROM_GIT = [ x"`git log $@ | head -n1`" != x"`git log $< | head -n1`" -o x"`git diff $<`" != x"" ]

common/daemon.c

@@ -152,10 +152,10 @@ void daemon_shutdown(void)
 	wally_cleanup(0);
 }
 
-void daemon_maybe_debug(int argc, char *argv[])
+void daemon_maybe_debug(char *argv[])
 {
 #if DEVELOPER
-	for (int i = 1; i < argc; i++) {
+	for (int i = 1; argv[i]; i++) {
 		if (!streq(argv[i], "--debugger"))
 			continue;
 

common/daemon.h

@@ -15,7 +15,7 @@ int daemon_poll(struct pollfd *fds, nfds_t nfds, int timeout);
 void daemon_shutdown(void);
 
 /* Kick in a debugger if they set --debugger */
-void daemon_maybe_debug(int argc, char *argv[]);
+void daemon_maybe_debug(char *argv[]);
 
 struct backtrace_state *backtrace_state;
 

common/status.c

@@ -73,9 +73,9 @@ void status_send(const u8 *msg TAKES)
 {
 	report_logging_io("SIGUSR1");
 	if (status_fd >= 0) {
-		int type =fromwire_peektype(msg);
 		if (!wire_sync_write(status_fd, msg))
-			err(1, "Writing out status %i", type);
+			/* No point printing error if lightningd is dead. */
+			exit(1);
 	} else {
 		daemon_conn_send(status_conn, msg);
 	}

common/subdaemon.c

@@ -37,7 +37,7 @@ void subdaemon_setup(int argc, char *argv[])
 			logging_io = true;
 	}
 
-	daemon_maybe_debug(argc, argv);
+	daemon_maybe_debug(argv);
 
 #if DEVELOPER
 	for (int i = 1; i < argc; i++) {

gossipd/routing.c

@@ -1561,6 +1561,7 @@ struct route_hop *get_route(const tal_t *ctx, struct routing_state *rstate,
 		hops[i].nodeid = n->id;
 		hops[i].amount = total_amount;
 		hops[i].delay = total_delay;
+		hops[i].direction = idx;
 		total_amount += connection_fee(c, total_amount);
 		total_delay += c->delay;
 		n = other_node(n, route[i]);

gossipd/routing.h

@@ -207,6 +207,7 @@ get_channel(const struct routing_state *rstate,
 
 struct route_hop {
 	struct short_channel_id channel_id;
+	int direction;
 	struct pubkey nodeid;
 	u64 amount;
 	u32 delay;

lightningd/Makefile

@@ -79,7 +79,6 @@ LIGHTNINGD_SRC :=				\
 	lightningd/opening_control.c		\
 	lightningd/options.c			\
 	lightningd/pay.c			\
-	lightningd/payalgo.c			\
 	lightningd/peer_control.c		\
 	lightningd/peer_htlcs.c			\
 	lightningd/ping.c			\

lightningd/gossip_msg.c

@@ -64,13 +64,16 @@ void fromwire_route_hop(const u8 **pptr, size_t *max, struct route_hop *entry)
 {
 	fromwire_pubkey(pptr, max, &entry->nodeid);
 	fromwire_short_channel_id(pptr, max, &entry->channel_id);
+	entry->direction = fromwire_u8(pptr, max);
 	entry->amount = fromwire_u64(pptr, max);
 	entry->delay = fromwire_u32(pptr, max);
 }
+
 void towire_route_hop(u8 **pptr, const struct route_hop *entry)
 {
 	towire_pubkey(pptr, &entry->nodeid);
 	towire_short_channel_id(pptr, &entry->channel_id);
+	towire_u8(pptr, entry->direction);
 	towire_u64(pptr, entry->amount);
 	towire_u32(pptr, entry->delay);
 }

lightningd/json.c

@@ -30,6 +30,7 @@ json_add_route_hop(struct json_stream *r, char const *n,
 	json_add_pubkey(r, "id", &h->nodeid);
 	json_add_short_channel_id(r, "channel",
 				  &h->channel_id);
+	json_add_num(r, "direction", h->direction);
 	json_add_u64(r, "msatoshi", h->amount);
 	json_add_num(r, "delay", h->delay);
 	json_object_end(r);

lightningd/pay.c

@@ -1004,13 +1004,14 @@ static struct command_result *json_sendpay(struct command *cmd,
 		u64 *amount;
 		struct pubkey *id;
 		struct short_channel_id *channel;
-		unsigned *delay;
+		unsigned *delay, *direction;
 
 		if (!param(cmd, buffer, t,
 			   p_req("msatoshi", param_u64, &amount),
 			   p_req("id", param_pubkey, &id),
 			   p_req("delay", param_number, &delay),
 			   p_req("channel", param_short_channel_id, &channel),
+			   p_opt("direction", param_number, &direction),
 			   NULL))
 			return command_param_failed();
 
@@ -1020,6 +1021,8 @@ static struct command_result *json_sendpay(struct command *cmd,
 		route[n_hops].nodeid = *id;
 		route[n_hops].delay = *delay;
 		route[n_hops].channel_id = *channel;
+		/* FIXME: Actually ignored by sending code! */
+		route[n_hops].direction = direction ? *direction : 0;
 		n_hops++;
 	}