"address_meta None" fix
This commit is contained in:
@@ -295,17 +295,17 @@ class Order:
|
|||||||
async def pprint(self):
|
async def pprint(self):
|
||||||
amount_token = self.order.tokenIn if self.order.amountIsInput else self.order.tokenOut
|
amount_token = self.order.tokenIn if self.order.amountIsInput else self.order.tokenOut
|
||||||
msg = f'''
|
msg = f'''
|
||||||
SwapOrder {self.key}
|
SwapOrder {self.key}
|
||||||
status: {self.state.name}
|
status: {self.state.name}
|
||||||
placed: {from_timestamp(self.status.startTime)}
|
placed: {from_timestamp(self.status.startTime)}
|
||||||
in: {self.order.tokenIn}
|
in: {self.order.tokenIn}
|
||||||
out: {self.order.tokenOut}
|
out: {self.order.tokenOut}
|
||||||
exchange: {self.order.route.exchange.name, self.order.route.fee}
|
exchange: {self.order.route.exchange.name, self.order.route.fee}
|
||||||
amount: {"input" if self.order.amountIsInput else "output"} {await adjust_decimals(amount_token, self.filled):f}/{await adjust_decimals(amount_token, self.amount):f}{" to owner" if self.order.outputDirectlyToOwner else ""}
|
amount: {"input" if self.order.amountIsInput else "output"} {await adjust_decimals(amount_token, self.filled):f}/{await adjust_decimals(amount_token, self.amount):f}{" to owner" if self.order.outputDirectlyToOwner else ""}
|
||||||
minFill: {await adjust_decimals(amount_token, self.min_fill_amount):f}
|
minFill: {await adjust_decimals(amount_token, self.min_fill_amount):f}
|
||||||
inverted: {self.order.inverted}
|
inverted: {self.order.inverted}
|
||||||
tranches:
|
tranches:
|
||||||
'''
|
'''
|
||||||
for i in range(len(self.order.tranches)):
|
for i in range(len(self.order.tranches)):
|
||||||
tranche = self.order.tranches[i]
|
tranche = self.order.tranches[i]
|
||||||
msg += f' {tranche}'
|
msg += f' {tranche}'
|
||||||
|
|||||||
@@ -27,12 +27,16 @@ async def get_pool(address: str) -> OldPoolDict:
|
|||||||
# noinspection PyTypeChecker
|
# noinspection PyTypeChecker
|
||||||
result: OldPoolDict = address_metadata[address]
|
result: OldPoolDict = address_metadata[address]
|
||||||
except KeyError:
|
except KeyError:
|
||||||
result = address_metadata[address] = await load_pool(address)
|
result = await load_pool(address)
|
||||||
|
if result is not None:
|
||||||
|
address_metadata[address] = result
|
||||||
else:
|
else:
|
||||||
if (result['exchange'] == Exchange.UniswapV3.value and
|
if (result['exchange'] == Exchange.UniswapV3.value and
|
||||||
(result['base'] == ADDRESS_0 or result['quote'] == ADDRESS_0)):
|
(result['base'] == ADDRESS_0 or result['quote'] == ADDRESS_0)):
|
||||||
log.warning(f'Repairing bad pool {address}')
|
log.warning(f'Repairing bad pool {address}')
|
||||||
result = address_metadata[address] = await load_pool(address, use_db=False)
|
result = await load_pool(address, use_db=False)
|
||||||
|
if result is not None:
|
||||||
|
address_metadata[address] = result
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -52,7 +52,9 @@ async def get_token(address) -> Optional[OldTokenDict]:
|
|||||||
# noinspection PyTypeChecker
|
# noinspection PyTypeChecker
|
||||||
return address_metadata[address]
|
return address_metadata[address]
|
||||||
except KeyError:
|
except KeyError:
|
||||||
result = address_metadata[address] = await load_token(address)
|
result = await load_token(address)
|
||||||
|
if result is not None:
|
||||||
|
address_metadata[address] = result
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user