Fixes after merge with 0.4

crawlers/deploy/xai-sepolia-missing.service

@@ -6,6 +6,6 @@ After=network.target
 Type=oneshot
 WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl
 EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
-ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler --access-id "${NB_CONTROLLER_ACCESS_ID}" blocks missing --blockchain xai_sepolia -n
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler blocks missing --blockchain xai_sepolia -n
 CPUWeight=50
 SyslogIdentifier=xai-sepolia-missing

crawlers/deploy/xai-sepolia-moonworm-crawler.service

@@ -9,7 +9,7 @@ WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl
 EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
 Restart=on-failure
 RestartSec=15s
-ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.moonworm_crawler.cli --access-id "${NB_CONTROLLER_ACCESS_ID}" crawl -b xai_sepolia --confirmations 10 --min-blocks-batch 20
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.moonworm_crawler.cli crawl -b xai_sepolia --confirmations 10 --min-blocks-batch 20
 CPUWeight=70
 SyslogIdentifier=xai-sepolia-moonworm-crawler
 

crawlers/deploy/xai-sepolia-synchronize.service

@@ -9,7 +9,7 @@ Restart=on-failure
 RestartSec=15s
 WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl
 EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
-ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler --access-id "${NB_CONTROLLER_ACCESS_ID}" blocks synchronize --blockchain xai_sepolia -c 10 -j 2
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler blocks synchronize --blockchain xai_sepolia -c 10 -j 2
 CPUWeight=90
 SyslogIdentifier=xai-sepolia-synchronize
 

crawlers/mooncrawl/mooncrawl/blockchain.py

@@ -175,7 +175,10 @@ def add_block(db_session, block: Any, blockchain_type: AvailableBlockchainType)
         block_obj.send_root = block.get("sendRoot", "")
         block_obj.mix_hash = block.get("mixHash", "")
 
-    if blockchain_type == AvailableBlockchainType.XAI or blockchain_type == AvailableBlockchainType.XAI_SEPOLIA:
+    if (
+        blockchain_type == AvailableBlockchainType.XAI
+        or blockchain_type == AvailableBlockchainType.XAI_SEPOLIA
+    ):
         block_obj.sha3_uncles = block.get("sha3Uncles", "")
         block_obj.l1_block_number = hex_to_int(block.get("l1BlockNumber"))
         block_obj.send_count = hex_to_int(block.get("sendCount"))

crawlers/mooncrawl/mooncrawl/settings.py

@@ -150,7 +150,9 @@ MOONSTREAM_NODE_XAI_SEPOLIA_A_EXTERNAL_URI = os.environ.get(
     "MOONSTREAM_NODE_XAI_SEPOLIA_A_EXTERNAL_URI", ""
 )
 if MOONSTREAM_NODE_XAI_SEPOLIA_A_EXTERNAL_URI == "":
-    raise Exception("MOONSTREAM_NODE_XAI_SEPOLIA_A_EXTERNAL_URI env variable is not set")
+    raise Exception(
+        "MOONSTREAM_NODE_XAI_SEPOLIA_A_EXTERNAL_URI env variable is not set"
+    )
 
 MOONSTREAM_NODE_AVALANCHE_A_EXTERNAL_URI = os.environ.get(
     "MOONSTREAM_NODE_AVALANCHE_A_EXTERNAL_URI", ""

crawlers/mooncrawl/mooncrawl/stats_worker/dashboard.py

@@ -55,10 +55,13 @@ subscription_id_by_blockchain = {
     "wyrm": "wyrm_smartcontract",
     "zksync_era_testnet": "zksync_era_testnet_smartcontract",
     "zksync_era": "zksync_era_smartcontract",
+    "zksync_era_sepolia": "zksync_era_sepolia_smartcontract",
     "arbitrum_nova": "arbitrum_nova_smartcontract",
     "arbitrum_sepolia": "arbitrum_sepolia_smartcontract",
     "xai": "xai_smartcontract",
     "xai_sepolia": "xai_sepolia_smartcontract",
+    "avalanche": "avalanche_smartcontract",
+    "avalanche_fuji": "avalanche_fuji_smartcontract",
 }
 
 blockchain_by_subscription_id = {
@@ -68,10 +71,14 @@ blockchain_by_subscription_id = {
     "xdai_blockchain": "xdai",
     "wyrm_blockchain": "wyrm",
     "zksync_era_testnet_blockchain": "zksync_era_testnet",
+    "zksync_era_blockchain": "zksync_era",
+    "zksync_era_sepolia_blockchain": "zksync_era_sepolia",
     "arbitrum_nova_blockchain": "arbitrum_nova",
     "arbitrum_sepolia_blockchain": "arbitrum_sepolia",
     "xai_blockchain": "xai",
     "xai_sepolia_blockchain": "xai_sepolia",
+    "avalanche_blockchain": "avalanche",
+    "avalanche_fuji_blockchain": "avalanche_fuji",
     "ethereum_smartcontract": "ethereum",
     "polygon_smartcontract": "polygon",
     "mumbai_smartcontract": "mumbai",
@@ -79,10 +86,13 @@ blockchain_by_subscription_id = {
     "wyrm_smartcontract": "wyrm",
     "zksync_era_testnet_smartcontract": "zksync_era_testnet",
     "zksync_era_smartcontract": "zksync_era",
+    "zksync_era_sepolia_smartcontract": "zksync_era_sepolia",
     "arbitrum_nova_smartcontract": "arbitrum_nova",
     "arbitrum_sepolia_smartcontract": "arbitrum_sepolia",
     "xai_smartcontract": "xai",
     "xai_sepolia_smartcontract": "xai_sepolia",
+    "avalanche_smartcontract": "avalanche",
+    "avalanche_fuji_smartcontract": "avalanche_fuji",
 }