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

lnhtlc: remove lookup_htlc, use heterogeneously typed lists

Browse source
This commit is contained in:
Janus 2018-10-10 19:52:46 +02:00 • committed by SomberNight
parent 7cb76fee84
commit ab991ce207
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
3 changed files with 28 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
electrum/lnbase.py
View file

@ -1178,7 +1178,6 @@ class Peer(PrintError):
chan = self.channels[update_fulfill_htlc_msg["channel_id"]] chan = self.channels[update_fulfill_htlc_msg["channel_id"]]
preimage = update_fulfill_htlc_msg["payment_preimage"] preimage = update_fulfill_htlc_msg["payment_preimage"]
htlc_id = int.from_bytes(update_fulfill_htlc_msg["id"], "big") htlc_id = int.from_bytes(update_fulfill_htlc_msg["id"], "big")
htlc = chan.lookup_htlc(chan.log[LOCAL], htlc_id)
chan.receive_htlc_settle(preimage, htlc_id) chan.receive_htlc_settle(preimage, htlc_id)
await self.receive_commitment(chan) await self.receive_commitment(chan)
self.revoke(chan) self.revoke(chan)

91
electrum/lnhtlc.py
View file

@ -23,8 +23,6 @@ from .transaction import Transaction, TxOutput, construct_witness
from .simple_config import SimpleConfig, FEERATE_FALLBACK_STATIC_FEE from .simple_config import SimpleConfig, FEERATE_FALLBACK_STATIC_FEE
FailHtlc = namedtuple("FailHtlc", ["htlc_id"])
SettleHtlc = namedtuple("SettleHtlc", ["htlc_id"])
RevokeAndAck = namedtuple("RevokeAndAck", ["per_commitment_secret", "next_per_commitment_point"]) RevokeAndAck = namedtuple("RevokeAndAck", ["per_commitment_secret", "next_per_commitment_point"])
class FeeUpdateProgress(Enum): class FeeUpdateProgress(Enum):
@ -100,14 +98,6 @@ def typeWrap(k, v, local):
return v return v
class HTLCStateMachine(PrintError): class HTLCStateMachine(PrintError):
def lookup_htlc(self, log, htlc_id):
assert type(htlc_id) is int
for htlc in log:
if type(htlc) is not UpdateAddHtlc: continue
if htlc.htlc_id == htlc_id:
return htlc
assert False, self.diagnostic_name() + ": htlc_id {} not found in {}".format(htlc_id, log)
def diagnostic_name(self): def diagnostic_name(self):
return str(self.name) return str(self.name)
@ -146,18 +136,13 @@ class HTLCStateMachine(PrintError):
# any past commitment transaction and use that instead; until then... # any past commitment transaction and use that instead; until then...
self.remote_commitment_to_be_revoked = Transaction(state["remote_commitment_to_be_revoked"]) self.remote_commitment_to_be_revoked = Transaction(state["remote_commitment_to_be_revoked"])
self.log = {LOCAL: [], REMOTE: []} template = lambda: {'adds': {}, 'settles': []}
self.log = {LOCAL: template(), REMOTE: template()}
for strname, subject in [('remote_log', REMOTE), ('local_log', LOCAL)]: for strname, subject in [('remote_log', REMOTE), ('local_log', LOCAL)]:
if strname not in state: continue if strname not in state: continue
for typ,y in state[strname]: for y in state[strname]:
if typ == "UpdateAddHtlc": htlc = UpdateAddHtlc(*decodeAll(y))
self.log[subject].append(UpdateAddHtlc(*decodeAll(y))) self.log[subject]['adds'][htlc.htlc_id] = htlc
elif typ == "SettleHtlc":
self.log[subject].append(SettleHtlc(*decodeAll(y)))
elif typ == "FailHtlc":
self.log[subject].append(FailHtlc(*decodeAll(y)))
else:
assert False
self.name = name self.name = name
@ -197,7 +182,7 @@ class HTLCStateMachine(PrintError):
""" """
assert type(htlc) is dict assert type(htlc) is dict
htlc = UpdateAddHtlc(**htlc, htlc_id=self.local_state.next_htlc_id) htlc = UpdateAddHtlc(**htlc, htlc_id=self.local_state.next_htlc_id)
self.log[LOCAL].append(htlc) self.log[LOCAL]['adds'][htlc.htlc_id] = htlc
self.print_error("add_htlc") self.print_error("add_htlc")
self.local_state=self.local_state._replace(next_htlc_id=htlc.htlc_id + 1) self.local_state=self.local_state._replace(next_htlc_id=htlc.htlc_id + 1)
return htlc.htlc_id return htlc.htlc_id
@ -210,7 +195,7 @@ class HTLCStateMachine(PrintError):
""" """
assert type(htlc) is dict assert type(htlc) is dict
htlc = UpdateAddHtlc(**htlc, htlc_id = self.remote_state.next_htlc_id) htlc = UpdateAddHtlc(**htlc, htlc_id = self.remote_state.next_htlc_id)
self.log[REMOTE].append(htlc) self.log[REMOTE]['adds'][htlc.htlc_id] = htlc
self.print_error("receive_htlc") self.print_error("receive_htlc")
self.remote_state=self.remote_state._replace(next_htlc_id=htlc.htlc_id + 1) self.remote_state=self.remote_state._replace(next_htlc_id=htlc.htlc_id + 1)
return htlc.htlc_id return htlc.htlc_id
@ -228,9 +213,8 @@ class HTLCStateMachine(PrintError):
any). The HTLC signatures are sorted according to the BIP 69 order of the any). The HTLC signatures are sorted according to the BIP 69 order of the
HTLC's on the commitment transaction. HTLC's on the commitment transaction.
""" """
for htlc in self.log[LOCAL]: for htlc in self.log[LOCAL]['adds'].values():
if not type(htlc) is UpdateAddHtlc: continue if htlc.locked_in[LOCAL] is None:
if htlc.locked_in[LOCAL] is None and FailHtlc(htlc.htlc_id) not in self.log[REMOTE]:
htlc.locked_in[LOCAL] = self.local_state.ctn htlc.locked_in[LOCAL] = self.local_state.ctn
self.print_error("sign_next_commitment") self.print_error("sign_next_commitment")
@ -279,9 +263,8 @@ class HTLCStateMachine(PrintError):
""" """
self.print_error("receive_new_commitment") self.print_error("receive_new_commitment")
for htlc in self.log[REMOTE]: for htlc in self.log[REMOTE]['adds'].values():
if not type(htlc) is UpdateAddHtlc: continue if htlc.locked_in[REMOTE] is None:
if htlc.locked_in[REMOTE] is None and FailHtlc(htlc.htlc_id) not in self.log[LOCAL]:
htlc.locked_in[REMOTE] = self.remote_state.ctn htlc.locked_in[REMOTE] = self.remote_state.ctn
assert len(htlc_sigs) == 0 or type(htlc_sigs[0]) is bytes assert len(htlc_sigs) == 0 or type(htlc_sigs[0]) is bytes
@ -422,18 +405,15 @@ class HTLCStateMachine(PrintError):
def mark_settled(subject): def mark_settled(subject):
""" """
find settled htlcs for subject (LOCAL or REMOTE) and mark them settled, return value of settled htlcs find pending settlements for subject (LOCAL or REMOTE) and mark them settled, return value of settled htlcs
""" """
old_amount = self.htlcsum(self.gen_htlc_indices(subject, False)) old_amount = self.htlcsum(self.gen_htlc_indices(subject, False))
removed = [] for htlc_id in self.log[-subject]['settles']:
for x in self.log[-subject]: adds = self.log[subject]['adds']
if type(x) is not SettleHtlc: continue htlc = adds.pop(htlc_id)
htlc = self.lookup_htlc(self.log[subject], x.htlc_id)
self.settled[subject].append(htlc.amount_msat) self.settled[subject].append(htlc.amount_msat)
self.log[subject].remove(htlc) self.log[-subject]['settles'].clear()
removed.append(x)
for x in removed: self.log[-subject].remove(x)
return old_amount - self.htlcsum(self.gen_htlc_indices(subject, False)) return old_amount - self.htlcsum(self.gen_htlc_indices(subject, False))
@ -533,12 +513,10 @@ class HTLCStateMachine(PrintError):
update_log = self.log[subject] update_log = self.log[subject]
other_log = self.log[-subject] other_log = self.log[-subject]
res = [] res = []
for htlc in update_log: for htlc in update_log['adds'].values():
if type(htlc) is not UpdateAddHtlc:
continue
locked_in = htlc.locked_in[subject] locked_in = htlc.locked_in[subject]
if locked_in is None or only_pending == (SettleHtlc(htlc.htlc_id) in other_log): if locked_in is None or only_pending == (htlc.htlc_id in other_log['settles']):
continue continue
res.append(htlc) res.append(htlc)
return res return res
@ -558,23 +536,19 @@ class HTLCStateMachine(PrintError):
SettleHTLC attempts to settle an existing outstanding received HTLC. SettleHTLC attempts to settle an existing outstanding received HTLC.
""" """
self.print_error("settle_htlc") self.print_error("settle_htlc")
htlc = self.lookup_htlc(self.log[REMOTE], htlc_id) htlc = self.log[REMOTE]['adds'][htlc_id]
assert htlc.payment_hash == sha256(preimage) assert htlc.payment_hash == sha256(preimage)
self.log[LOCAL].append(SettleHtlc(htlc_id)) self.log[LOCAL]['settles'].append(htlc_id)
def receive_htlc_settle(self, preimage, htlc_index): def receive_htlc_settle(self, preimage, htlc_index):
self.print_error("receive_htlc_settle") self.print_error("receive_htlc_settle")
htlc = self.lookup_htlc(self.log[LOCAL], htlc_index) htlc = self.log[LOCAL]['adds'][htlc_index]
assert htlc.payment_hash == sha256(preimage) assert htlc.payment_hash == sha256(preimage)
assert len([x for x in self.log[LOCAL] if x.htlc_id == htlc_index and type(x) is UpdateAddHtlc]) == 1, (self.log[LOCAL], htlc_index) self.log[REMOTE]['settles'].append(htlc_index)
self.log[REMOTE].append(SettleHtlc(htlc_index))
def receive_fail_htlc(self, htlc_id): def receive_fail_htlc(self, htlc_id):
self.print_error("receive_fail_htlc") self.print_error("receive_fail_htlc")
htlc = self.lookup_htlc(self.log[LOCAL], htlc_id) self.log[LOCAL]['adds'].pop(htlc_id)
htlc.locked_in[LOCAL] = None
htlc.locked_in[REMOTE] = None
self.log[REMOTE].append(FailHtlc(htlc_id))
@property @property
def current_height(self): def current_height(self):
@ -604,14 +578,9 @@ class HTLCStateMachine(PrintError):
""" """
removed = [] removed = []
htlcs = [] htlcs = []
for i in self.log[subject]: for i in self.log[subject]['adds'].values():
if type(i) is not UpdateAddHtlc:
htlcs.append(i)
continue
settled = SettleHtlc(i.htlc_id) in self.log[-subject]
failed = FailHtlc(i.htlc_id) in self.log[-subject]
locked_in = i.locked_in[LOCAL] is not None or i.locked_in[REMOTE] is not None locked_in = i.locked_in[LOCAL] is not None or i.locked_in[REMOTE] is not None
if locked_in or settled or failed: if locked_in:
htlcs.append(i) htlcs.append(i)
else: else:
removed.append(i.htlc_id) removed.append(i.htlc_id)
@ -634,8 +603,8 @@ class HTLCStateMachine(PrintError):
"funding_outpoint": self.funding_outpoint, "funding_outpoint": self.funding_outpoint,
"node_id": self.node_id, "node_id": self.node_id,
"remote_commitment_to_be_revoked": str(self.remote_commitment_to_be_revoked), "remote_commitment_to_be_revoked": str(self.remote_commitment_to_be_revoked),
"remote_log": [(type(x).__name__, x) for x in remote_filtered], "remote_log": remote_filtered,
"local_log": [(type(x).__name__, x) for x in local_filtered], "local_log": local_filtered,
"onion_keys": {str(k): bh2u(v) for k, v in self.onion_keys.items()}, "onion_keys": {str(k): bh2u(v) for k, v in self.onion_keys.items()},
"settled_local": self.settled[LOCAL], "settled_local": self.settled[LOCAL],
"settled_remote": self.settled[REMOTE], "settled_remote": self.settled[REMOTE],
@ -662,12 +631,6 @@ class HTLCStateMachine(PrintError):
return binascii.hexlify(o).decode("ascii") return binascii.hexlify(o).decode("ascii")
if isinstance(o, RevocationStore): if isinstance(o, RevocationStore):
return o.serialize() return o.serialize()
if isinstance(o, SettleHtlc):
return json.dumps(('SettleHtlc', namedtuples_to_dict(o)))
if isinstance(o, FailHtlc):
return json.dumps(('FailHtlc', namedtuples_to_dict(o)))
if isinstance(o, UpdateAddHtlc):
return json.dumps(('UpdateAddHtlc', namedtuples_to_dict(o)))
return super(MyJsonEncoder, self) return super(MyJsonEncoder, self)
dumped = MyJsonEncoder().encode(serialized_channel) dumped = MyJsonEncoder().encode(serialized_channel)
roundtripped = json.loads(dumped) roundtripped = json.loads(dumped)

2
electrum/tests/test_lnhtlc.py
View file

@ -147,7 +147,7 @@ class TestLNBaseHTLCStateMachine(unittest.TestCase):
self.aliceHtlcIndex = self.alice_channel.add_htlc(self.htlc) self.aliceHtlcIndex = self.alice_channel.add_htlc(self.htlc)
self.bobHtlcIndex = self.bob_channel.receive_htlc(self.htlc) self.bobHtlcIndex = self.bob_channel.receive_htlc(self.htlc)
self.htlc = self.bob_channel.log[lnutil.REMOTE][0] self.htlc = self.bob_channel.log[lnutil.REMOTE]['adds'][0]
def test_SimpleAddSettleWorkflow(self): def test_SimpleAddSettleWorkflow(self):
alice_channel, bob_channel = self.alice_channel, self.bob_channel alice_channel, bob_channel = self.alice_channel, self.bob_channel