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

Don't include mutual redemption in recovable commit tx output.

Browse Source 
It's not clear it's needed, and without it there's a good reason to
delay dumping to the blockchain if a node becomes unreachable (since
you'll get your money faster if it comes back online).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2015-06-12 12:33:32 +09:30
parent ef9463f6b1
commit 9f12b72476
1 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
bitcoin/script.c
View File

@@ -338,7 +338,6 @@ bool is_p2sh(const u8 *script, size_t script_len)
} }
/* One of: /* One of:
* mysig and theirsig, OR
* mysig and relative locktime passed, OR * mysig and relative locktime passed, OR
* theirsig and hash preimage. */ * theirsig and hash preimage. */
u8 *bitcoin_redeem_revocable(const tal_t *ctx, u8 *bitcoin_redeem_revocable(const tal_t *ctx,
@@ -356,12 +355,6 @@ u8 *bitcoin_redeem_revocable(const tal_t *ctx,
add_op(&script, OP_1SUB); add_op(&script, OP_1SUB);
add_op(&script, OP_IF); add_op(&script, OP_IF);
/* If the top arg is a hashpreimage. */
add_op(&script, OP_SIZE);
add_number(&script, 32);
add_op(&script, OP_EQUAL);
add_op(&script, OP_IF);
/* Must hash to revocation_hash, and be signed by them. */ /* Must hash to revocation_hash, and be signed by them. */
RIPEMD160(rhash->u.u8, sizeof(rhash->u), rhash_ripemd); RIPEMD160(rhash->u.u8, sizeof(rhash->u), rhash_ripemd);
add_op(&script, OP_HASH160); add_op(&script, OP_HASH160);
@@ -370,30 +363,9 @@ u8 *bitcoin_redeem_revocable(const tal_t *ctx,
add_push_key(&script, theirkey); add_push_key(&script, theirkey);
add_op(&script, OP_CHECKSIG); add_op(&script, OP_CHECKSIG);
/* Otherwise, it should be both our sigs. */
/* FIXME: Perhaps this is a bad idea? We don't need it to
* close, and without this we force the blockchain to commit
* to the timeout: that may make a flood of transactions due
* to hub collapse less likely (as some optimists hope hub
* will return). */
add_op(&script, OP_ELSE);
add_number(&script, 2);
/* This obscures whose key is whose. Probably unnecessary? */
if (key_less(mykey, theirkey)) {
add_push_key(&script, mykey);
add_push_key(&script, theirkey);
} else {
add_push_key(&script, theirkey);
add_push_key(&script, mykey);
}
add_number(&script, 2);
add_op(&script, OP_CHECKMULTISIG);
add_op(&script, OP_ENDIF);
/* Not two args? Must be us using timeout. */ /* Not two args? Must be us using timeout. */
add_op(&script, OP_ELSE); add_op(&script, OP_ELSE);
add_push_bytes(&script, &locktime_le, sizeof(locktime_le)); add_push_bytes(&script, &locktime_le, sizeof(locktime_le));
add_op(&script, OP_CHECKSEQUENCEVERIFY); add_op(&script, OP_CHECKSEQUENCEVERIFY);
add_op(&script, OP_DROP); add_op(&script, OP_DROP);