protocol: switch to single-funder anchor model.

Most complex change was gather_updates(), which handles all the "what is the current state of the channel" logic for our dumb test utils. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2026-02-23 06:54:30 +01:00 · 2015-07-29 16:14:28 +09:30
parent 2255cb749d
commit eac3af06f1
35 changed files with 1078 additions and 1608 deletions
--- a/test-cli/gather_updates.c
+++ b/test-cli/gather_updates.c
@@ -0,0 +1,149 @@
+#include <ccan/err/err.h>
+#include <ccan/crypto/sha256/sha256.h>
+#include <ccan/structeq/structeq.h>
+#include "test-cli/gather_updates.h"
+#include "funding.h"
+#include "pkt.h"
+#include "protobuf_convert.h"
+
+static void check_preimage(const Sha256Hash *preimage,
+			   const struct sha256 *old,
+			   const struct sha256 *h,
+			   const char *file)
+{
+	struct sha256 sha;
+
+	if (!h)
+		return;
+
+	proto_to_sha256(preimage, &sha);
+	sha256(&sha, &sha, sizeof(sha));
+	if (!structeq(&sha, old))
+		errx(1, "Invalid preimage in %s!", file);
+}
+
+static void get_rhash(const Sha256Hash *rhash, struct sha256 *old,
+		      struct sha256 *new)
+{
+	if (new) {
+		*old = *new;
+		proto_to_sha256(rhash, new);
+	}
+}
+
+/* Takes complete update history, gets summary of last state. */
+uint64_t gather_updates(const OpenChannel *o1, const OpenChannel *o2,
+			const OpenAnchor *oa,
+			char **argv,
+			uint64_t *our_amount, uint64_t *their_amount,
+			struct sha256 *our_rhash,
+			struct sha256 *their_rhash,
+			struct signature *their_commit_sig)
+{
+	uint64_t cdelta = 0;
+	uint64_t num_updates = 0;
+	Signature *sig = NULL;
+	struct sha256 old_our_rhash, old_their_rhash;
+	
+	/* Start sanity check. */
+	if (!initial_funding(o1, o2, oa, our_amount, their_amount))
+		errx(1, "Invalid open combination (need 1 anchor offer)");
+
+	if (our_rhash)
+		proto_to_sha256(o1->revocation_hash, our_rhash);
+
+	if (their_rhash)
+		proto_to_sha256(o2->revocation_hash, their_rhash);
+
+	/* If o2 sent anchor, it contains their commit sig. */
+	if (o2->anch == OPEN_CHANNEL__ANCHOR_OFFER__WILL_CREATE_ANCHOR)
+		sig = oa->commit_sig;
+
+	while (*argv) {
+		int64_t delta;
+		bool received;
+		Pkt *pkt;
+
+		/* + marks messages sent by us, - for messages from them */
+		if (strstarts(*argv, "+")) {
+			received = false;
+		} else if (strstarts(*argv, "-")) {
+			received = true;
+		} else
+			errx(1, "%s does not start with +/-", *argv);
+
+		pkt = any_pkt_from_file(*argv + 1);
+		switch (pkt->pkt_case) {
+		case PKT__PKT_OPEN_COMMIT_SIG:
+			if (received)
+				sig = pkt->open_commit_sig->sig;
+			break;
+		case PKT__PKT_UPDATE: {
+			if (received) {
+				delta = -pkt->update->delta;
+				get_rhash(pkt->update->revocation_hash,
+					  &old_their_rhash, their_rhash);
+			} else {
+				delta = pkt->update->delta;
+				get_rhash(pkt->update->revocation_hash,
+					  &old_our_rhash, our_rhash);
+			}
+			if (!funding_delta(o1, o2, oa, &cdelta, delta,
+					   our_amount, their_amount))
+				errx(1, "Impossible funding update %lli %s",
+				     (long long)delta, *argv);
+			num_updates++;
+			break;
+		}
+		case PKT__PKT_UPDATE_ACCEPT:
+			if (received) {
+				sig = pkt->update_accept->sig;
+				get_rhash(pkt->update_accept->revocation_hash,
+					  &old_their_rhash, their_rhash);
+			} else {
+				get_rhash(pkt->update_accept->revocation_hash,
+					  &old_our_rhash, our_rhash);
+			}
+			break;
+		case PKT__PKT_UPDATE_SIGNATURE:
+			if (received) {
+				sig = pkt->update_signature->sig;
+				check_preimage(pkt->update_signature
+					       ->revocation_preimage,
+					       &old_their_rhash, their_rhash,
+					       *argv);
+			} else {
+				check_preimage(pkt->update_signature
+					       ->revocation_preimage,
+					       &old_our_rhash, our_rhash,
+					       *argv);
+			}
+			break;
+		case PKT__PKT_UPDATE_COMPLETE:
+			if (received) {
+				check_preimage(pkt->update_complete
+					       ->revocation_preimage,
+					       &old_their_rhash, their_rhash,
+					       *argv);
+			} else {
+				check_preimage(pkt->update_complete
+					       ->revocation_preimage,
+					       &old_our_rhash, our_rhash,
+					       *argv);
+			}
+			break;
+		default:
+			errx(1, "Unexpected packet type %u", pkt->pkt_case);
+		}
+		argv++;
+	}
+
+	if (their_commit_sig) {
+		if (!sig)
+			errx(1, "No commit signature message found");
+		if (!proto_to_signature(sig, their_commit_sig))
+			errx(1, "Invalid signature");
+	}
+
+	return num_updates;
+}