Just try to fix logs

proxy/common_neon/utils/utils.py

@@ -117,9 +117,7 @@ def _decode_event(self, neon_sign, log, tx_idx):
             'transactionLogIndex': hex(log_idx),
             'transactionIndex': hex(tx_idx),
             'logIndex': hex(log_idx),
-            'transactionHash': neon_sign,
-            # 'blockNumber': block_number, # set when transaction found
-            # 'blockHash': block_hash # set when transaction found
+            'transactionHash': neon_sign
         }
         self.logs.append(rec)
 

proxy/memdb/transactions_db.py

@@ -83,6 +83,8 @@ def _has_topics(src_topics, dst_topics):
             return False
 
         result_list = []
+        indexed_logs = self._db.get_logs(from_block, to_block, addresses, topics, block_hash)
+
         with self._tx_slot.get_lock():
             for data in self._tx_by_neon_sign.values():
                 tx = pickle.loads(data)
@@ -97,9 +99,11 @@ def _has_topics(src_topics, dst_topics):
                         continue
                     if len(topics) and (not _has_topics(topics, log['topics'])):
                         continue
+                    if log in indexed_logs:
+                        continue
                     result_list.append(log)
 
-        return result_list + self._db.get_logs(from_block, to_block, addresses, topics, block_hash)
+        return indexed_logs + result_list
 
     def get_sol_sign_list_by_neon_sign(self, neon_sign: str, is_pended_tx: bool, before_slot: int) -> [str]:
         if not is_pended_tx:

proxy/testing/test_eth_getLogs.py

@@ -182,5 +182,6 @@ def test_get_logs_by_address(self):
         print('receipts: ', receipts)
         self.assertEqual(len(receipts), 6)
 
+
 if __name__ == '__main__':
     unittest.main()