tfollow-up prev commit: channel_flags, message_flags, htlc_maximum_msat - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 8bb23ea2cd253d1a6f6059f301a8158ed22f8587
DIR parent 9659d23bde3d514019c87ec790f228b710159bba
HTML Author: ThomasV <thomasv@electrum.org>
Date: Tue, 16 Oct 2018 11:26:50 +0200
follow-up prev commit: channel_flags, message_flags, htlc_maximum_msat
Diffstat:
M electrum/lightning.json | 10 +++++++---
M electrum/lnbase.py | 4 ++--
M electrum/lnrouter.py | 17 +++++++++++------
3 files changed, 20 insertions(+), 11 deletions(-)
---
DIR diff --git a/electrum/lightning.json b/electrum/lightning.json
t@@ -776,9 +776,13 @@
"position": "104",
"length": "4"
},
- "flags": {
+ "message_flags": {
"position": "108",
- "length": "2"
+ "length": "1"
+ },
+ "channel_flags": {
+ "position": "109",
+ "length": "1"
},
"cltv_expiry_delta": {
"position": "110",
t@@ -799,7 +803,7 @@
"htlc_maximum_msat": {
"position": "128",
"length": "8",
- "feature": "option_upfront_shutdown_script"
+ "feature": "option_channel_htlc_max"
}
}
},
DIR diff --git a/electrum/lnbase.py b/electrum/lnbase.py
t@@ -785,9 +785,9 @@ class Peer(PrintError):
'bitcoin_key_1': bitcoin_keys[0], 'bitcoin_key_2': bitcoin_keys[1]},
trusted=True)
# only inject outgoing direction:
- flags = b'\x00' if node_ids[0] == pubkey_ours else b'\x01'
+ channel_flags = b'\x00' if node_ids[0] == pubkey_ours else b'\x01'
now = int(time.time()).to_bytes(4, byteorder="big")
- self.channel_db.on_channel_update({"short_channel_id": chan.short_channel_id, 'flags': flags, 'cltv_expiry_delta': b'\x90',
+ self.channel_db.on_channel_update({"short_channel_id": chan.short_channel_id, 'channel_flags': channel_flags, 'cltv_expiry_delta': b'\x90',
'htlc_minimum_msat': b'\x03\xe8', 'fee_base_msat': b'\x03\xe8', 'fee_proportional_millionths': b'\x01',
'chain_hash': constants.net.rev_genesis_bytes(), 'timestamp': now},
trusted=True)
DIR diff --git a/electrum/lnrouter.py b/electrum/lnrouter.py
t@@ -110,7 +110,7 @@ class ChannelInfo(PrintError):
def on_channel_update(self, msg_payload, trusted=False):
assert self.channel_id == msg_payload['short_channel_id']
- flags = int.from_bytes(msg_payload['flags'], 'big')
+ flags = int.from_bytes(msg_payload['channel_flags'], 'big')
direction = flags & ChannelInfoDirectedPolicy.FLAG_DIRECTION
new_policy = ChannelInfoDirectedPolicy(msg_payload)
if direction == 0:
t@@ -148,17 +148,19 @@ class ChannelInfoDirectedPolicy:
htlc_minimum_msat = channel_update_payload['htlc_minimum_msat']
fee_base_msat = channel_update_payload['fee_base_msat']
fee_proportional_millionths = channel_update_payload['fee_proportional_millionths']
- flags = channel_update_payload['flags']
+ channel_flags = channel_update_payload['channel_flags']
timestamp = channel_update_payload['timestamp']
+ htlc_maximum_msat = channel_update_payload.get('htlc_maximum_msat') # optional
self.cltv_expiry_delta = int.from_bytes(cltv_expiry_delta, "big")
self.htlc_minimum_msat = int.from_bytes(htlc_minimum_msat, "big")
+ self.htlc_maximum_msat = int.from_bytes(htlc_maximum_msat, "big") if htlc_maximum_msat else None
self.fee_base_msat = int.from_bytes(fee_base_msat, "big")
self.fee_proportional_millionths = int.from_bytes(fee_proportional_millionths, "big")
- self.flags = int.from_bytes(flags, "big")
+ self.channel_flags = int.from_bytes(channel_flags, "big")
self.timestamp = int.from_bytes(timestamp, "big")
- self.disabled = self.flags & self.FLAG_DISABLE
+ self.disabled = self.channel_flags & self.FLAG_DISABLE
def to_json(self) -> dict:
d = {}
t@@ -166,8 +168,10 @@ class ChannelInfoDirectedPolicy:
d['htlc_minimum_msat'] = self.htlc_minimum_msat
d['fee_base_msat'] = self.fee_base_msat
d['fee_proportional_millionths'] = self.fee_proportional_millionths
- d['flags'] = self.flags
+ d['channel_flags'] = self.channel_flags
d['timestamp'] = self.timestamp
+ if self.htlc_maximum_msat:
+ d['htlc_maximum_msat'] = self.htlc_maximum_msat
return d
@classmethod
t@@ -176,9 +180,10 @@ class ChannelInfoDirectedPolicy:
d2 = {}
d2['cltv_expiry_delta'] = d['cltv_expiry_delta'].to_bytes(2, "big")
d2['htlc_minimum_msat'] = d['htlc_minimum_msat'].to_bytes(8, "big")
+ d2['htlc_maximum_msat'] = d['htlc_maximum_msat'].to_bytes(8, "big") if d.get('htlc_maximum_msat') else None
d2['fee_base_msat'] = d['fee_base_msat'].to_bytes(4, "big")
d2['fee_proportional_millionths'] = d['fee_proportional_millionths'].to_bytes(4, "big")
- d2['flags'] = d['flags'].to_bytes(2, "big")
+ d2['channel_flags'] = d['channel_flags'].to_bytes(1, "big")
d2['timestamp'] = d['timestamp'].to_bytes(4, "big")
return ChannelInfoDirectedPolicy(d2)