diff --git a/planetmint/backend/tarantool/query.py b/planetmint/backend/tarantool/query.py index 8c28643..9cc28b5 100644 --- a/planetmint/backend/tarantool/query.py +++ b/planetmint/backend/tarantool/query.py @@ -171,7 +171,7 @@ def get_assets(connection, assets_ids: list) -> list: asset = get_asset(connection, _id) _returned_data.append(asset) - return sorted(_returned_data, key=lambda k: k["id"], reverse=False) + return sorted(_returned_data, key=lambda k: ("id" not in k, k.get("id", None)), reverse=False) @register_query(TarantoolDBConnection) diff --git a/planetmint/transactions/common/transaction.py b/planetmint/transactions/common/transaction.py index 9189373..2f75f2f 100644 --- a/planetmint/transactions/common/transaction.py +++ b/planetmint/transactions/common/transaction.py @@ -693,7 +693,8 @@ class Transaction(object): assets = list(planet.get_assets(tx_ids)) for asset in assets: if asset is not None: - tx = tx_map[asset[1]] + if 'id' in asset: + tx = tx_map[asset['id']] tx['asset'] = asset tx_ids = list(tx_map.keys())