rustyrussell · Oct 25, 2014 · Oct 25, 2014 · Oct 25, 2014 · Oct 25, 2014 · Oct 25, 2014
diff --git a/Makefile.in b/Makefile.in
@@ -7,7 +7,7 @@
 #   blackbox-check: run the blackbox tests
 #   update-mocks: regenerate the mocks for the unit tests.
 
-PETTYCOIN_OBJS := block.o check_block.o check_tx.o difficulty.o shadouble.o timestamp.o gateways.o hash_tx.o pettycoin.o merkle_txs.o merkle_recurse.o tx_cmp.o genesis.o marshal.o hash_block.o prev_txhashes.o state.o tal_packet.o dns.o netaddr.o peer.o peer_cache.o pseudorand.o welcome.o log.o generating.o blockfile.o pending.o log_helper.o txhash.o signature.o proof.o chain.o features.o todo.o base58.o sync.o create_refs.o shard.o packet_io.o tx.o complain.o block_shard.o recv_block.o input_refs.o peer_wants.o inputhash.o tx_in_hashes.o merkle_hashes.o recv_tx.o reward.o recv_complain.o json.o jsonrpc.o getinfo.o ecode_names.o sendrawtransaction.c pettycoin_dir.o pkt_names.o hex.o listtransactions.o json_add_tx.o gettransaction.o prev_blocks.o detached_block.o getpeerinfo.o
+PETTYCOIN_OBJS := block.o check_block.o check_tx.o difficulty.o shadouble.o timestamp.o gateways.o hash_tx.o pettycoin.o merkle_txs.o merkle_recurse.o tx_cmp.o genesis.o marshal.o hash_block.o prev_txhashes.o state.o tal_packet.o dns.o netaddr.o peer.o peer_cache.o pseudorand.o welcome.o log.o generating.o blockfile.o pending.o log_helper.o txhash.o signature.o proof.o chain.o features.o todo.o base58.o sync.o create_refs.o shard.o packet_io.o tx.o complain.o block_shard.o recv_block.o input_refs.o peer_wants.o inputhash.o tx_in_hashes.o merkle_hashes.o recv_tx.o reward.o recv_complain.o json.o jsonrpc.o getinfo.o ecode_names.o sendrawtransaction.c pettycoin_dir.o pkt_names.o hex.o listtransactions.o json_add_tx.o gettransaction.o prev_blocks.o detached_block.o getpeerinfo.o horizon.o
 PETTYCOIN_GENERATE_OBJS := pettycoin-generate.o merkle_hashes.o merkle_recurse.o hash_tx.o tx_cmp.o shadouble.o marshal.o minimal_log.o tal_packet.o hex.o
 MKGENESIS_OBJS := mkgenesis.o shadouble.o hash_block.o merkle_hashes.o merkle_recurse.o minimal_log.o
 SIZES_OBJS := sizes.o

diff --git a/chain.c b/chain.c
@@ -465,7 +465,7 @@ void update_block_ptrs_invalidated(struct state *state,
 	wake_peers(state);
 }
 
-static void json_add_tx(char **response,
+static void json_add_tx(struct json_result *response,
 			const struct block_shard *s,
 			unsigned int txoff)
 {
@@ -505,7 +505,7 @@ static void json_add_tx(char **response,
 
 static char *json_getblock(struct json_connection *jcon,
 			   const jsmntok_t *params,
-			   char **response)
+			   struct json_result *response)
 {
 	struct protocol_block_id sha;
 	const struct block *b, *b2;
@@ -581,7 +581,7 @@ const struct json_command getblock_command = {
 
 static char *json_getblockhash(struct json_connection *jcon,
 			       const jsmntok_t *params,
-			       char **response)
+			       struct json_result *response)
 {
 	jsmntok_t *height;
 	unsigned int h;

diff --git a/create_refs.c b/create_refs.c
@@ -1,6 +1,7 @@
 #include "block.h"
 #include "chain.h"
 #include "create_refs.h"
+#include "horizon.h"
 #include "state.h"
 #include "timestamp.h"
 #include "tx.h"
@@ -27,10 +28,9 @@ static bool resolve_input(struct state *state,
 	if (!te)
 		return false;
 
-	/* Don't include any transactions within 1 hour of cutoff. */
-	if (block_timestamp(&te->u.block->bi)
-	    + PROTOCOL_TX_HORIZON_SECS(state->test_net) - CLOSE_TO_HORIZON
-	    < current_time())
+	/* Don't include any transactions expiring the next 1 hour. */
+	if (block_expired_by(block_expiry(state, &te->u.block->bi),
+			     current_time() + CLOSE_TO_HORIZON))
 		return false;
 
 	/* Add offset: it might be going to go into *next* block */

diff --git a/detached_block.c b/detached_block.c
@@ -1,5 +1,6 @@
 #include "block.h"
 #include "detached_block.h"
+#include "jsonrpc.h"
 #include "protocol_net.h"
 #include "recv_block.h"
 #include "state.h"
@@ -64,3 +65,30 @@ void add_detached_block(struct state *state,
 	bd->pkt_ctx = tal_steal(bd, pkt_ctx);
 	list_add(&state->detached_blocks, &bd->list);
 }
+
+static char *json_detachedblocks(struct json_connection *jcon,
+				 const jsmntok_t *params,
+				 struct json_result *response)
+{
+	struct detached_block *bd;
+
+	json_array_start(response, NULL);
+	list_for_each(&jcon->state->detached_blocks, bd, list) {
+		json_object_start(response, NULL);
+		json_add_num(response, "height",
+			     le32_to_cpu(bd->bi.hdr->height));
+		json_add_double_sha(response, "sha", &bd->sha.sha);
+		json_add_double_sha(response, "prev",
+				    &block_prev(&bd->bi, 0)->sha);
+		json_object_end(response);
+	}
+	json_array_end(response);
+	return NULL;
+}
+
+const struct json_command detachedblocks_command = {
+	"dev-detachedblocks",
+	json_detachedblocks,
+	"Get all detached blocks",
+	"Returns height, sha and prev for each detached block"
+};
diff --git a/generating.c b/generating.c
@@ -247,7 +247,6 @@ static void exec_generator(struct generator *gen)
 	char nonce[14 + 1];
 	int i;
 	const struct block *last;
-	char log_prefix[40];
 
 	/* FIXME: This is where we increment shard_order if voted! */
 	gen->shard_order = gen->state->longest_knowns[0]->bi.hdr->shard_order;
@@ -295,9 +294,8 @@ static void exec_generator(struct generator *gen)
 		exit(127);
 	}
 
-	sprintf(log_prefix, "Generator %u:", gen->pid);
-	gen->log = new_log(gen, gen->state->log,
-			   log_prefix, gen->state->log_level, GEN_LOG_MAX);
+	gen->log = new_log(gen, gen->state->lr, "%sGenerator %u:",
+			   log_prefix(gen->state->log), gen->pid);
 	log_debug(gen->log, "Running '%s' '%s' '%s' '%s' %s' '%s' '%s' '%s'",
 		  gen->state->generator,
 		  fees_to,

diff --git a/getinfo.c b/getinfo.c
@@ -4,7 +4,7 @@
 #include "state.h"
 #include "todo.h"
 
-static void json_add_block(char **response, const char *fieldname,
+static void json_add_block(struct json_result *response, const char *fieldname,
 			   const struct block *block)
 {
 	json_object_start(response, fieldname);
@@ -16,7 +16,7 @@ static void json_add_block(char **response, const char *fieldname,
 
 static char *json_getinfo(struct json_connection *jcon,
 			  const jsmntok_t *params,
-			  char **response)
+			  struct json_result *response)
 {
 	size_t i, num_todo, num_peer_todo, num_peers;
 	struct todo_request *todo;

diff --git a/getpeerinfo.c b/getpeerinfo.c
@@ -27,7 +27,7 @@
 
 static char *json_getpeerinfo(struct json_connection *jcon,
 			      const jsmntok_t *params,
-			      char **response)
+			      struct json_result *response)
 {
 	struct peer *peer;
 	struct state *state = jcon->state;

diff --git a/gettransaction.c b/gettransaction.c
@@ -9,7 +9,7 @@
 
 static char *json_gettransaction(struct json_connection *jcon,
 				 const jsmntok_t *params,
-				 char **response)
+				 struct json_result *response)
 {
 	struct protocol_tx_id txhash;
 	const jsmntok_t *txid;

diff --git a/horizon.c b/horizon.c
@@ -0,0 +1,17 @@
+#include "block_info.h"
+#include "horizon.h"
+#include "state.h"
+#include "timestamp.h"
+
+/* When do transactions in this block expire? */
+u32 block_expiry(struct state *state, const struct block_info *bi)
+{
+	return block_timestamp(bi)
+		+ PROTOCOL_TX_HORIZON_SECS(state->test_net);
+}
+
+bool block_expired_by(u32 expires, u32 now)
+{
+	/* We allow line-balls: ie. if exactly on horizon, it's *not* expired. */
+	return expires < now;
+}
diff --git a/horizon.h b/horizon.h
@@ -0,0 +1,16 @@
+#ifndef PETTYCOIN_HORIZON_H
+#define PETTYCOIN_HORIZON_H
+#include "config.h"
+#include <ccan/short_types/short_types.h>
+#include <stdbool.h>
+
+struct state;
+struct block_info;
+
+/* When do transactions in this block expire? */
+u32 block_expiry(struct state *state, const struct block_info *bi);
+
+/* Has this expiry time mean it's expired? */
+bool block_expired_by(u32 expires, u32 now);
+
+#endif /* PETTYCOIN_HORIZON_H */
diff --git a/input_refs.c b/input_refs.c
@@ -1,5 +1,6 @@
 #include "block_shard.h"
 #include "chain.h"
+#include "horizon.h"
 #include "input_refs.h"
 #include "shard.h"
 #include "tx.h"
@@ -15,8 +16,8 @@ static enum protocol_ecode check_ref(struct state *state,
 		return PROTOCOL_ECODE_REF_BAD_BLOCKS_AGO;
 
 	/* Beyond horizon? */
-	if (block_timestamp(&b->bi) + PROTOCOL_TX_HORIZON_SECS(state->test_net)
-	    < block_timestamp(&block->bi))
+	if (block_expired_by(block_expiry(state, &b->bi),
+			     block_timestamp(&block->bi)))
 		return PROTOCOL_ECODE_REF_BAD_BLOCKS_AGO;
 
 	if (le16_to_cpu(ref->shard) >= block_num_shards(&b->bi))