lukechilds
/
lightning
mirror of https://github.com/lukechilds/lightning.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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>
ppa-0.6.1
Rusty Russell 10 years ago
parent
0742e5356f
commit
29d0cdc3cd
7 changed files with 35 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      commit_tx.c
  2. 10
      lightning.pb-c.c
  3. 4
      lightning.pb-c.h
  4. 2
      lightning.proto
  5. 27
      open-channel.c
  6. 7
      pkt.c
  7. 6
      pkt.h

14
commit_tx.c
View File

@ -14,7 +14,7 @@ struct bitcoin_tx *create_commit_tx(const tal_t *ctx,
{ {
struct bitcoin_tx *tx; struct bitcoin_tx *tx;
const u8 *redeemscript; const u8 *redeemscript;
struct pubkey ourkey, theirkey; struct pubkey ourkey, theirkey, to_me;
struct sha256 redeem; struct sha256 redeem;
/* Now create commitment tx: one input, two outputs. */ /* Now create commitment tx: one input, two outputs. */
@ -42,10 +42,14 @@ struct bitcoin_tx *create_commit_tx(const tal_t *ctx,
return tal_free(tx); return tal_free(tx);
tx->output[0].amount = ours->anchor->total - ours->commitment_fee; tx->output[0].amount = ours->anchor->total - ours->commitment_fee;
/* Second output is a simple payment to them. */ /* Second output is a P2SH payment to them. */
tx->output[1].script = theirs->script_to_me.data; if (!proto_to_pubkey(theirs->to_me, &to_me))
tx->output[1].script_length = theirs->script_to_me.len; return tal_free(tx);
tx->output[1].script = scriptpubkey_p2sh(ctx,
bitcoin_redeem_single(ctx,
&to_me));
tx->output[1].script_length = tal_count(tx->output[1].script);
if (theirs->anchor->total < theirs->commitment_fee) if (theirs->anchor->total < theirs->commitment_fee)
return tal_free(tx); return tal_free(tx);
tx->output[1].amount = theirs->anchor->total - theirs->commitment_fee; tx->output[1].amount = theirs->anchor->total - theirs->commitment_fee;

10
lightning.pb-c.c
View File

@ -1513,13 +1513,13 @@ static const ProtobufCFieldDescriptor open_channel__field_descriptors[7] =
0,NULL,NULL /* reserved1,reserved2, etc */ 0,NULL,NULL /* reserved1,reserved2, etc */
}, },
{ {
"script_to_me", "to_me",
5, 5,
PROTOBUF_C_LABEL_REQUIRED, PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_BYTES, PROTOBUF_C_TYPE_MESSAGE,
0, /* quantifier_offset */ 0, /* quantifier_offset */
offsetof(OpenChannel, script_to_me), offsetof(OpenChannel, to_me),
NULL, &bitcoin_pubkey__descriptor,
NULL, NULL,
0, /* flags */ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */ 0,NULL,NULL /* reserved1,reserved2, etc */
@ -1566,8 +1566,8 @@ static const unsigned open_channel__field_indices_by_name[] = {
4, /* field[4] = commitment_fee */ 4, /* field[4] = commitment_fee */
1, /* field[1] = locktime_seconds */ 1, /* field[1] = locktime_seconds */
2, /* field[2] = revocation_hash */ 2, /* field[2] = revocation_hash */
3, /* field[3] = script_to_me */
0, /* field[0] = seed */ 0, /* field[0] = seed */
3, /* field[3] = to_me */
6, /* field[6] = tx_version */ 6, /* field[6] = tx_version */
}; };
static const ProtobufCIntRange open_channel__number_ranges[2 + 1] = static const ProtobufCIntRange open_channel__number_ranges[2 + 1] =

4
lightning.pb-c.h
View File

@ -194,7 +194,7 @@ struct _OpenChannel
/* /*
* How to pay money to us from commit_tx. * How to pay money to us from commit_tx.
*/ */
ProtobufCBinaryData script_to_me; BitcoinPubkey *to_me;
/* /*
* How much transaction fee we'll pay for commitment txs. * How much transaction fee we'll pay for commitment txs.
*/ */
@ -210,7 +210,7 @@ struct _OpenChannel
}; };
#define OPEN_CHANNEL__INIT \ #define OPEN_CHANNEL__INIT \
{ PROTOBUF_C_MESSAGE_INIT (&open_channel__descriptor) \ { PROTOBUF_C_MESSAGE_INIT (&open_channel__descriptor) \
, 0, 0, NULL, {0,NULL}, 0, NULL, 0 } , 0, 0, NULL, NULL, 0, NULL, 0 }
/* /*

2
lightning.proto
View File

@ -77,7 +77,7 @@ message open_channel {
// Hash seed for revoking commitment transactions. // Hash seed for revoking commitment transactions.
required sha256_hash revocation_hash = 4; required sha256_hash revocation_hash = 4;
// How to pay money to us from commit_tx. // How to pay money to us from commit_tx.
required bytes script_to_me = 5; required bitcoin_pubkey to_me = 5;
// How much transaction fee we'll pay for commitment txs. // How much transaction fee we'll pay for commitment txs.
required uint64 commitment_fee = 6; required uint64 commitment_fee = 6;
// The anchor transaction details. // The anchor transaction details.

27
open-channel.c
View File

@ -1,6 +1,6 @@
/* My example: /* My example:
* ./open-channel 00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff 50000000000 mzqiPPbjTdcgM6NpNWJLHFt29tWD69bciE cUBCjrdJu8tfvM7FT8So6aqs6G6bZS1Cax6Rc9rFzYL6nYG4XNEC mi1BzT4tCB7K4kZH3yK1hM517bXH4pNmEH 08ffaf638849198f9c8f04aa75d225a5a104d5e7c540770ca55ad08b9a32d10c/1/100000000000/76a9148d2d939aa2aff2d341cde3e61a89bf9c2c21d12388ac > A-open.pb * ./open-channel 00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff 50000000000 mzqiPPbjTdcgM6NpNWJLHFt29tWD69bciE cUBCjrdJu8tfvM7FT8So6aqs6G6bZS1Cax6Rc9rFzYL6nYG4XNEC cTuY5gncxDymqe9dfF7R8QFdAsxMZxdViRMjs8Dj7xJJRsQcmPCt 08ffaf638849198f9c8f04aa75d225a5a104d5e7c540770ca55ad08b9a32d10c/1/100000000000/76a9148d2d939aa2aff2d341cde3e61a89bf9c2c21d12388ac > A-open.pb
* ./open-channel 112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00 9795000 mpDyc5kPAJZB7Zz9iW9acq3Jk8yiTJ7HKj cQXhbUnNRsFcdzTQwjbCrud5yVskHTEas7tZPUWoJYNk5htGQrpi mrvw5JC5SKcEsRpSaRss6A3jLR6DMwpxep 8cb044605f33ca907b966701f49e0bd80b4294696b57f8cf45f22398a1e63a23/0/9800000/76a9143b2aab840afb327a12c8a90fb4ed45b6892eb80988ac > B-open.pb * ./open-channel 112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00 9795000 mpDyc5kPAJZB7Zz9iW9acq3Jk8yiTJ7HKj cQXhbUnNRsFcdzTQwjbCrud5yVskHTEas7tZPUWoJYNk5htGQrpi cQXhbUnNRsFcdzTQwjbCrud5yVskHTEas7tZPUWoJYNk5htGQrpi 8cb044605f33ca907b966701f49e0bd80b4294696b57f8cf45f22398a1e63a23/0/9800000/76a9143b2aab840afb327a12c8a90fb4ed45b6892eb80988ac > B-open.pb
*/ */
#include <ccan/crypto/shachain/shachain.h> #include <ccan/crypto/shachain/shachain.h>
#include <ccan/short_types/short_types.h> #include <ccan/short_types/short_types.h>
@ -102,17 +102,16 @@ static u64 weak_random64(void)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct sha256 seed, revocation_hash; struct sha256 seed, revocation_hash;
struct bitcoin_address changeaddr, returnaddr; struct bitcoin_address changeaddr;
struct pkt *pkt; struct pkt *pkt;
const tal_t *ctx = tal_arr(NULL, char, 0); const tal_t *ctx = tal_arr(NULL, char, 0);
Anchor anchor = ANCHOR__INIT; Anchor anchor = ANCHOR__INIT;
u64 commit_tx_fee, total_in; u64 commit_tx_fee, total_in;
unsigned int locktime_seconds; unsigned int locktime_seconds;
bool testnet; bool testnet;
u8 *script_to_me;
size_t i; size_t i;
struct pubkey commitkey; struct pubkey commitkey, outkey;
EC_KEY *commitprivkey; EC_KEY *commitprivkey, *outprivkey;
err_set_progname(argv[0]); err_set_progname(argv[0]);
@ -126,7 +125,7 @@ int main(int argc, char *argv[])
locktime_seconds = LOCKTIME_MIN + 24 * 60 * 60; locktime_seconds = LOCKTIME_MIN + 24 * 60 * 60;
opt_register_noarg("--help|-h", opt_usage_and_exit, opt_register_noarg("--help|-h", opt_usage_and_exit,
"<seed> <amount> <changeaddr> <commitprivkey> <returnaddr> <txid>/<outnum>/<satoshis>/<script-in-hex>...\n" "<seed> <amount> <changeaddr> <commitprivkey> <outpubkey> <txid>/<outnum>/<satoshis>/<script-in-hex>...\n"
"A test program to output openchannel on stdout.", "A test program to output openchannel on stdout.",
"Print this message."); "Print this message.");
opt_register_arg("--min-anchor-confirms", opt_register_arg("--min-anchor-confirms",
@ -168,10 +167,12 @@ int main(int argc, char *argv[])
if (!testnet) if (!testnet)
errx(1, "Private key '%s' not on testnet!", argv[4]); errx(1, "Private key '%s' not on testnet!", argv[4]);
if (!bitcoin_from_base58(&testnet, &returnaddr, argv[5], strlen(argv[5]))) outprivkey = key_from_base58(argv[5], strlen(argv[5]), &testnet,
errx(1, "Invalid bitcoin address '%s'", argv[5]); &outkey);
if (!outprivkey)
errx(1, "Invalid private key '%s'", argv[5]);
if (!testnet) if (!testnet)
errx(1, "Bitcoin address '%s' not on testnet!", argv[5]); errx(1, "Private key '%s' not on testnet!", argv[5]);
anchor.n_inputs = (argc - 6); anchor.n_inputs = (argc - 6);
anchor.inputs = tal_arr(ctx, BitcoinInput *, anchor.n_inputs); anchor.inputs = tal_arr(ctx, BitcoinInput *, anchor.n_inputs);
@ -205,11 +206,7 @@ int main(int argc, char *argv[])
/* Get first revocation hash. */ /* Get first revocation hash. */
shachain_from_seed(&seed, 0, &revocation_hash); shachain_from_seed(&seed, 0, &revocation_hash);
/* Make simple output script to pay to my pubkey. */ pkt = openchannel_pkt(ctx, weak_random64(), &revocation_hash, &outkey,
script_to_me = scriptpubkey_pay_to_pubkeyhash(ctx, &returnaddr);
pkt = openchannel_pkt(ctx, weak_random64(), &revocation_hash,
tal_count(script_to_me), script_to_me,
commit_tx_fee, locktime_seconds, &anchor); commit_tx_fee, locktime_seconds, &anchor);
if (!write_all(STDOUT_FILENO, pkt, if (!write_all(STDOUT_FILENO, pkt,

7
pkt.c
View File

@ -4,6 +4,7 @@
#include "pkt.h" #include "pkt.h"
#include "bitcoin_tx.h" #include "bitcoin_tx.h"
#include "bitcoin_address.h" #include "bitcoin_address.h"
#include "pubkey.h"
#include "signature.h" #include "signature.h"
#include <stdio.h> #include <stdio.h>
@ -50,8 +51,7 @@ void proto_to_sha256(const Sha256Hash *pb, struct sha256 *hash)
struct pkt *openchannel_pkt(const tal_t *ctx, struct pkt *openchannel_pkt(const tal_t *ctx,
u64 seed, u64 seed,
const struct sha256 *revocation_hash, const struct sha256 *revocation_hash,
size_t script_len, const struct pubkey *to_me,
const void *script,
u64 commitment_fee, u64 commitment_fee,
u32 rel_locktime_seconds, u32 rel_locktime_seconds,
Anchor *anchor) Anchor *anchor)
@ -64,8 +64,7 @@ struct pkt *openchannel_pkt(const tal_t *ctx,
o.seed = seed; o.seed = seed;
o.revocation_hash = sha256_to_proto(ctx, revocation_hash); o.revocation_hash = sha256_to_proto(ctx, revocation_hash);
o.script_to_me.len = script_len; o.to_me = pubkey_to_proto(ctx, to_me);
o.script_to_me.data = (void *)script;
o.commitment_fee = commitment_fee; o.commitment_fee = commitment_fee;
o.anchor = anchor; o.anchor = anchor;
o.locktime_seconds = rel_locktime_seconds; o.locktime_seconds = rel_locktime_seconds;

6
pkt.h
View File

@ -22,13 +22,14 @@ Pkt *pkt_from_file(const char *filename, Pkt__PktCase expect);
struct sha256; struct sha256;
struct bitcoin_compressed_pubkey; struct bitcoin_compressed_pubkey;
struct signature; struct signature;
struct pubkey;
/** /**
* openchannel_pkt - create an openchannel message * openchannel_pkt - create an openchannel message
* @ctx: tal context to allocate off. * @ctx: tal context to allocate off.
* @seed: psuedo-random seed to shuffle inputs. * @seed: psuedo-random seed to shuffle inputs.
* @revocation_hash: first hash value generated from seed. * @revocation_hash: first hash value generated from seed.
* @script_len, @script: the script which pays to us. * @to_me: the pubkey for the commit transactions' P2SH output.
* @commitment_fee: the fee to use for commitment tx. * @commitment_fee: the fee to use for commitment tx.
* @rel_locktime_seconds: relative seconds for commitment locktime. * @rel_locktime_seconds: relative seconds for commitment locktime.
* @anchor: the anchor transaction details. * @anchor: the anchor transaction details.
@ -36,8 +37,7 @@ struct signature;
struct pkt *openchannel_pkt(const tal_t *ctx, struct pkt *openchannel_pkt(const tal_t *ctx,
u64 seed, u64 seed,
const struct sha256 *revocation_hash, const struct sha256 *revocation_hash,
size_t script_len, const struct pubkey *to_me,
const void *script,
u64 commitment_fee, u64 commitment_fee,
u32 rel_locktime_seconds, u32 rel_locktime_seconds,
Anchor *anchor); Anchor *anchor);

Write Preview
Loading…
Cancel
Save