LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix lightning "init" msg assertion error

Browse source 
closes #5962
This commit is contained in:
SomberNight 2020-02-15 15:25:41 +01:00
parent a6e3a244e8
commit edc00b448f
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
electrum/lnmsg.py
View file

@ -44,12 +44,12 @@ def _eval_exp_with_ctx(exp, ctx: dict) -> int:
return result return result
return sum(_eval_length_term(x, ctx) for x in exp.split("+")) return sum(_eval_length_term(x, ctx) for x in exp.split("+"))
def _make_handler(k: str, v: dict) -> Callable[[bytes], Tuple[str, dict]]: def _make_handler(msg_name: str, v: dict) -> Callable[[bytes], Tuple[str, dict]]:
""" """
Generate a message handler function (taking bytes) Generate a message handler function (taking bytes)
for message type `k` with specification `v` for message type `msg_name` with specification `v`
Check lib/lightning.json, `k` could be 'init', Check lib/lightning.json, `msg_name` could be 'init',
and `v` could be and `v` could be
{ type: 16, payload: { 'gflen': ..., ... }, ... } { type: 16, payload: { 'gflen': ..., ... }, ... }
@ -57,8 +57,8 @@ def _make_handler(k: str, v: dict) -> Callable[[bytes], Tuple[str, dict]]:
Returns function taking bytes Returns function taking bytes
""" """
def handler(data: bytes) -> Tuple[str, dict]: def handler(data: bytes) -> Tuple[str, dict]:
nonlocal k, v nonlocal msg_name, v
ma = {} ma = {} # map of field name -> field data; after parsing msg
pos = 0 pos = 0
for fieldname in v["payload"]: for fieldname in v["payload"]:
poslenMap = v["payload"][fieldname] poslenMap = v["payload"][fieldname]
@ -69,8 +69,9 @@ def _make_handler(k: str, v: dict) -> Callable[[bytes], Tuple[str, dict]]:
length = _eval_exp_with_ctx(length, ma) length = _eval_exp_with_ctx(length, ma)
ma[fieldname] = data[pos:pos+length] ma[fieldname] = data[pos:pos+length]
pos += length pos += length
assert pos == len(data), (k, pos, len(data)) # BOLT-01: "MUST ignore any additional data within a message beyond the length that it expects for that type."
return k, ma assert pos <= len(data), (msg_name, pos, len(data))
return msg_name, ma
return handler return handler
class LNSerializer: class LNSerializer:
@ -80,12 +81,12 @@ class LNSerializer:
with open(path) as f: with open(path) as f:
structured = json.loads(f.read(), object_pairs_hook=OrderedDict) structured = json.loads(f.read(), object_pairs_hook=OrderedDict)
for k in structured: for msg_name in structured:
v = structured[k] v = structured[msg_name]
# these message types are skipped since their types collide # these message types are skipped since their types collide
# (for example with pong, which also uses type=19) # (for example with pong, which also uses type=19)
# we don't need them yet # we don't need them yet
if k in ["final_incorrect_cltv_expiry", "final_incorrect_htlc_amount"]: if msg_name in ["final_incorrect_cltv_expiry", "final_incorrect_htlc_amount"]:
continue continue
if len(v["payload"]) == 0: if len(v["payload"]) == 0:
continue continue
@ -95,11 +96,11 @@ class LNSerializer:
#print("skipping", k) #print("skipping", k)
continue continue
byts = num.to_bytes(2, 'big') byts = num.to_bytes(2, 'big')
assert byts not in message_types, (byts, message_types[byts].__name__, k) assert byts not in message_types, (byts, message_types[byts].__name__, msg_name)
names = [x.__name__ for x in message_types.values()] names = [x.__name__ for x in message_types.values()]
assert k + "_handler" not in names, (k, names) assert msg_name + "_handler" not in names, (msg_name, names)
message_types[byts] = _make_handler(k, v) message_types[byts] = _make_handler(msg_name, v)
message_types[byts].__name__ = k + "_handler" message_types[byts].__name__ = msg_name + "_handler"
assert message_types[b"\x00\x10"].__name__ == "init_handler" assert message_types[b"\x00\x10"].__name__ == "init_handler"
self.structured = structured self.structured = structured