ibc fet luna1 dvpn fet luna2: refactor to remove terribly named api_c…

…ommon.py file

src/staketaxcsv/common/ibc/api_lcd_v1.py

@@ -6,14 +6,9 @@
 import requests
 import staketaxcsv.common.ibc.constants as co
 from staketaxcsv.common.debug_util import use_debug_files
-from staketaxcsv.common.ibc.api_common import (
-    EVENTS_TYPE_LIST_DEFAULT,
-    EVENTS_TYPE_RECIPIENT,
-    EVENTS_TYPE_SENDER,
-    EVENTS_TYPE_SIGNER,
-    TXS_LIMIT_PER_QUERY,
-    remove_duplicates,
-)
+from staketaxcsv.common.ibc.constants import TXS_LIMIT_PER_QUERY, EVENTS_TYPE_SENDER, EVENTS_TYPE_RECIPIENT, \
+    EVENTS_TYPE_SIGNER, EVENTS_TYPE_LIST_DEFAULT
+from staketaxcsv.common.ibc.util_ibc import remove_duplicates
 from staketaxcsv.settings_csv import REPORTS_DIR
 from staketaxcsv.common.query import get_with_retries
 

src/staketaxcsv/common/ibc/api_lcd_v2.py

@@ -4,13 +4,9 @@
 from staketaxcsv.common.ibc.api_lcd_v1 import LcdAPI_v1
 from staketaxcsv.settings_csv import REPORTS_DIR
 from staketaxcsv.common.debug_util import use_debug_files
-from staketaxcsv.common.ibc.api_common import (
-    EVENTS_TYPE_LIST_DEFAULT,
-    EVENTS_TYPE_RECIPIENT,
-    EVENTS_TYPE_SENDER,
-    EVENTS_TYPE_SIGNER,
-    remove_duplicates,
-)
+from staketaxcsv.common.ibc.constants import EVENTS_TYPE_SENDER, EVENTS_TYPE_RECIPIENT, EVENTS_TYPE_SIGNER, \
+    EVENTS_TYPE_LIST_DEFAULT
+from staketaxcsv.common.ibc.util_ibc import remove_duplicates
 
 TXS_LIMIT_PER_QUERY = 100
 

src/staketaxcsv/common/ibc/api_mintscan_v1.py

@@ -12,7 +12,7 @@
 
 from staketaxcsv.common.query import get_with_retries
 from staketaxcsv.settings_csv import MINTSCAN_KEY
-from staketaxcsv.common.ibc.api_common import remove_duplicates
+from staketaxcsv.common.ibc.util_ibc import remove_duplicates
 
 TXS_LIMIT_PER_QUERY = 20
 

src/staketaxcsv/common/ibc/api_rpc.py

@@ -10,13 +10,9 @@
 from dateutil import parser
 
 from staketaxcsv.common.query import get_with_retries
-from staketaxcsv.common.ibc.api_common import (
-    EVENTS_TYPE_LIST_DEFAULT,
-    EVENTS_TYPE_RECIPIENT,
-    EVENTS_TYPE_SENDER,
-    EVENTS_TYPE_SIGNER,
-    remove_duplicates,
-)
+from staketaxcsv.common.ibc.constants import EVENTS_TYPE_SENDER, EVENTS_TYPE_RECIPIENT, EVENTS_TYPE_SIGNER, \
+    EVENTS_TYPE_LIST_DEFAULT
+from staketaxcsv.common.ibc.util_ibc import remove_duplicates
 from staketaxcsv.common.ibc.protobuf_decoder import (
     CosmosTransactionFeeExtractor,
     ProtobufParser,

src/staketaxcsv/common/ibc/api_rpc_multinode.py

@@ -1,5 +1,6 @@
 import staketaxcsv.common.ibc.api_rpc
-from staketaxcsv.common.ibc.api_common import remove_duplicates
+from staketaxcsv.common.ibc.util_ibc import remove_duplicates
+
 LIMIT_TXS_PER_QUERY = 50
 
 

src/staketaxcsv/common/ibc/constants.py

@@ -15,7 +15,6 @@
 CUR_PSTAKE = "PSTAKE"
 CUR_USTC = "USTC"
 
-
 MSG_TYPE_ACKNOWLEDGMENT = "MsgAcknowledgement"
 MSG_TYPE_BEGIN_UNLOCKING = "MsgBeginUnlocking"
 MSG_TYPE_DELEGATE = "MsgDelegate"
@@ -41,6 +40,15 @@
 MSG_TYPE_TIMEOUT = "MsgTimeout"
 MSG_TYPE_MULTI_SEND = "MsgMultiSend"
 
+TXS_LIMIT_PER_QUERY = 50
+EVENTS_TYPE_SENDER = "sender"
+EVENTS_TYPE_RECIPIENT = "recipient"
+EVENTS_TYPE_SIGNER = "signer"
+EVENTS_TYPE_LIST_DEFAULT = [
+    EVENTS_TYPE_SENDER,
+    EVENTS_TYPE_RECIPIENT,
+]
+
 MINTSCAN_LABELS = {
     "AKT": "akash",
     "MNT": "asset-mantle",

src/staketaxcsv/common/ibc/txs_data.py

@@ -1,6 +1,7 @@
 """
 
-API wrapper to get transaction data.  Wrapper so that it is easy to switch between LCD and mintscan, as needed.
+API wrapper to get transaction data.  Wrapper so that it is easy to switch between
+LCD and mintscan transaction data, as needed.
 
 """
 import logging

src/staketaxcsv/common/ibc/util_ibc.py

@@ -13,3 +13,20 @@ def _ingest_rows(exporter, txinfo, msginfo, rows, comment):
             row.fee_currency = ""
 
         exporter.ingest_row(row)
+
+
+def remove_duplicates(elems, tx_hash_key="txhash", timestamp_sort=True):
+    out = []
+    txids = set()
+
+    for elem in elems:
+        if elem[tx_hash_key] in txids:
+            continue
+
+        out.append(elem)
+        txids.add(elem[tx_hash_key])
+
+    if timestamp_sort:
+        out.sort(key=lambda elem: elem["timestamp"], reverse=True)
+
+    return out

src/staketaxcsv/fet/fetchhub1/api_rpc.py

@@ -8,12 +8,8 @@
 import requests
 from dateutil import parser
 from staketaxcsv.common.debug_util import use_debug_files
-from staketaxcsv.common.ibc.api_common import (
-    EVENTS_TYPE_LIST_DEFAULT,
-    EVENTS_TYPE_RECIPIENT,
-    EVENTS_TYPE_SENDER,
-    EVENTS_TYPE_SIGNER,
-)
+from staketaxcsv.common.ibc.constants import EVENTS_TYPE_SENDER, EVENTS_TYPE_RECIPIENT, EVENTS_TYPE_SIGNER, \
+    EVENTS_TYPE_LIST_DEFAULT
 from staketaxcsv.fet.config_fet import localconfig
 from staketaxcsv.settings_csv import REPORTS_DIR
 

src/staketaxcsv/luna1/api_lcd.py

@@ -9,7 +9,7 @@
 from urllib.parse import urlencode
 
 import requests
-from staketaxcsv.common.ibc.api_common import EVENTS_TYPE_RECIPIENT, EVENTS_TYPE_SENDER, EVENTS_TYPE_SIGNER
+from staketaxcsv.common.ibc.constants import EVENTS_TYPE_SENDER, EVENTS_TYPE_RECIPIENT, EVENTS_TYPE_SIGNER
 from staketaxcsv.settings_csv import TERRA_NODE
 
 LIMIT_TX_QUERY = 50

src/staketaxcsv/report_dvpn.py

@@ -7,8 +7,8 @@
 
 import logging
 
-import staketaxcsv.common.ibc.api_common
 import staketaxcsv.common.ibc.api_rpc
+import staketaxcsv.common.ibc.constants
 import staketaxcsv.dvpn.processor
 from staketaxcsv.common import report_util
 from staketaxcsv.common.Cache import Cache
@@ -83,7 +83,7 @@ def txhistory(wallet_address):
     # RPC - fetch transactions
     rpc_elems = staketaxcsv.common.ibc.api_rpc.get_txs_all(
         DVPN_NODE_RPC, wallet_address, max_txs, progress=progress, stage_name="rpc",
-        events_types=[staketaxcsv.common.ibc.api_common.EVENTS_TYPE_SENDER])
+        events_types=[staketaxcsv.common.ibc.constants.EVENTS_TYPE_SENDER])
 
     # See if there were any missing transactions between the LCD and RPC scans
     lcd_tx_hashes = set([e["txhash"] for e in lcd_elems])

src/staketaxcsv/report_fet.py

@@ -14,7 +14,7 @@
 from staketaxcsv.common import report_util
 from staketaxcsv.common.Cache import Cache
 from staketaxcsv.common.Exporter import Exporter
-from staketaxcsv.common.ibc.api_lcd_v1 import EVENTS_TYPE_RECIPIENT, EVENTS_TYPE_SENDER, EVENTS_TYPE_SIGNER
+from staketaxcsv.common.ibc.constants import EVENTS_TYPE_SENDER, EVENTS_TYPE_RECIPIENT, EVENTS_TYPE_SIGNER
 from staketaxcsv.fet.config_fet import localconfig
 from staketaxcsv.fet.fetchhub1 import constants as co2
 from staketaxcsv.fet.fetchhub1.api_rpc import FetRpcAPI

src/staketaxcsv/report_luna2.py

@@ -15,7 +15,6 @@
 import pprint
 
 import staketaxcsv.api
-import staketaxcsv.common.ibc.api_common
 import staketaxcsv.common.ibc.api_lcd_v1
 import staketaxcsv.luna2.genesis_airdrop
 import staketaxcsv.luna2.processor