92ec2f874b
pkt: add pkt_totlen() helper.
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-12 13:06:33 +09:30
77387bb370
test-cli/create-commit-spend-tx: don't endian convert script_len.
...
That's done in mashalling and hashing code.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-12 13:06:33 +09:30
6389dbd455
protocol: restore locktime in blocks option.
...
This could be used by an always-on node to agressively shorten their timeouts.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-12 13:06:33 +09:30
a0b621689e
TAGS: Improve support.
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-12 12:44:45 +09:30
9f12b72476
Don't include mutual redemption in recovable commit tx output.
...
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>
2015-06-12 12:41:30 +09:30
ef9463f6b1
Sort include lines (ignoring hacky cli test utils).
...
Put ccan first, openssl next, then standard headers, then locals.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-12 12:41:28 +09:30
4e8eda47a1
Move hacky command line utils out to test-cli subdir.
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-12 12:35:42 +09:30
5776c7a9d8
Update .gitignore
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-12 12:35:42 +09:30
442f321585
Move protobuf<->bitcoin converters out of bitcoin/
...
They're lightning-specific.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-12 12:35:42 +09:30
612d713470
Move bitcoin stuff into bitcoin subdir.
...
It's not very interesting if you're looking for LN code.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-12 12:35:42 +09:30
28ea518182
create-steal-tx: use o1 to double-check final key is correct.
...
It's actually an unused parameter, but they symmetry with others in nice.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-12 12:35:41 +09:30
2d714f5ad4
create-commit-tx: create a commit tx.
...
Required for unilateral close. Also lets us test stealing funds
from a revoked transaction.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-12 12:35:26 +09:30
96585e1b00
create-steal-tx: fix it.
...
Couldn't be tested until we could generate updates; fixed now.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-10 21:39:55 +09:30
975a5b2041
scriptsig_p2sh_2of2: fix sig order.
...
Must match key order, which we permute.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-10 21:39:55 +09:30
ed3f0115d6
protocol: fix horribly thinko, keep own secrets.
...
I had each side using the other side's hash secret. That's a very
dumb idea, since it means you can steal from a unilateral close!
A's secret applies to A's commit transaction: it needs the
secret and B's final signature to steal funds, and that should
never happen (since A doesn't have the B's final signature, and
once A has given B the secret, they never broadcast the commit tx).
This makes the update a 4 step dance, since you need the new
revocation hash to make the other side's TX to sign.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-10 21:39:45 +09:30
9caf2c71e8
close-channel / create-close-tx: take into account updates.
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-09 14:29:04 +09:30
a4517f27c7
Fix
2015-06-09 14:13:27 +09:30
3fef1584e5
update-channel-complete: final step in channel update.
...
(note: I didn't bother writing the code to check the sig on this).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-09 14:13:27 +09:30
2bd967af35
update-channel-accept: check their signature is valid.
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-09 14:13:27 +09:30
3957f1e1c1
update-channel-accept: accept the channel update.
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-09 14:13:27 +09:30
d51f6372aa
update-channel: prepare a new tx with modified amounts.
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-09 14:13:27 +09:30
ecb39efed1
find_p2sh_out: extract helper.
...
Really only for our silly little utils.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-09 14:13:21 +09:30
7175d73573
create-close-tx: create a mutual close tx from the close sigs.
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-08 15:08:10 +09:30
c6ed5926cb
close-channel: add --complete option.
...
Code is identical, so don't create separate close-channel-complete binary.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-08 14:54:02 +09:30
38f7a23064
close-channel: create message to mutually close channel.
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-08 14:46:41 +09:30
16baa1dae9
create-commit-spend-tx: spend the commit tx (after timeout)
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-08 09:29:09 +09:30
114b7afbe2
bitcoin_script: fix bug in complex anchor redeem script.
...
We need to pop off the stack after OP_CHECKSEQUENCEVERIFY.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-08 09:26:14 +09:30
3a4d8cd282
bitcoin_script: use OP_NOP dummy for now, as bitcoind rejects OP_NOP3
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-08 09:24:54 +09:30
3c7e11fd65
bitcoin_script: DER correctly when we have leading zeroes.
...
Happens one in 128 times, I guess...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-08 09:21:38 +09:30
a25ba452f3
permute_tx: fix horrible thinko.
...
Map needs to be inverted, otherwise non-trivial shuffles get confused.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-08 08:29:53 +09:30
4dd6b8e385
lightning.proto: Rename 'to_me' to 'final', use for commit_tx.
...
This is where the commit tx outputs should pay to.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-08 06:29:15 +09:30
baf5d11643
getinput.sh: Switch to -regtest
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-08 06:28:09 +09:30
9ed6968fe5
add_varint: encode correctly (LE)
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-07 15:33:24 +09:30
0203d51ec0
pull_varint: fix.
...
Adapted badly from pettycoin.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-07 15:32:34 +09:30
fc8552318a
opt_bits: parsing routines for 'bits' == 100 satoshi.
...
Also fix open-channel usage message.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-07 13:52:04 +09:30
126192a842
create-steal-tx: get my money back!
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-05 17:22:54 +09:30
904ef32459
bitcoin_tx: handle \n at end of file for tx.
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-05 17:13:26 +09:30
ca18eeeaa7
open-channel: fix revocation hash.
...
Revocation hash is SHA256 of output of generator. Sometimes
that is the same as the next revocation hash (on even counts), but
not otherwise.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-05 17:13:26 +09:30
6c62e20701
Note that we should check their locktime, minconfirms etc.
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-05 17:13:26 +09:30
6048a15db9
bitcoin_tx: bitcoin_txid_from_hex helper.
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-05 17:13:26 +09:30
e1532ce044
bitcoin_script: get rid of scriptpubkey_pay_to_pubkeyhash.
...
We no longer generate any pay-to-pubkeys.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-05 17:13:26 +09:30
d30c470c7d
anchor: change is not an arbitrary output, but a pubkey we p2sh to.
...
Gets rid of the last pubkey user; they're generally deprecated.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-05 17:13:26 +09:30
29d0cdc3cd
open-channel: use pubkey, not arbitrary script for final outout address.
...
We need to pay to this from two places: on their side, it's a simple
payment, on our side, it's a complex timeout-or-mutual-or-hval script,
which doesn't lend itself to arbitrary scripts.
Use P2SH, of course.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-05 11:37:27 +09:30
0742e5356f
get-anchor-depth: simple helper to get min_confirms from OpenChannel packet
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-05 11:09:29 +09:30
33bbd38691
Makefile: cleanup and generalize
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-05 11:05:05 +09:30
a6b08dc393
protocol: add revocation hash to update_accept for other commit tx.
...
And clarify that we're going to be closing the anchor tx directly.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-05 11:04:04 +09:30
f7f7f3f1bb
check-anchor-scriptsigs: don't require txs.
...
It's convenient to double-check that commit txs spend anchor, but it's
misleading since we wouldn't have access to the other side's tx, and
in practice we wouldn't even sign ours until we need it.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-05 11:03:57 +09:30
8516798645
signature: fix signatures for p2sh inputs.
...
The subscript in this case is the redeemscript, not the input script.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-04 21:06:42 +09:30
cbad9a1fa5
bitcoin_script: remember to push extra 0 for OP_CHECKMULTISIG.
...
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-04 21:04:50 +09:30
769d2fd722
bitcoin_script: fix out-by-one error in multisig.
...
Was using 3 instead of 2. OP_LITERAL() was a bad idea anyway,
as it would only handle numbers up to 16 (and we use 32).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2015-06-04 16:20:36 +09:30
Rusty Russell