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

protocol: remove new anchor ops. 

We didn't implement them yet, and they'll need revision anyway.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ppa-0.6.1
Rusty Russell 10 years ago
parent
aa79887d79
commit
1a46334bd7
3 changed files with 10 additions and 703 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. 478
      lightning.pb-c.c
  2. 201
      lightning.pb-c.h
  3. 34
      lightning.proto

478
lightning.pb-c.c
View File

@ -609,221 +609,6 @@ void update_complete__free_unpacked
assert(message->base.descriptor == &update_complete__descriptor); assert(message->base.descriptor == &update_complete__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
} }
void new_anchor__init
(NewAnchor *message)
{
static NewAnchor init_value = NEW_ANCHOR__INIT;
*message = init_value;
}
size_t new_anchor__get_packed_size
(const NewAnchor *message)
{
assert(message->base.descriptor == &new_anchor__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t new_anchor__pack
(const NewAnchor *message,
uint8_t *out)
{
assert(message->base.descriptor == &new_anchor__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t new_anchor__pack_to_buffer
(const NewAnchor *message,
ProtobufCBuffer *buffer)
{
assert(message->base.descriptor == &new_anchor__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
NewAnchor *
new_anchor__unpack
(ProtobufCAllocator *allocator,
size_t len,
const uint8_t *data)
{
return (NewAnchor *)
protobuf_c_message_unpack (&new_anchor__descriptor,
allocator, len, data);
}
void new_anchor__free_unpacked
(NewAnchor *message,
ProtobufCAllocator *allocator)
{
assert(message->base.descriptor == &new_anchor__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void new_anchor_ack__init
(NewAnchorAck *message)
{
static NewAnchorAck init_value = NEW_ANCHOR_ACK__INIT;
*message = init_value;
}
size_t new_anchor_ack__get_packed_size
(const NewAnchorAck *message)
{
assert(message->base.descriptor == &new_anchor_ack__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t new_anchor_ack__pack
(const NewAnchorAck *message,
uint8_t *out)
{
assert(message->base.descriptor == &new_anchor_ack__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t new_anchor_ack__pack_to_buffer
(const NewAnchorAck *message,
ProtobufCBuffer *buffer)
{
assert(message->base.descriptor == &new_anchor_ack__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
NewAnchorAck *
new_anchor_ack__unpack
(ProtobufCAllocator *allocator,
size_t len,
const uint8_t *data)
{
return (NewAnchorAck *)
protobuf_c_message_unpack (&new_anchor_ack__descriptor,
allocator, len, data);
}
void new_anchor_ack__free_unpacked
(NewAnchorAck *message,
ProtobufCAllocator *allocator)
{
assert(message->base.descriptor == &new_anchor_ack__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void new_anchor_commit_sig__init
(NewAnchorCommitSig *message)
{
static NewAnchorCommitSig init_value = NEW_ANCHOR_COMMIT_SIG__INIT;
*message = init_value;
}
size_t new_anchor_commit_sig__get_packed_size
(const NewAnchorCommitSig *message)
{
assert(message->base.descriptor == &new_anchor_commit_sig__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t new_anchor_commit_sig__pack
(const NewAnchorCommitSig *message,
uint8_t *out)
{
assert(message->base.descriptor == &new_anchor_commit_sig__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t new_anchor_commit_sig__pack_to_buffer
(const NewAnchorCommitSig *message,
ProtobufCBuffer *buffer)
{
assert(message->base.descriptor == &new_anchor_commit_sig__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
NewAnchorCommitSig *
new_anchor_commit_sig__unpack
(ProtobufCAllocator *allocator,
size_t len,
const uint8_t *data)
{
return (NewAnchorCommitSig *)
protobuf_c_message_unpack (&new_anchor_commit_sig__descriptor,
allocator, len, data);
}
void new_anchor_commit_sig__free_unpacked
(NewAnchorCommitSig *message,
ProtobufCAllocator *allocator)
{
assert(message->base.descriptor == &new_anchor_commit_sig__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void new_anchor_accept__init
(NewAnchorAccept *message)
{
static NewAnchorAccept init_value = NEW_ANCHOR_ACCEPT__INIT;
*message = init_value;
}
size_t new_anchor_accept__get_packed_size
(const NewAnchorAccept *message)
{
assert(message->base.descriptor == &new_anchor_accept__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t new_anchor_accept__pack
(const NewAnchorAccept *message,
uint8_t *out)
{
assert(message->base.descriptor == &new_anchor_accept__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t new_anchor_accept__pack_to_buffer
(const NewAnchorAccept *message,
ProtobufCBuffer *buffer)
{
assert(message->base.descriptor == &new_anchor_accept__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
NewAnchorAccept *
new_anchor_accept__unpack
(ProtobufCAllocator *allocator,
size_t len,
const uint8_t *data)
{
return (NewAnchorAccept *)
protobuf_c_message_unpack (&new_anchor_accept__descriptor,
allocator, len, data);
}
void new_anchor_accept__free_unpacked
(NewAnchorAccept *message,
ProtobufCAllocator *allocator)
{
assert(message->base.descriptor == &new_anchor_accept__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void new_anchor_complete__init
(NewAnchorComplete *message)
{
static NewAnchorComplete init_value = NEW_ANCHOR_COMPLETE__INIT;
*message = init_value;
}
size_t new_anchor_complete__get_packed_size
(const NewAnchorComplete *message)
{
assert(message->base.descriptor == &new_anchor_complete__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t new_anchor_complete__pack
(const NewAnchorComplete *message,
uint8_t *out)
{
assert(message->base.descriptor == &new_anchor_complete__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t new_anchor_complete__pack_to_buffer
(const NewAnchorComplete *message,
ProtobufCBuffer *buffer)
{
assert(message->base.descriptor == &new_anchor_complete__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
NewAnchorComplete *
new_anchor_complete__unpack
(ProtobufCAllocator *allocator,
size_t len,
const uint8_t *data)
{
return (NewAnchorComplete *)
protobuf_c_message_unpack (&new_anchor_complete__descriptor,
allocator, len, data);
}
void new_anchor_complete__free_unpacked
(NewAnchorComplete *message,
ProtobufCAllocator *allocator)
{
assert(message->base.descriptor == &new_anchor_complete__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void close_channel__init void close_channel__init
(CloseChannel *message) (CloseChannel *message)
{ {
@ -1908,196 +1693,6 @@ const ProtobufCMessageDescriptor update_complete__descriptor =
(ProtobufCMessageInit) update_complete__init, (ProtobufCMessageInit) update_complete__init,
NULL,NULL,NULL /* reserved[123] */ NULL,NULL,NULL /* reserved[123] */
}; };
static const ProtobufCFieldDescriptor new_anchor__field_descriptors[1] =
{
{
"anchor",
1,
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_MESSAGE,
0, /* quantifier_offset */
offsetof(NewAnchor, anchor),
&anchor__descriptor,
NULL,
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
static const unsigned new_anchor__field_indices_by_name[] = {
0, /* field[0] = anchor */
};
static const ProtobufCIntRange new_anchor__number_ranges[1 + 1] =
{
{ 1, 0 },
{ 0, 1 }
};
const ProtobufCMessageDescriptor new_anchor__descriptor =
{
PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"new_anchor",
"NewAnchor",
"NewAnchor",
"",
sizeof(NewAnchor),
1,
new_anchor__field_descriptors,
new_anchor__field_indices_by_name,
1, new_anchor__number_ranges,
(ProtobufCMessageInit) new_anchor__init,
NULL,NULL,NULL /* reserved[123] */
};
static const ProtobufCFieldDescriptor new_anchor_ack__field_descriptors[1] =
{
{
"anchor",
1,
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_MESSAGE,
0, /* quantifier_offset */
offsetof(NewAnchorAck, anchor),
&anchor__descriptor,
NULL,
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
static const unsigned new_anchor_ack__field_indices_by_name[] = {
0, /* field[0] = anchor */
};
static const ProtobufCIntRange new_anchor_ack__number_ranges[1 + 1] =
{
{ 1, 0 },
{ 0, 1 }
};
const ProtobufCMessageDescriptor new_anchor_ack__descriptor =
{
PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"new_anchor_ack",
"NewAnchorAck",
"NewAnchorAck",
"",
sizeof(NewAnchorAck),
1,
new_anchor_ack__field_descriptors,
new_anchor_ack__field_indices_by_name,
1, new_anchor_ack__number_ranges,
(ProtobufCMessageInit) new_anchor_ack__init,
NULL,NULL,NULL /* reserved[123] */
};
static const ProtobufCFieldDescriptor new_anchor_commit_sig__field_descriptors[1] =
{
{
"sig",
1,
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_MESSAGE,
0, /* quantifier_offset */
offsetof(NewAnchorCommitSig, sig),
&signature__descriptor,
NULL,
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
static const unsigned new_anchor_commit_sig__field_indices_by_name[] = {
0, /* field[0] = sig */
};
static const ProtobufCIntRange new_anchor_commit_sig__number_ranges[1 + 1] =
{
{ 1, 0 },
{ 0, 1 }
};
const ProtobufCMessageDescriptor new_anchor_commit_sig__descriptor =
{
PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"new_anchor_commit_sig",
"NewAnchorCommitSig",
"NewAnchorCommitSig",
"",
sizeof(NewAnchorCommitSig),
1,
new_anchor_commit_sig__field_descriptors,
new_anchor_commit_sig__field_indices_by_name,
1, new_anchor_commit_sig__number_ranges,
(ProtobufCMessageInit) new_anchor_commit_sig__init,
NULL,NULL,NULL /* reserved[123] */
};
static const ProtobufCFieldDescriptor new_anchor_accept__field_descriptors[1] =
{
{
"script",
1,
PROTOBUF_C_LABEL_REPEATED,
PROTOBUF_C_TYPE_BYTES,
offsetof(NewAnchorAccept, n_script),
offsetof(NewAnchorAccept, script),
NULL,
NULL,
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
static const unsigned new_anchor_accept__field_indices_by_name[] = {
0, /* field[0] = script */
};
static const ProtobufCIntRange new_anchor_accept__number_ranges[1 + 1] =
{
{ 1, 0 },
{ 0, 1 }
};
const ProtobufCMessageDescriptor new_anchor_accept__descriptor =
{
PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"new_anchor_accept",
"NewAnchorAccept",
"NewAnchorAccept",
"",
sizeof(NewAnchorAccept),
1,
new_anchor_accept__field_descriptors,
new_anchor_accept__field_indices_by_name,
1, new_anchor_accept__number_ranges,
(ProtobufCMessageInit) new_anchor_accept__init,
NULL,NULL,NULL /* reserved[123] */
};
static const ProtobufCFieldDescriptor new_anchor_complete__field_descriptors[1] =
{
{
"revocation_preimage",
1,
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_MESSAGE,
0, /* quantifier_offset */
offsetof(NewAnchorComplete, revocation_preimage),
&sha256_hash__descriptor,
NULL,
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
static const unsigned new_anchor_complete__field_indices_by_name[] = {
0, /* field[0] = revocation_preimage */
};
static const ProtobufCIntRange new_anchor_complete__number_ranges[1 + 1] =
{
{ 1, 0 },
{ 0, 1 }
};
const ProtobufCMessageDescriptor new_anchor_complete__descriptor =
{
PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"new_anchor_complete",
"NewAnchorComplete",
"NewAnchorComplete",
"",
sizeof(NewAnchorComplete),
1,
new_anchor_complete__field_descriptors,
new_anchor_complete__field_indices_by_name,
1, new_anchor_complete__number_ranges,
(ProtobufCMessageInit) new_anchor_complete__init,
NULL,NULL,NULL /* reserved[123] */
};
static const ProtobufCFieldDescriptor close_channel__field_descriptors[1] = static const ProtobufCFieldDescriptor close_channel__field_descriptors[1] =
{ {
{ {
@ -2212,7 +1807,7 @@ const ProtobufCMessageDescriptor error__descriptor =
(ProtobufCMessageInit) error__init, (ProtobufCMessageInit) error__init,
NULL,NULL,NULL /* reserved[123] */ NULL,NULL,NULL /* reserved[123] */
}; };
static const ProtobufCFieldDescriptor pkt__field_descriptors[15] = static const ProtobufCFieldDescriptor pkt__field_descriptors[11] =
{ {
{ {
"update", "update",
@ -2310,54 +1905,6 @@ static const ProtobufCFieldDescriptor pkt__field_descriptors[15] =
0 | PROTOBUF_C_FIELD_FLAG_ONEOF, /* flags */ 0 | PROTOBUF_C_FIELD_FLAG_ONEOF, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */ 0,NULL,NULL /* reserved1,reserved2, etc */
}, },
{
"new_anchor",
301,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_MESSAGE,
offsetof(Pkt, pkt_case),
offsetof(Pkt, new_anchor),
&new_anchor__descriptor,
NULL,
0 | PROTOBUF_C_FIELD_FLAG_ONEOF, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"new_anchor_ack",
302,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_MESSAGE,
offsetof(Pkt, pkt_case),
offsetof(Pkt, new_anchor_ack),
&new_anchor_ack__descriptor,
NULL,
0 | PROTOBUF_C_FIELD_FLAG_ONEOF, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"new_anchor_accept",
303,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_MESSAGE,
offsetof(Pkt, pkt_case),
offsetof(Pkt, new_anchor_accept),
&new_anchor_accept__descriptor,
NULL,
0 | PROTOBUF_C_FIELD_FLAG_ONEOF, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"new_anchor_complete",
304,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_MESSAGE,
offsetof(Pkt, pkt_case),
offsetof(Pkt, new_anchor_complete),
&new_anchor_complete__descriptor,
NULL,
0 | PROTOBUF_C_FIELD_FLAG_ONEOF, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{ {
"close", "close",
401, 401,
@ -2396,13 +1943,9 @@ static const ProtobufCFieldDescriptor pkt__field_descriptors[15] =
}, },
}; };
static const unsigned pkt__field_indices_by_name[] = { static const unsigned pkt__field_indices_by_name[] = {
12, /* field[12] = close */ 8, /* field[8] = close */
13, /* field[13] = close_complete */ 9, /* field[9] = close_complete */
14, /* field[14] = error */ 10, /* field[10] = error */
8, /* field[8] = new_anchor */
10, /* field[10] = new_anchor_accept */
9, /* field[9] = new_anchor_ack */
11, /* field[11] = new_anchor_complete */
4, /* field[4] = open */ 4, /* field[4] = open */
6, /* field[6] = open_anchor_scriptsigs */ 6, /* field[6] = open_anchor_scriptsigs */
5, /* field[5] = open_commit_sig */ 5, /* field[5] = open_commit_sig */
@ -2412,14 +1955,13 @@ static const unsigned pkt__field_indices_by_name[] = {
3, /* field[3] = update_complete */ 3, /* field[3] = update_complete */
2, /* field[2] = update_signature */ 2, /* field[2] = update_signature */
}; };
static const ProtobufCIntRange pkt__number_ranges[5 + 1] = static const ProtobufCIntRange pkt__number_ranges[4 + 1] =
{ {
{ 1, 0 }, { 1, 0 },
{ 201, 4 }, { 201, 4 },
{ 301, 8 }, { 401, 8 },
{ 401, 12 }, { 1000, 10 },
{ 1000, 14 }, { 0, 11 }
{ 0, 15 }
}; };
const ProtobufCMessageDescriptor pkt__descriptor = const ProtobufCMessageDescriptor pkt__descriptor =
{ {
@ -2429,10 +1971,10 @@ const ProtobufCMessageDescriptor pkt__descriptor =
"Pkt", "Pkt",
"", "",
sizeof(Pkt), sizeof(Pkt),
15, 11,
pkt__field_descriptors, pkt__field_descriptors,
pkt__field_indices_by_name, pkt__field_indices_by_name,
5, pkt__number_ranges, 4, pkt__number_ranges,
(ProtobufCMessageInit) pkt__init, (ProtobufCMessageInit) pkt__init,
NULL,NULL,NULL /* reserved[123] */ NULL,NULL,NULL /* reserved[123] */
}; };

201
lightning.pb-c.h
View File

@ -29,11 +29,6 @@ typedef struct _Update Update;
typedef struct _UpdateAccept UpdateAccept; typedef struct _UpdateAccept UpdateAccept;
typedef struct _UpdateSignature UpdateSignature; typedef struct _UpdateSignature UpdateSignature;
typedef struct _UpdateComplete UpdateComplete; typedef struct _UpdateComplete UpdateComplete;
typedef struct _NewAnchor NewAnchor;
typedef struct _NewAnchorAck NewAnchorAck;
typedef struct _NewAnchorCommitSig NewAnchorCommitSig;
typedef struct _NewAnchorAccept NewAnchorAccept;
typedef struct _NewAnchorComplete NewAnchorComplete;
typedef struct _CloseChannel CloseChannel; typedef struct _CloseChannel CloseChannel;
typedef struct _CloseChannelComplete CloseChannelComplete; typedef struct _CloseChannelComplete CloseChannelComplete;
typedef struct _Error Error; typedef struct _Error Error;
@ -345,76 +340,6 @@ struct _UpdateComplete
, NULL } , NULL }
/*
* Let's change the channel funding source.
*/
struct _NewAnchor
{
ProtobufCMessage base;
/*
* The new anchor: previous anchor 2x2 input assumed.
*/
Anchor *anchor;
};
#define NEW_ANCHOR__INIT \
{ PROTOBUF_C_MESSAGE_INIT (&new_anchor__descriptor) \
, NULL }
/*
* That seems OK to me, let's add these too (if any).
*/
struct _NewAnchorAck
{
ProtobufCMessage base;
Anchor *anchor;
};
#define NEW_ANCHOR_ACK__INIT \
{ PROTOBUF_C_MESSAGE_INIT (&new_anchor_ack__descriptor) \
, NULL }
/*
* Now we both send signatures for new commit sig.
*/
struct _NewAnchorCommitSig
{
ProtobufCMessage base;
Signature *sig;
};
#define NEW_ANCHOR_COMMIT_SIG__INIT \
{ PROTOBUF_C_MESSAGE_INIT (&new_anchor_commit_sig__descriptor) \
, NULL }
/*
* Here are the script sigs for the new anchor's new inputs.
*/
struct _NewAnchorAccept
{
ProtobufCMessage base;
size_t n_script;
ProtobufCBinaryData *script;
};
#define NEW_ANCHOR_ACCEPT__INIT \
{ PROTOBUF_C_MESSAGE_INIT (&new_anchor_accept__descriptor) \
, 0,NULL }
/*
* Complete the transfer to new anchor (both ends need to send this,
* once they're happy that it's reached their required depth).
*/
struct _NewAnchorComplete
{
ProtobufCMessage base;
Sha256Hash *revocation_preimage;
};
#define NEW_ANCHOR_COMPLETE__INIT \
{ PROTOBUF_C_MESSAGE_INIT (&new_anchor_complete__descriptor) \
, NULL }
/* /*
* Begin cooperative close of channel. * Begin cooperative close of channel.
*/ */
@ -472,10 +397,6 @@ typedef enum {
PKT__PKT_UPDATE_ACCEPT = 2, PKT__PKT_UPDATE_ACCEPT = 2,
PKT__PKT_UPDATE_SIGNATURE = 3, PKT__PKT_UPDATE_SIGNATURE = 3,
PKT__PKT_UPDATE_COMPLETE = 4, PKT__PKT_UPDATE_COMPLETE = 4,
PKT__PKT_NEW_ANCHOR = 301,
PKT__PKT_NEW_ANCHOR_ACK = 302,
PKT__PKT_NEW_ANCHOR_ACCEPT = 303,
PKT__PKT_NEW_ANCHOR_COMPLETE = 304,
PKT__PKT_CLOSE = 401, PKT__PKT_CLOSE = 401,
PKT__PKT_CLOSE_COMPLETE = 402, PKT__PKT_CLOSE_COMPLETE = 402,
PKT__PKT_ERROR = 1000, PKT__PKT_ERROR = 1000,
@ -503,13 +424,6 @@ struct _Pkt
UpdateAccept *update_accept; UpdateAccept *update_accept;
UpdateSignature *update_signature; UpdateSignature *update_signature;
UpdateComplete *update_complete; UpdateComplete *update_complete;
/*
* Topping up
*/
NewAnchor *new_anchor;
NewAnchorAck *new_anchor_ack;
NewAnchorAccept *new_anchor_accept;
NewAnchorComplete *new_anchor_complete;
/* /*
* Closing * Closing
*/ */
@ -792,101 +706,6 @@ UpdateComplete *
void update_complete__free_unpacked void update_complete__free_unpacked
(UpdateComplete *message, (UpdateComplete *message,
ProtobufCAllocator *allocator); ProtobufCAllocator *allocator);
/* NewAnchor methods */
void new_anchor__init
(NewAnchor *message);
size_t new_anchor__get_packed_size
(const NewAnchor *message);
size_t new_anchor__pack
(const NewAnchor *message,
uint8_t *out);
size_t new_anchor__pack_to_buffer
(const NewAnchor *message,
ProtobufCBuffer *buffer);
NewAnchor *
new_anchor__unpack
(ProtobufCAllocator *allocator,
size_t len,
const uint8_t *data);
void new_anchor__free_unpacked
(NewAnchor *message,
ProtobufCAllocator *allocator);
/* NewAnchorAck methods */
void new_anchor_ack__init
(NewAnchorAck *message);
size_t new_anchor_ack__get_packed_size
(const NewAnchorAck *message);
size_t new_anchor_ack__pack
(const NewAnchorAck *message,
uint8_t *out);
size_t new_anchor_ack__pack_to_buffer
(const NewAnchorAck *message,
ProtobufCBuffer *buffer);
NewAnchorAck *
new_anchor_ack__unpack
(ProtobufCAllocator *allocator,
size_t len,
const uint8_t *data);
void new_anchor_ack__free_unpacked
(NewAnchorAck *message,
ProtobufCAllocator *allocator);
/* NewAnchorCommitSig methods */
void new_anchor_commit_sig__init
(NewAnchorCommitSig *message);
size_t new_anchor_commit_sig__get_packed_size
(const NewAnchorCommitSig *message);
size_t new_anchor_commit_sig__pack
(const NewAnchorCommitSig *message,
uint8_t *out);
size_t new_anchor_commit_sig__pack_to_buffer
(const NewAnchorCommitSig *message,
ProtobufCBuffer *buffer);
NewAnchorCommitSig *
new_anchor_commit_sig__unpack
(ProtobufCAllocator *allocator,
size_t len,
const uint8_t *data);
void new_anchor_commit_sig__free_unpacked
(NewAnchorCommitSig *message,
ProtobufCAllocator *allocator);
/* NewAnchorAccept methods */
void new_anchor_accept__init
(NewAnchorAccept *message);
size_t new_anchor_accept__get_packed_size
(const NewAnchorAccept *message);
size_t new_anchor_accept__pack
(const NewAnchorAccept *message,
uint8_t *out);
size_t new_anchor_accept__pack_to_buffer
(const NewAnchorAccept *message,
ProtobufCBuffer *buffer);
NewAnchorAccept *
new_anchor_accept__unpack
(ProtobufCAllocator *allocator,
size_t len,
const uint8_t *data);
void new_anchor_accept__free_unpacked
(NewAnchorAccept *message,
ProtobufCAllocator *allocator);
/* NewAnchorComplete methods */
void new_anchor_complete__init
(NewAnchorComplete *message);
size_t new_anchor_complete__get_packed_size
(const NewAnchorComplete *message);
size_t new_anchor_complete__pack
(const NewAnchorComplete *message,
uint8_t *out);
size_t new_anchor_complete__pack_to_buffer
(const NewAnchorComplete *message,
ProtobufCBuffer *buffer);
NewAnchorComplete *
new_anchor_complete__unpack
(ProtobufCAllocator *allocator,
size_t len,
const uint8_t *data);
void new_anchor_complete__free_unpacked
(NewAnchorComplete *message,
ProtobufCAllocator *allocator);
/* CloseChannel methods */ /* CloseChannel methods */
void close_channel__init void close_channel__init
(CloseChannel *message); (CloseChannel *message);
@ -1007,21 +826,6 @@ typedef void (*UpdateSignature_Closure)
typedef void (*UpdateComplete_Closure) typedef void (*UpdateComplete_Closure)
(const UpdateComplete *message, (const UpdateComplete *message,
void *closure_data); void *closure_data);
typedef void (*NewAnchor_Closure)
(const NewAnchor *message,
void *closure_data);
typedef void (*NewAnchorAck_Closure)
(const NewAnchorAck *message,
void *closure_data);
typedef void (*NewAnchorCommitSig_Closure)
(const NewAnchorCommitSig *message,
void *closure_data);
typedef void (*NewAnchorAccept_Closure)
(const NewAnchorAccept *message,
void *closure_data);
typedef void (*NewAnchorComplete_Closure)
(const NewAnchorComplete *message,
void *closure_data);
typedef void (*CloseChannel_Closure) typedef void (*CloseChannel_Closure)
(const CloseChannel *message, (const CloseChannel *message,
void *closure_data); void *closure_data);
@ -1054,11 +858,6 @@ extern const ProtobufCMessageDescriptor update__descriptor;
extern const ProtobufCMessageDescriptor update_accept__descriptor; extern const ProtobufCMessageDescriptor update_accept__descriptor;
extern const ProtobufCMessageDescriptor update_signature__descriptor; extern const ProtobufCMessageDescriptor update_signature__descriptor;
extern const ProtobufCMessageDescriptor update_complete__descriptor; extern const ProtobufCMessageDescriptor update_complete__descriptor;
extern const ProtobufCMessageDescriptor new_anchor__descriptor;
extern const ProtobufCMessageDescriptor new_anchor_ack__descriptor;
extern const ProtobufCMessageDescriptor new_anchor_commit_sig__descriptor;
extern const ProtobufCMessageDescriptor new_anchor_accept__descriptor;
extern const ProtobufCMessageDescriptor new_anchor_complete__descriptor;
extern const ProtobufCMessageDescriptor close_channel__descriptor; extern const ProtobufCMessageDescriptor close_channel__descriptor;
extern const ProtobufCMessageDescriptor close_channel_complete__descriptor; extern const ProtobufCMessageDescriptor close_channel_complete__descriptor;
extern const ProtobufCMessageDescriptor error__descriptor; extern const ProtobufCMessageDescriptor error__descriptor;

34
lightning.proto
View File

@ -117,8 +117,6 @@ message update {
message update_accept { message update_accept {
// Signature for your new commitment tx. // Signature for your new commitment tx.
required signature sig = 1; required signature sig = 1;
// Signature for old anchor (if any)
optional signature old_anchor_sig = 2;
// Hash for which I will supply preimage to revoke this new commit tx. // Hash for which I will supply preimage to revoke this new commit tx.
required sha256_hash revocation_hash = 3; required sha256_hash revocation_hash = 3;
} }
@ -137,33 +135,6 @@ message update_complete {
required sha256_hash revocation_preimage = 1; required sha256_hash revocation_preimage = 1;
} }
// Let's change the channel funding source.
message new_anchor {
// The new anchor: previous anchor 2x2 input assumed.
required anchor anchor = 1;
}
// That seems OK to me, let's add these too (if any).
message new_anchor_ack {
required anchor anchor = 1;
}
// Now we both send signatures for new commit sig.
message new_anchor_commit_sig {
required signature sig = 1;
}
// Here are the script sigs for the new anchor's new inputs.
message new_anchor_accept {
repeated bytes script = 1;
}
// Complete the transfer to new anchor (both ends need to send this,
// once they're happy that it's reached their required depth).
message new_anchor_complete {
required sha256_hash revocation_preimage = 1;
}
// Begin cooperative close of channel. // Begin cooperative close of channel.
message close_channel { message close_channel {
// This is our signature a new transaction which spends the anchor // This is our signature a new transaction which spends the anchor
@ -196,11 +167,6 @@ message pkt {
update_accept update_accept = 2; update_accept update_accept = 2;
update_signature update_signature = 3; update_signature update_signature = 3;
update_complete update_complete = 4; update_complete update_complete = 4;
// Topping up
new_anchor new_anchor = 301;
new_anchor_ack new_anchor_ack = 302;
new_anchor_accept new_anchor_accept = 303;
new_anchor_complete new_anchor_complete = 304;
// Closing // Closing
close_channel close = 401; close_channel close = 401;
close_channel_complete close_complete = 402; close_channel_complete close_complete = 402;

Write Preview
Loading…
Cancel
Save