pending: report already-known TXs so we don't infinitely rebroadcast.

rustyrussell · rustyrussell · commit 9b73e8a417c8 · 2014-08-05T10:56:45.000+09:30
Signed-off-by: Rusty Russell &lt;rusty@rustcorp.com.au&gt;
diff --git a/peer.c b/peer.c
@@ -668,7 +668,7 @@ recv_tx(struct peer *peer, const struct protocol_pkt_tx *pkt)
 	unsigned int bad_input_num;
 	struct txhash_iter it;
 	struct txhash_elem *te;
-	bool old;
+	bool old, already_known;
 
 	log_debug(peer->log, "Received PKT_TX");
 
@@ -701,8 +701,15 @@ recv_tx(struct peer *peer, const struct protocol_pkt_tx *pkt)
 	todo_done_get_tx(peer, &sha, true);
 
 	/* If inputs are malformed, it might not have known so don't hang up. */
-	switch (add_pending_tx(peer->state, tx, &sha, &bad_input_num, &old)) {
+	switch (add_pending_tx(peer->state, tx, &sha, &bad_input_num, &old,
+			       &already_known)) {
 	case ECODE_INPUT_OK:
+		if (already_known) {
+			log_info(peer->log, "gave us duplicate TX ");
+			log_add_struct(peer->log, struct protocol_double_sha,
+				       &sha);
+			return PROTOCOL_ECODE_NONE;
+		}
 		break;
 	case ECODE_INPUT_UNKNOWN:
 		/* We don't resolve inputs which are still pending, so
diff --git a/pending.c b/pending.c
@@ -207,7 +207,7 @@ void recheck_pending_txs(struct state *state)
 		struct protocol_double_sha sha;
 
 		hash_tx(txs[i], &sha);
-		add_pending_tx(state, txs[i], &sha, &bad_input_num, NULL);
+		add_pending_tx(state, txs[i], &sha, &bad_input_num, NULL, NULL);
 	}
 
 	/* Just to print the debug! */		
@@ -249,18 +249,28 @@ enum input_ecode add_pending_tx(struct state *state,
 				const union protocol_tx *tx,
 				const struct protocol_double_sha *sha,
 				unsigned int *bad_input_num,
-				bool *too_old)
+				bool *too_old,
+				bool *already_known)
 {
 	enum input_ecode ierr;
 
 	/* If it's already in longest known chain, would look like
 	 * doublespend so sort that out now. */
-	if (txhash_gettx_ancestor(state, sha, state->longest_knowns[0]))
+	if (txhash_gettx_ancestor(state, sha, state->longest_knowns[0])) {
+		if (already_known)
+			*already_known = true;
 		return ECODE_INPUT_OK;
+	}
 
 	/* If we already have it in pending, don't re-add. */
-	if (txhash_get_pending_tx(state, sha))
+	if (txhash_get_pending_tx(state, sha)) {
+		if (already_known)
+			*already_known = true;
 		return ECODE_INPUT_OK;
+	}
+
+	if (already_known)
+		*already_known = false;
 
 	/* We check inputs for where *we* would mine it.
 	 * We currently don't allow two dependent txs in the same block,
diff --git a/pending.h b/pending.h
@@ -49,7 +49,7 @@ enum input_ecode add_pending_tx(struct state *state,
 				const union protocol_tx *tx,
 				const struct protocol_double_sha *sha,
 				unsigned int *bad_input_num,
-				bool *too_old);
+				bool *too_old, bool *already_known);
 
 /* Get a new working block. */
 struct pending_block *new_pending_block(struct state *state);
diff --git a/sendrawtransaction.c b/sendrawtransaction.c
@@ -54,7 +54,7 @@ static char *json_sendrawtransaction(struct json_connection *jcon,
 	struct protocol_double_sha sha;
 	enum protocol_ecode e;
 	unsigned int bad_input_num;
-	bool old;
+	bool old, already_known;
 
 	json_get_params(jcon->buffer, params, "tx", &tok, NULL);
 	if (!tok)
@@ -78,8 +78,11 @@ static char *json_sendrawtransaction(struct json_connection *jcon,
 	json_object_start(response, NULL);
 	json_add_double_sha(response, "tx", &sha);
 
-	switch (add_pending_tx(jcon->state, tx, &sha, &bad_input_num, &old)) {
+	switch (add_pending_tx(jcon->state, tx, &sha, &bad_input_num, &old,
+			       &already_known)) {
 	case ECODE_INPUT_OK:
+		if (already_known)
+			return tal_fmt(jcon, "Transaction already known");
 		break;
 	case ECODE_INPUT_UNKNOWN:
 		/* Ask about this input. */
