Compare commits

...

2 Commits

Author SHA1 Message Date
tim
4492d23c47 better "addrmeta is None" fix 2025-03-16 21:17:19 -04:00
tim
1c0c2f0e63 "address_meta None" fix 2025-03-15 06:26:01 -04:00
2 changed files with 14 additions and 12 deletions

View File

@@ -19,7 +19,9 @@ class AddressMetadata (TypedDict):
def save_addrmeta(address: str, meta: AddressMetadata): def save_addrmeta(address: str, meta: AddressMetadata):
if meta['type'] == 'Token': if meta is None:
pass
elif meta['type'] == 'Token':
meta: OldTokenDict meta: OldTokenDict
updated = Token.load(meta) updated = Token.load(meta)
token = db.session.get(Token, (current_chain.get().id, address)) token = db.session.get(Token, (current_chain.get().id, address))

View File

@@ -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}'