fix malformed supports and amount in cache

This commit is contained in:
Kay Kurokawa 2017-07-11 09:40:20 -04:00 committed by Jack Robison
parent cbd85cd7d8
commit 4bebfe9e25
No known key found for this signature in database
GPG key ID: 284699E7404E3CFF

View file

@ -295,6 +295,42 @@ class SqliteStorage(MetaDataStorage):
response = result[0][0] response = result[0][0]
defer.returnValue(response) defer.returnValue(response)
@rerun_if_locked
@defer.inlineCallbacks
def _fix_malformed_supports_amount(self, row_id, supports, amount):
"""
this fixes malformed supports and amounts that were entering the cache
support list of [txid, nout, amount in deweys] instead of list of
{'txid':,'nout':,'amount':}, with amount specified in dewey
and also supports could be "[]" (brackets enclosed by double quotes)
This code can eventually be removed, as new versions should not have this problem
"""
fixed_supports = None
fixed_amount = None
supports = [] if not supports else json.loads(supports)
if isinstance(supports, (str, unicode)) and supports == '[]':
fixed_supports = []
elif len(supports) > 0 and not isinstance(supports[0], dict):
fixed_supports = []
fixed_amount = amount / 100000000.0
for support in supports:
fixed_supports.append(
{'txid':support[0], 'nout':support[1], 'amount':support[2]/100000000.0})
if fixed_supports is not None:
log.warn("Malformed support found, fixing it")
r = yield self.db.runOperation('UPDATE claim_cache SET supports=? WHERE row_id=?',
(json.dumps(fixed_supports), row_id))
supports = fixed_supports
if fixed_amount is not None:
log.warn("Malformed amount found, fixing it")
r = yield self.db.runOperation('UPDATE claim_cache SET amount=? WHERE row_id=?',
(fixed_amount, row_id))
amount = fixed_amount
defer.returnValue((json.dumps(supports), amount))
@rerun_if_locked @rerun_if_locked
@defer.inlineCallbacks @defer.inlineCallbacks
def _get_cached_claim(self, claim_id, check_expire=True): def _get_cached_claim(self, claim_id, check_expire=True):
@ -303,7 +339,8 @@ class SqliteStorage(MetaDataStorage):
"WHERE claimId=?", (claim_id, )) "WHERE claimId=?", (claim_id, ))
response = None response = None
if r and claim_tx_info: if r and claim_tx_info:
_, _, seq, claim_address, height, amount, supports, raw, chan_name, valid, ts = r[0] rid, _, seq, claim_address, height, amount, supports, raw, chan_name, valid, ts = r[0]
supports, amount = yield self._fix_malformed_supports_amount(rid, supports, amount)
last_modified = int(ts) last_modified = int(ts)
name, txid, nout = claim_tx_info[0] name, txid, nout = claim_tx_info[0]
claim = ClaimDict.deserialize(raw.decode('hex')) claim = ClaimDict.deserialize(raw.decode('hex'))