From 1c0c2f0e63b82e4a61a3e47c4d9de04d02c0835a Mon Sep 17 00:00:00 2001 From: tim Date: Sat, 15 Mar 2025 06:26:01 -0400 Subject: [PATCH] "address_meta None" fix --- src/dexorder/order/orderstate.py | 22 +++++++++++----------- src/dexorder/pools.py | 8 ++++++-- src/dexorder/tokens.py | 4 +++- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/dexorder/order/orderstate.py b/src/dexorder/order/orderstate.py index b913854..1931394 100644 --- a/src/dexorder/order/orderstate.py +++ b/src/dexorder/order/orderstate.py @@ -295,17 +295,17 @@ class Order: async def pprint(self): amount_token = self.order.tokenIn if self.order.amountIsInput else self.order.tokenOut msg = f''' - SwapOrder {self.key} - status: {self.state.name} - placed: {from_timestamp(self.status.startTime)} - in: {self.order.tokenIn} - out: {self.order.tokenOut} - 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 ""} - minFill: {await adjust_decimals(amount_token, self.min_fill_amount):f} - inverted: {self.order.inverted} - tranches: - ''' +SwapOrder {self.key} + status: {self.state.name} + placed: {from_timestamp(self.status.startTime)} + in: {self.order.tokenIn} + out: {self.order.tokenOut} + 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 ""} + minFill: {await adjust_decimals(amount_token, self.min_fill_amount):f} + inverted: {self.order.inverted} + tranches: +''' for i in range(len(self.order.tranches)): tranche = self.order.tranches[i] msg += f' {tranche}' diff --git a/src/dexorder/pools.py b/src/dexorder/pools.py index ba6a7e8..947b871 100644 --- a/src/dexorder/pools.py +++ b/src/dexorder/pools.py @@ -27,12 +27,16 @@ async def get_pool(address: str) -> OldPoolDict: # noinspection PyTypeChecker result: OldPoolDict = address_metadata[address] 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: if (result['exchange'] == Exchange.UniswapV3.value and (result['base'] == ADDRESS_0 or result['quote'] == ADDRESS_0)): 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 diff --git a/src/dexorder/tokens.py b/src/dexorder/tokens.py index a85d678..75bce5e 100644 --- a/src/dexorder/tokens.py +++ b/src/dexorder/tokens.py @@ -52,7 +52,9 @@ async def get_token(address) -> Optional[OldTokenDict]: # noinspection PyTypeChecker return address_metadata[address] 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