aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-21 08:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

daemon: store revocation hashes in the peer_visible_state structure.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-01-22 06:44:24 +10:30
parent abc002ff15
commit 12b9d39b76
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/packets.c
View File

@@ -42,12 +42,10 @@ static Pkt *make_pkt(const tal_t *ctx, Pkt__PktCase type, const void *msg)
Pkt *pkt_open(const tal_t *ctx, const struct peer *peer, Pkt *pkt_open(const tal_t *ctx, const struct peer *peer,
OpenChannel__AnchorOffer anchor) OpenChannel__AnchorOffer anchor)
{ {
struct sha256 revocation_hash;
OpenChannel *o = tal(ctx, OpenChannel); OpenChannel *o = tal(ctx, OpenChannel);
open_channel__init(o); open_channel__init(o);
peer_get_revocation_hash(peer, 0, &revocation_hash); o->revocation_hash = sha256_to_proto(ctx, &peer->us.revocation_hash);
o->revocation_hash = sha256_to_proto(ctx, &revocation_hash);
o->commit_key = pubkey_to_proto(o, &peer->us.commitkey); o->commit_key = pubkey_to_proto(o, &peer->us.commitkey);
o->final_key = pubkey_to_proto(o, &peer->us.finalkey); o->final_key = pubkey_to_proto(o, &peer->us.finalkey);
o->delay = tal(o, Locktime); o->delay = tal(o, Locktime);
@@ -184,7 +182,7 @@ Pkt *accept_pkt_open(const tal_t *ctx,
if (!proto_to_pubkey(peer->dstate->secpctx, if (!proto_to_pubkey(peer->dstate->secpctx,
o->final_key, &peer->them.finalkey)) o->final_key, &peer->them.finalkey))
return pkt_err(ctx, "Bad finalkey"); return pkt_err(ctx, "Bad finalkey");
proto_to_sha256(o->revocation_hash, &peer->their_rhash); proto_to_sha256(o->revocation_hash, &peer->them.revocation_hash);
return NULL; return NULL;
} }

5
daemon/peer.h
View File

@@ -20,6 +20,8 @@ struct peer_visible_state {
unsigned int mindepth; unsigned int mindepth;
/* Commitment fee they're offering (satoshi). */ /* Commitment fee they're offering (satoshi). */
u64 commit_fee; u64 commit_fee;
/* Revocation hash for latest commit tx. */
struct sha256 revocation_hash;
}; };
struct peer { struct peer {
@@ -58,9 +60,6 @@ struct peer {
/* Stuff we have in common. */ /* Stuff we have in common. */
struct peer_visible_state us, them; struct peer_visible_state us, them;
/* Their last revocation hash. */
struct sha256 their_rhash;
}; };
void setup_listeners(struct lightningd_state *dstate, unsigned int portnum); void setup_listeners(struct lightningd_state *dstate, unsigned int portnum);