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

BOLT 2 updates for fix placment of chain_hash req

Browse Source 
See 4b62d26af9
This commit is contained in:
lisa neigut
2018-09-20 13:13:53 -07:00
committed by Rusty Russell
parent b287f2f007
commit 73ea6d0038
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -9,7 +9,7 @@ CCANDIR := ccan
# Where we keep the BOLT RFCs # Where we keep the BOLT RFCs
BOLTDIR := ../lightning-rfc/ BOLTDIR := ../lightning-rfc/
BOLTVERSION := 21e3688e843f82267b3970cda69fa93158dc9517 BOLTVERSION := 4b62d26af93a07166d6a9de2cb5eff80849d9c19
-include config.vars -include config.vars

9
openingd/openingd.c
View File

@@ -440,7 +440,6 @@ static u8 *funder_channel(struct state *state,
/* BOLT #2: /* BOLT #2:
* *
* The receiver: * The receiver:
*...
* - if `minimum_depth` is unreasonably large: * - if `minimum_depth` is unreasonably large:
* - MAY reject the channel. * - MAY reject the channel.
*/ */
@@ -704,10 +703,9 @@ static u8 *fundee_channel(struct state *state, const u8 *open_channel_msg)
/* BOLT #2: /* BOLT #2:
* *
* The receiver: * The receiving node MUST fail the channel if:
* - if the `chain_hash` value, within the `open_channel`, message is * - the `chain_hash` value is set to a hash of a chain
* set to a hash of a chain that is unknown to the receiver: * that is unknown to the receiver.
* - MUST reject the channel.
*/ */
if (!bitcoin_blkid_eq(&chain_hash, if (!bitcoin_blkid_eq(&chain_hash,
&state->chainparams->genesis_blockhash)) { &state->chainparams->genesis_blockhash)) {
@@ -733,6 +731,7 @@ static u8 *fundee_channel(struct state *state, const u8 *open_channel_msg)
/* BOLT #2: /* BOLT #2:
* *
* The receiving node MUST fail the channel if: * The receiving node MUST fail the channel if:
* ...
* - `push_msat` is greater than `funding_satoshis` * 1000. * - `push_msat` is greater than `funding_satoshis` * 1000.
*/ */
if (state->push_msat > state->funding_satoshis * 1000) { if (state->push_msat > state->funding_satoshis * 1000) {