aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 15:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

script: encode numbers minimally.

Browse Source 
This happens for CSV, for example (3-byte encoding), and bitcoind treats
too-long encodings as non-standard.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-01-22 06:38:08 +10:30
parent 0ef2b9a32e
commit 4e23f9916d
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
bitcoin/script.c
View File

@@ -85,10 +85,16 @@ static void add_number(u8 **script, u32 num)
else if (num <= 16) else if (num <= 16)
add_op(script, 0x50 + num); add_op(script, 0x50 + num);
else { else {
u8 n = num; le32 n = cpu_to_le32(num);
/* We could handle others, but currently unnecessary. */
assert(num < 256); if (num <= 0x000000FF)
add_push_bytes(script, &n, sizeof(n)); add_push_bytes(script, &n, 1);
else if (num <= 0x0000FFFF)
add_push_bytes(script, &n, 2);
else if (num <= 0x00FFFFFF)
add_push_bytes(script, &n, 3);
else
add_push_bytes(script, &n, 4);
} }
} }
@@ -115,14 +121,6 @@ static void add_push_sig(u8 **scriptp, const struct bitcoin_signature *sig)
#endif #endif
} }
/* FIXME: Is this really required, not a simple add_number? */
static void add_push_le32(u8 **scriptp, u32 val)
{
le32 val_le = cpu_to_le32(val);
add_push_bytes(scriptp, &val_le, sizeof(val_le));
}
/* FIXME: permute? */ /* FIXME: permute? */
/* Is a < b? (If equal we don't care) */ /* Is a < b? (If equal we don't care) */
static bool key_less(const struct pubkey *a, const struct pubkey *b) static bool key_less(const struct pubkey *a, const struct pubkey *b)
@@ -212,9 +210,9 @@ u8 *scriptpubkey_htlc_send(const tal_t *ctx,
add_op(&script, OP_ELSE); add_op(&script, OP_ELSE);
/* If HTLC times out, they can collect after a delay. */ /* If HTLC times out, they can collect after a delay. */
add_push_le32(&script, htlc_abstimeout); add_number(&script, htlc_abstimeout);
add_op(&script, OP_CHECKLOCKTIMEVERIFY); add_op(&script, OP_CHECKLOCKTIMEVERIFY);
add_push_le32(&script, locktime); add_number(&script, locktime);
add_op(&script, OP_CHECKSEQUENCEVERIFY); add_op(&script, OP_CHECKSEQUENCEVERIFY);
add_op(&script, OP_2DROP); add_op(&script, OP_2DROP);
add_push_key(&script, ourkey); add_push_key(&script, ourkey);
@@ -249,7 +247,7 @@ u8 *scriptpubkey_htlc_recv(const tal_t *ctx,
add_op(&script, OP_EQUAL); add_op(&script, OP_EQUAL);
add_op(&script, OP_IF); add_op(&script, OP_IF);
add_push_le32(&script, locktime); add_number(&script, locktime);
add_op(&script, OP_CHECKSEQUENCEVERIFY); add_op(&script, OP_CHECKSEQUENCEVERIFY);
/* Drop extra hash as well as locktime. */ /* Drop extra hash as well as locktime. */
add_op(&script, OP_2DROP); add_op(&script, OP_2DROP);
@@ -266,7 +264,7 @@ u8 *scriptpubkey_htlc_recv(const tal_t *ctx,
add_op(&script, OP_NOTIF); add_op(&script, OP_NOTIF);
/* Otherwise, they must wait for HTLC timeout. */ /* Otherwise, they must wait for HTLC timeout. */
add_push_le32(&script, htlc_abstimeout); add_number(&script, htlc_abstimeout);
add_op(&script, OP_CHECKLOCKTIMEVERIFY); add_op(&script, OP_CHECKLOCKTIMEVERIFY);
add_op(&script, OP_DROP); add_op(&script, OP_DROP);
add_op(&script, OP_ENDIF); add_op(&script, OP_ENDIF);
@@ -384,7 +382,7 @@ u8 *bitcoin_redeem_secret_or_delay(const tal_t *ctx,
add_op(&script, OP_ELSE); add_op(&script, OP_ELSE);
/* Other can collect after a delay. */ /* Other can collect after a delay. */
add_push_le32(&script, locktime); add_number(&script, locktime);
add_op(&script, OP_CHECKSEQUENCEVERIFY); add_op(&script, OP_CHECKSEQUENCEVERIFY);
add_op(&script, OP_DROP); add_op(&script, OP_DROP);
add_push_key(&script, delayed_key); add_push_key(&script, delayed_key);