sol akt evmos juno strd tia: added defaults where minimal impact on s…

…aid node. refactored txids code

sample.env

@@ -9,17 +9,11 @@
 # Required for ARCH/ATOM/EVMOS/JUNO/OSMO/STRD/TIA (See https://api.mintscan.io for details on key)
 STAKETAX_MINTSCAN_KEY=""
 
-STAKETAX_AKT_NODE=""
 STAKETAX_BLD_NODE_RPC=""
-STAKETAX_EVMOS_NODE=""
 STAKETAX_HUAHUA_NODE=""
-STAKETAX_JUNO_NODE=""
 STAKETAX_KUJI_NODE=""
 STAKETAX_REGEN_NODE=""
-STAKETAX_REGEN_NODE=""
 STAKETAX_ROWAN_NODE=""
 STAKETAX_SCRT_NODE=""
 STAKETAX_STARS_NODE=""
-STAKETAX_STRD_NODE=""
-STAKETAX_TIA_NODE=""
 STAKETAX_TORI_NODE=""

src/staketaxcsv/settings_csv.py

@@ -6,7 +6,7 @@
 
 # Environment variables (required for each respective report)
 
-AKT_NODE = os.environ.get("STAKETAX_AKT_NODE", "")
+AKT_NODE = os.environ.get("STAKETAX_AKT_NODE", "https://akash-api.polkachu.com")
 ALGO_HIST_INDEXER_NODE = os.environ.get("STAKETAX_ALGO_HIST_INDEXER_NODE", "https://indexer.algoexplorerapi.io")
 ALGO_INDEXER_NODE = os.environ.get("STAKETAX_ALGO_INDEXER_NODE", "https://mainnet-idx.algonode.cloud")
 ALGO_NFDOMAINS = os.environ.get("STAKETAX_ALGO_NFDOMAINS", "https://api.nf.domains")
@@ -17,18 +17,10 @@
 BTSG_NODE = os.environ.get("STAKETAX_BTSG_NODE", "https://lcd.explorebitsong.com")
 DVPN_NODE = os.environ.get("STAKETAX_DVPN_NODE", "https://lcd.sentinel.co")
 DVPN_NODE_RPC = os.environ.get("STAKETAX_DVPN_NODE_RPC", "https://rpc.sentinel.co")
-EVMOS_NODE = os.environ.get("STAKETAX_EVMOS_NODE", "")
+EVMOS_NODE = os.environ.get("STAKETAX_EVMOS_NODE", "https://rest-evmos.ecostake.com")
 FET_NODE = os.environ.get("STAKETAX_FET_NODE", "https://rest-fetchhub.fetch.ai")
 HUAHUA_NODE = os.environ.get("STAKETAX_HUAHUA_NODE", "")
-JUNO_NODE = os.environ.get("STAKETAX_JUNO_NODE", "")
-
-# Deprecated
-JUNO_NODES_RPC = [
-    "https://rpc-archive.junonetwork.io",      # 4136532 to now
-    "https://rpc-v3-archive.junonetwork.io",   # 2578099 to #4136530
-    "https://rpc-v2-archive.junonetwork.io",   # 1 to #2578097
-]
-
+JUNO_NODE = os.environ.get("STAKETAX_JUNO_NODE", "https://juno-api.polkachu.com")
 KUJI_NODE = os.environ.get("STAKETAX_KUJI_NODE", "")
 KYVE_NODE = os.environ.get("STAKETAX_KYVE_NODE", "https://api-eu-1.kyve.network")
 LUNA1_NODE = os.environ.get("STAKETAX_LUNA1_NODE", "https://lcd.terra.dev")
@@ -40,8 +32,8 @@
 SCRT_NODE = os.environ.get("STAKETAX_SCRT_NODE", "")
 SOL_NODE = os.environ.get("STAKETAX_SOL_NODE", "https://api.mainnet-beta.solana.com")
 STARS_NODE = os.environ.get("STAKETAX_STARS_NODE", "")
-STRD_NODE = os.environ.get("STAKETAX_STRD_NODE", "")
-TIA_NODE = os.environ.get("STAKETAX_TIA_NODE", "")
+STRD_NODE = os.environ.get("STAKETAX_STRD_NODE", "https://lcd-stride.whispernode.com")
+TIA_NODE = os.environ.get("STAKETAX_TIA_NODE", "https://celestia.api.kjnodes.com")
 TORI_NODE = os.environ.get("STAKETAX_TORI_NODE", "")
 
 

src/staketaxcsv/sol/txids.py

@@ -59,7 +59,6 @@ def _txids_one_account(address, start_date, end_date, max_txs, txids_seen):
 
     out = []
     before_txid = None
-    keep_fetching = True
     for j in range(ABSOLUTE_MAX_QUERIES):
         logging.info("query %s for address=%s, before_txid=%s", j, address, before_txid)
         txids, before_txid = RpcAPI.get_txids(address, limit=LIMIT_PER_QUERY, before_txid=before_txid)
@@ -78,18 +77,15 @@ def _txids_one_account(address, start_date, end_date, max_txs, txids_seen):
 
             # Reached start_date case
             if start_date is not None and block_time < start_ts:
-                keep_fetching = False
-                break
+                return out
+
+            # Reached max transaction limit case
+            if len(out) >= max_txs:
+                return out
 
         # No more transactions for address case
         if before_txid is None:
-            keep_fetching = False
-        # Reached max transaction limit case
-        if len(out) > max_txs:
-            keep_fetching = False
-
-        if not keep_fetching:
-            break
+            return out
 
     return out