crawlers/deploy/amoy-historical-crawl-transactions.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=Amoy historical crawler transactions
-After=network.target
-StartLimitIntervalSec=300
-StartLimitBurst=3
-
-[Service]
-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 historical-crawl --blockchain-type amoy --find-deployed-blocks --end 0 --tasks-journal --only-functions
-CPUWeight=70
-SyslogIdentifier=amoy-historical-crawl-transactions
-
-[Install]
-WantedBy=multi-user.target

crawlers/deploy/deploy-basic.bash

@@ -43,10 +43,10 @@ POLYGON_MISSING_TIMER_FILE="polygon-missing.timer"
 POLYGON_CU_NFT_DASHBOARD_SERVICE_FILE="polygon-cu-nft-dashboard.service"
 POLYGON_CU_NFT_DASHBOARD_TIMER_FILE="polygon-cu-nft-dashboard.timer"
 
-# Amoy
-AMOY_MISSING_SERVICE_FILE="amoy-missing.service"
-AMOY_MISSING_TIMER_FILE="amoy-missing.timer"
-AMOY_SYNCHRONIZE_SERVICE="amoy-synchronize.service"
+# Mumbai service files
+MUMBAI_SYNCHRONIZE_SERVICE="mumbai-synchronize.service"
+MUMBAI_MISSING_SERVICE_FILE="mumbai-missing.service"
+MUMBAI_MISSING_TIMER_FILE="mumbai-missing.timer"
 
 # XDai service files
 XDAI_SYNCHRONIZE_SERVICE="xdai-synchronize.service"
@@ -103,11 +103,6 @@ BLAST_SEPOLIA_MISSING_SERVICE_FILE="blast-sepolia-missing.service"
 BLAST_SEPOLIA_MISSING_TIMER_FILE="blast-sepolia-missing.timer"
 BLAST_SEPOLIA_SYNCHRONIZE_SERVICE="blast-sepolia-synchronize.service"
 
-# ProofofPlay APEX
-PROOFOFPLAY_APEX_MISSING_SERVICE_FILE="proofofplay-apex-missing.service"
-PROOFOFPLAY_APEX_MISSING_TIMER_FILE="proofofplay-apex-missing.timer"
-PROOFOFPLAY_APEX_SYNCHRONIZE_SERVICE="proofofplay-apex-synchronize.service"
-
 set -eu
 
 echo
@@ -132,7 +127,7 @@ if [ ! -d "${SECRETS_DIR}" ]; then
   mkdir -p "${SECRETS_DIR}"
   echo -e "${PREFIX_WARN} Created new secrets directory"
 fi
-AWS_DEFAULT_REGION="${AWS_DEFAULT_REGION}" CHECKENV_AWS_FETCH_LOOP_LIMIT=20 /home/ubuntu/go/bin/checkenv show aws_ssm+moonstream:true > "${PARAMETERS_ENV_PATH}"
+AWS_DEFAULT_REGION="${AWS_DEFAULT_REGION}" /home/ubuntu/go/bin/checkenv show aws_ssm+moonstream:true > "${PARAMETERS_ENV_PATH}"
 chmod 0640 "${PARAMETERS_ENV_PATH}"
 
 echo
@@ -216,25 +211,23 @@ cp "${SCRIPT_DIR}/${POLYGON_CU_NFT_DASHBOARD_TIMER_FILE}" "/home/ubuntu/.config/
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${POLYGON_CU_NFT_DASHBOARD_TIMER_FILE}"
 
-# Amoy
 echo
 echo
-echo -e "${PREFIX_INFO} Replacing existing Amoy block with transactions syncronizer service definition with ${AMOY_SYNCHRONIZE_SERVICE}"
-chmod 644 "${SCRIPT_DIR}/${AMOY_SYNCHRONIZE_SERVICE}"
-cp "${SCRIPT_DIR}/${AMOY_SYNCHRONIZE_SERVICE}" "/home/ubuntu/.config/systemd/user/${AMOY_SYNCHRONIZE_SERVICE}"
+echo -e "${PREFIX_INFO} Replacing existing Mumbai block with transactions syncronizer service definition with ${MUMBAI_SYNCHRONIZE_SERVICE}"
+chmod 644 "${SCRIPT_DIR}/${MUMBAI_SYNCHRONIZE_SERVICE}"
+cp "${SCRIPT_DIR}/${MUMBAI_SYNCHRONIZE_SERVICE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_SYNCHRONIZE_SERVICE}"
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${AMOY_SYNCHRONIZE_SERVICE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${MUMBAI_SYNCHRONIZE_SERVICE}"
 
 echo
 echo
-echo -e "${PREFIX_INFO} Replacing existing Amoy missing service and timer with: ${AMOY_MISSING_SERVICE_FILE}, ${AMOY_MISSING_TIMER_FILE}"
-chmod 644 "${SCRIPT_DIR}/${AMOY_MISSING_SERVICE_FILE}" "${SCRIPT_DIR}/${AMOY_MISSING_TIMER_FILE}"
-cp "${SCRIPT_DIR}/${AMOY_MISSING_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${AMOY_MISSING_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${AMOY_MISSING_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${AMOY_MISSING_TIMER_FILE}"
+echo -e "${PREFIX_INFO} Replacing existing Mumbai missing service and timer with: ${MUMBAI_MISSING_SERVICE_FILE}, ${MUMBAI_MISSING_TIMER_FILE}"
+chmod 644 "${SCRIPT_DIR}/${MUMBAI_MISSING_SERVICE_FILE}" "${SCRIPT_DIR}/${MUMBAI_MISSING_TIMER_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_MISSING_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_MISSING_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_MISSING_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_MISSING_TIMER_FILE}"
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${AMOY_MISSING_TIMER_FILE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${MUMBAI_MISSING_TIMER_FILE}"
 
-# Xdai
 echo
 echo
 echo -e "${PREFIX_INFO} Replacing existing XDai block with transactions syncronizer service definition with ${XDAI_SYNCHRONIZE_SERVICE}"
@@ -423,21 +416,3 @@ cp "${SCRIPT_DIR}/${BLAST_SEPOLIA_MISSING_SERVICE_FILE}" "/home/ubuntu/.config/s
 cp "${SCRIPT_DIR}/${BLAST_SEPOLIA_MISSING_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${BLAST_SEPOLIA_MISSING_TIMER_FILE}"
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${BLAST_SEPOLIA_MISSING_TIMER_FILE}"
-
-# Proofofplay Apex
-echo
-echo
-echo -e "${PREFIX_INFO} Replacing existing Proofofplay Apex block with transactions syncronizer service definition with ${PROOFOFPLAY_APEX_SYNCHRONIZE_SERVICE}"
-chmod 644 "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_SYNCHRONIZE_SERVICE}"
-cp "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_SYNCHRONIZE_SERVICE}" "/home/ubuntu/.config/systemd/user/${PROOFOFPLAY_APEX_SYNCHRONIZE_SERVICE}"
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${PROOFOFPLAY_APEX_SYNCHRONIZE_SERVICE}"
-
-echo
-echo
-echo -e "${PREFIX_INFO} Replacing existing Proofofplay Apex missing service and timer with: ${PROOFOFPLAY_APEX_MISSING_SERVICE_FILE}, ${PROOFOFPLAY_APEX_MISSING_TIMER_FILE}"
-chmod 644 "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_MISSING_SERVICE_FILE}" "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_MISSING_TIMER_FILE}"
-cp "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_MISSING_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${PROOFOFPLAY_APEX_MISSING_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_MISSING_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${PROOFOFPLAY_APEX_MISSING_TIMER_FILE}"
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${PROOFOFPLAY_APEX_MISSING_TIMER_FILE}"

crawlers/deploy/deploy-historical.bash

@@ -36,11 +36,11 @@ POLYGON_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE="polygon-historical-crawl-trans
 POLYGON_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE="polygon-historical-crawl-events.service"
 POLYGON_HISTORICAL_CRAWL_EVENTS_TIMER_FILE="polygon-historical-crawl-events.timer"
 
-# Amoy service files
-AMOY_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE="amoy-historical-crawl-transactions.service"
-AMOY_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE="amoy-historical-crawl-transactions.timer"
-AMOY_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE="amoy-historical-crawl-events.service"
-AMOY_HISTORICAL_CRAWL_EVENTS_TIMER_FILE="amoy-historical-crawl-events.timer"
+# Mumbai service files
+MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE="mumbai-historical-crawl-transactions.service"
+MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE="mumbai-historical-crawl-transactions.timer"
+MUMBAI_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE="mumbai-historical-crawl-events.service"
+MUMBAI_HISTORICAL_CRAWL_EVENTS_TIMER_FILE="mumbai-historical-crawl-events.timer"
 
 # XDai service files
 XDai_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE="xdai-historical-crawl-transactions.service"
@@ -60,12 +60,6 @@ ZKSYNC_ERA_SEPOLIA_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE="zksync-era-sepolia-
 ZKSYNC_ERA_SEPOLIA_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE="zksync-era-sepolia-historical-crawl-events.service"
 ZKSYNC_ERA_SEPOLIA_HISTORICAL_CRAWL_EVENTS_TIMER_FILE="zksync-era-sepolia-historical-crawl-events.timer"
 
-# ProofofPlay APEX
-PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE="proofofplay-apex-historical-crawl-transactions.service"
-PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE="proofofplay-apex-historical-crawl-transactions.timer"
-PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE="proofofplay-apex-historical-crawl-events.service"
-PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_TIMER_FILE="proofofplay-apex-historical-crawl-events.timer"
-
 set -eu
 
 echo
@@ -90,7 +84,7 @@ if [ ! -d "${SECRETS_DIR}" ]; then
   mkdir -p "${SECRETS_DIR}"
   echo -e "${PREFIX_WARN} Created new secrets directory"
 fi
-AWS_DEFAULT_REGION="${AWS_DEFAULT_REGION}" CHECKENV_AWS_FETCH_LOOP_LIMIT=20 /home/ubuntu/go/bin/checkenv show aws_ssm+moonstream:true > "${PARAMETERS_ENV_PATH}"
+AWS_DEFAULT_REGION="${AWS_DEFAULT_REGION}" /home/ubuntu/go/bin/checkenv show aws_ssm+moonstream:true > "${PARAMETERS_ENV_PATH}"
 chmod 0640 "${PARAMETERS_ENV_PATH}"
 
 echo
@@ -143,21 +137,21 @@ XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${POLYGON_
 
 echo
 echo
-echo -e "${PREFIX_INFO} Replacing existing Amoy historical transactions crawler service and timer with: ${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}, ${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
-chmod 644 "${SCRIPT_DIR}/${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}" "${SCRIPT_DIR}/${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
-cp "${SCRIPT_DIR}/${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
+echo -e "${PREFIX_INFO} Replacing existing MUMBAI historical transactions crawler service and timer with: ${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}, ${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
+chmod 644 "${SCRIPT_DIR}/${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}" "${SCRIPT_DIR}/${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
 
 echo
 echo
-echo -e "${PREFIX_INFO} Replacing existing Amoy historical events crawler service and timer with: ${AMOY_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}, ${AMOY_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
-chmod 644 "${SCRIPT_DIR}/${AMOY_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}" "${SCRIPT_DIR}/${AMOY_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
-cp "${SCRIPT_DIR}/${AMOY_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${AMOY_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${AMOY_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${AMOY_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
+echo -e "${PREFIX_INFO} Replacing existing MUMBAI historical events crawler service and timer with: ${MUMBAI_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}, ${MUMBAI_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
+chmod 644 "${SCRIPT_DIR}/${MUMBAI_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}" "${SCRIPT_DIR}/${MUMBAI_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000"  systemctl --user restart --no-block "${AMOY_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
+XDG_RUNTIME_DIR="/run/user/1000"  systemctl --user restart --no-block "${MUMBAI_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
 
 echo
 echo
@@ -212,21 +206,3 @@ cp "${SCRIPT_DIR}/${ZKSYNC_ERA_SEPOLIA_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}" "/
 cp "${SCRIPT_DIR}/${ZKSYNC_ERA_SEPOLIA_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${ZKSYNC_ERA_SEPOLIA_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${ZKSYNC_ERA_SEPOLIA_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
-
-echo
-echo
-echo -e "${PREFIX_INFO} Replacing existing Proofofplay Apex historical transactions crawler service and timer with: ${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}, ${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
-chmod 644 "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}" "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
-cp "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
-
-echo
-echo
-echo -e "${PREFIX_INFO} Replacing existing Proofofplay Apex historical events crawler service and timer with: ${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}, ${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
-chmod 644 "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}" "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
-cp "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"

crawlers/deploy/deploy-moonworm.bash

@@ -27,7 +27,7 @@ SCRIPT_DIR="$(realpath $(dirname $0))"
 # Service files
 ETHEREUM_MOONWORM_CRAWLER_SERVICE_FILE="ethereum-moonworm-crawler.service"
 POLYGON_MOONWORM_CRAWLER_SERVICE_FILE="polygon-moonworm-crawler.service"
-AMOY_MOONWORM_CRAWLER_SERVICE_FILE="amoy-moonworm-crawler.service"
+MUMBAI_MOONWORM_CRAWLER_SERVICE_FILE="mumbai-moonworm-crawler.service"
 XDAI_MOONWORM_CRAWLER_SERVICE_FILE="xdai-moonworm-crawler.service"
 ZKSYNC_ERA_MOONWORM_CRAWLER_SERVICE_FILE="zksync-era-moonworm-crawler.service"
 ZKSYNC_ERA_SEPOLIA_MOONWORM_CRAWLER_SERVICE_FILE="zksync-era-sepolia-moonworm-crawler.service"
@@ -39,7 +39,6 @@ AVALANCHE_MOONWORM_CRAWLER_SERVICE_FILE="avalanche-moonworm-crawler.service"
 AVALANCHE_FUJI_MOONWORM_CRAWLER_SERVICE_FILE="avalanche-fuji-moonworm-crawler.service"
 BLAST_MOONWORM_CRAWLER_SERVICE_FILE="blast-moonworm-crawler.service"
 BLAST_SEPOLIA_MOONWORM_CRAWLER_SERVICE_FILE="blast-sepolia-moonworm-crawler.service"
-PROOFOFPLAY_APEX_MOONWORM_CRAWLER_SERVICE_FILE="proofofplay-apex-moonworm-crawler.service"
 
 set -eu
 
@@ -65,7 +64,7 @@ if [ ! -d "${SECRETS_DIR}" ]; then
   mkdir -p "${SECRETS_DIR}"
   echo -e "${PREFIX_WARN} Created new secrets directory"
 fi
-AWS_DEFAULT_REGION="${AWS_DEFAULT_REGION}" CHECKENV_AWS_FETCH_LOOP_LIMIT=20 /home/ubuntu/go/bin/checkenv show aws_ssm+moonstream:true > "${PARAMETERS_ENV_PATH}"
+AWS_DEFAULT_REGION="${AWS_DEFAULT_REGION}" /home/ubuntu/go/bin/checkenv show aws_ssm+moonstream:true > "${PARAMETERS_ENV_PATH}"
 chmod 0640 "${PARAMETERS_ENV_PATH}"
 
 echo
@@ -98,11 +97,11 @@ XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${POLYGON_
 
 echo
 echo
-echo -e "${PREFIX_INFO} Replacing existing Amoy moonworm crawler service definition with ${AMOY_MOONWORM_CRAWLER_SERVICE_FILE}"
-chmod 644 "${SCRIPT_DIR}/${AMOY_MOONWORM_CRAWLER_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${AMOY_MOONWORM_CRAWLER_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${AMOY_MOONWORM_CRAWLER_SERVICE_FILE}"
+echo -e "${PREFIX_INFO} Replacing existing Mumbai moonworm crawler service definition with ${MUMBAI_MOONWORM_CRAWLER_SERVICE_FILE}"
+chmod 644 "${SCRIPT_DIR}/${MUMBAI_MOONWORM_CRAWLER_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_MOONWORM_CRAWLER_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_MOONWORM_CRAWLER_SERVICE_FILE}"
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${AMOY_MOONWORM_CRAWLER_SERVICE_FILE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${MUMBAI_MOONWORM_CRAWLER_SERVICE_FILE}"
 
 echo
 echo
@@ -191,11 +190,3 @@ chmod 644 "${SCRIPT_DIR}/${BLAST_SEPOLIA_MOONWORM_CRAWLER_SERVICE_FILE}"
 cp "${SCRIPT_DIR}/${BLAST_SEPOLIA_MOONWORM_CRAWLER_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${BLAST_SEPOLIA_MOONWORM_CRAWLER_SERVICE_FILE}"
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${BLAST_SEPOLIA_MOONWORM_CRAWLER_SERVICE_FILE}"
-
-echo
-echo
-echo -e "${PREFIX_INFO} Replacing existing Proofofplay Apex moonworm crawler service definition with ${PROOFOFPLAY_APEX_MOONWORM_CRAWLER_SERVICE_FILE}"
-chmod 644 "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_MOONWORM_CRAWLER_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_MOONWORM_CRAWLER_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${PROOFOFPLAY_APEX_MOONWORM_CRAWLER_SERVICE_FILE}"
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${PROOFOFPLAY_APEX_MOONWORM_CRAWLER_SERVICE_FILE}"

crawlers/deploy/deploy-state.bash

@@ -40,6 +40,14 @@ POLYGON_STATE_CLEAN_TIMER_FILE="polygon-state-clean.timer"
 POLYGON_METADATA_SERVICE_FILE="polygon-metadata.service"
 POLYGON_METADATA_TIMER_FILE="polygon-metadata.timer"
 
+# Mumbai service files
+MUMBAI_STATE_SERVICE_FILE="mumbai-state.service"
+MUMBAI_STATE_TIMER_FILE="mumbai-state.timer"
+MUMBAI_STATE_CLEAN_SERVICE_FILE="mumbai-state-clean.service"
+MUMBAI_STATE_CLEAN_TIMER_FILE="mumbai-state-clean.timer"
+MUMBAI_METADATA_SERVICE_FILE="mumbai-metadata.service"
+MUMBAI_METADATA_TIMER_FILE="mumbai-metadata.timer"
+
 # ZkSync Era
 ZKSYNC_ERA_STATE_SERVICE_FILE="zksync-era-state.service"
 ZKSYNC_ERA_STATE_TIMER_FILE="zksync-era-state.timer"
@@ -70,7 +78,7 @@ if [ ! -d "${SECRETS_DIR}" ]; then
   mkdir -p "${SECRETS_DIR}"
   echo -e "${PREFIX_WARN} Created new secrets directory"
 fi
-AWS_DEFAULT_REGION="${AWS_DEFAULT_REGION}" CHECKENV_AWS_FETCH_LOOP_LIMIT=20 /home/ubuntu/go/bin/checkenv show aws_ssm+moonstream:true > "${PARAMETERS_ENV_PATH}"
+AWS_DEFAULT_REGION="${AWS_DEFAULT_REGION}" /home/ubuntu/go/bin/checkenv show aws_ssm+moonstream:true > "${PARAMETERS_ENV_PATH}"
 chmod 0640 "${PARAMETERS_ENV_PATH}"
 
 echo
@@ -139,6 +147,33 @@ cp "${SCRIPT_DIR}/${POLYGON_METADATA_TIMER_FILE}" "/home/ubuntu/.config/systemd/
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${POLYGON_METADATA_TIMER_FILE}"
 
+echo
+echo
+echo -e "${PREFIX_INFO} Replacing existing MUMBAI state service and timer with: ${MUMBAI_STATE_SERVICE_FILE}, ${MUMBAI_STATE_TIMER_FILE}"
+chmod 644 "${SCRIPT_DIR}/${MUMBAI_STATE_SERVICE_FILE}" "${SCRIPT_DIR}/${MUMBAI_STATE_TIMER_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_STATE_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_STATE_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_STATE_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_STATE_TIMER_FILE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${MUMBAI_STATE_TIMER_FILE}"
+
+echo
+echo
+echo -e "${PREFIX_INFO} Replacing existing MUMBAI metadata service and timer with: ${MUMBAI_METADATA_SERVICE_FILE}, ${MUMBAI_METADATA_TIMER_FILE}"
+chmod 644 "${SCRIPT_DIR}/${MUMBAI_METADATA_SERVICE_FILE}" "${SCRIPT_DIR}/${MUMBAI_METADATA_TIMER_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_METADATA_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_METADATA_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_METADATA_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_METADATA_TIMER_FILE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${MUMBAI_METADATA_TIMER_FILE}"
+
+echo
+echo
+echo -e "${PREFIX_INFO} Replacing existing MUMBAI state clean service and timer with: ${MUMBAI_STATE_CLEAN_SERVICE_FILE}, ${MUMBAI_STATE_CLEAN_TIMER_FILE}"
+chmod 644 "${SCRIPT_DIR}/${MUMBAI_STATE_CLEAN_SERVICE_FILE}" "${SCRIPT_DIR}/${MUMBAI_STATE_CLEAN_TIMER_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_STATE_CLEAN_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_STATE_CLEAN_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_STATE_CLEAN_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_STATE_CLEAN_TIMER_FILE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${MUMBAI_STATE_CLEAN_TIMER_FILE}"
+
 echo
 echo
 echo -e "${PREFIX_INFO} Replacing existing ZkSync Era state service and timer with: ${ZKSYNC_ERA_STATE_SERVICE_FILE}, ${ZKSYNC_ERA_STATE_TIMER_FILE}"

crawlers/deploy/deploy.bash

@@ -65,15 +65,21 @@ POLYGON_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE="polygon-historical-crawl-trans
 POLYGON_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE="polygon-historical-crawl-events.service"
 POLYGON_HISTORICAL_CRAWL_EVENTS_TIMER_FILE="polygon-historical-crawl-events.timer"
 
-# Amoy
-AMOY_MISSING_SERVICE_FILE="amoy-missing.service"
-AMOY_MISSING_TIMER_FILE="amoy-missing.timer"
-AMOY_MOONWORM_CRAWLER_SERVICE_FILE="amoy-moonworm-crawler.service"
-AMOY_SYNCHRONIZE_SERVICE="amoy-synchronize.service"
-AMOY_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE="amoy-historical-crawl-transactions.service"
-AMOY_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE="amoy-historical-crawl-transactions.timer"
-AMOY_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE="amoy-historical-crawl-events.service"
-AMOY_HISTORICAL_CRAWL_EVENTS_TIMER_FILE="amoy-historical-crawl-events.timer"
+# Mumbai service files
+MUMBAI_SYNCHRONIZE_SERVICE="mumbai-synchronize.service"
+MUMBAI_MISSING_SERVICE_FILE="mumbai-missing.service"
+MUMBAI_MISSING_TIMER_FILE="mumbai-missing.timer"
+MUMBAI_MOONWORM_CRAWLER_SERVICE_FILE="mumbai-moonworm-crawler.service"
+MUMBAI_STATE_SERVICE_FILE="mumbai-state.service"
+MUMBAI_STATE_TIMER_FILE="mumbai-state.timer"
+MUMBAI_STATE_CLEAN_SERVICE_FILE="mumbai-state-clean.service"
+MUMBAI_STATE_CLEAN_TIMER_FILE="mumbai-state-clean.timer"
+MUMBAI_METADATA_SERVICE_FILE="mumbai-metadata.service"
+MUMBAI_METADATA_TIMER_FILE="mumbai-metadata.timer"
+MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE="mumbai-historical-crawl-transactions.service"
+MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE="mumbai-historical-crawl-transactions.timer"
+MUMBAI_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE="mumbai-historical-crawl-events.service"
+MUMBAI_HISTORICAL_CRAWL_EVENTS_TIMER_FILE="mumbai-historical-crawl-events.timer"
 
 # XDai service files
 XDAI_SYNCHRONIZE_SERVICE="xdai-synchronize.service"
@@ -157,17 +163,6 @@ BLAST_SEPOLIA_MISSING_TIMER_FILE="blast-sepolia-missing.timer"
 BLAST_SEPOLIA_MOONWORM_CRAWLER_SERVICE_FILE="blast-sepolia-moonworm-crawler.service"
 BLAST_SEPOLIA_SYNCHRONIZE_SERVICE="blast-sepolia-synchronize.service"
 
-# ProofofPlay APEX
-PROOFOFPLAY_APEX_MISSING_SERVICE_FILE="proofofplay-apex-missing.service"
-PROOFOFPLAY_APEX_MISSING_TIMER_FILE="proofofplay-apex-missing.timer"
-PROOFOFPLAY_APEX_MOONWORM_CRAWLER_SERVICE_FILE="proofofplay-apex-moonworm-crawler.service"
-PROOFOFPLAY_APEX_SYNCHRONIZE_SERVICE="proofofplay-apex-synchronize.service"
-PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE="proofofplay-apex-historical-crawl-transactions.service"
-PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE="proofofplay-apex-historical-crawl-transactions.timer"
-PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE="proofofplay-apex-historical-crawl-events.service"
-PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_TIMER_FILE="proofofplay-apex-historical-crawl-events.timer"
-
-
 set -eu
 
 echo
@@ -192,7 +187,7 @@ if [ ! -d "${SECRETS_DIR}" ]; then
   mkdir -p "${SECRETS_DIR}"
   echo -e "${PREFIX_WARN} Created new secrets directory"
 fi
-AWS_DEFAULT_REGION="${AWS_DEFAULT_REGION}" CHECKENV_AWS_FETCH_LOOP_LIMIT=20 /home/ubuntu/go/bin/checkenv show aws_ssm+moonstream:true > "${PARAMETERS_ENV_PATH}"
+AWS_DEFAULT_REGION="${AWS_DEFAULT_REGION}" /home/ubuntu/go/bin/checkenv show aws_ssm+moonstream:true > "${PARAMETERS_ENV_PATH}"
 chmod 0640 "${PARAMETERS_ENV_PATH}"
 
 echo
@@ -376,51 +371,76 @@ cp "${SCRIPT_DIR}/${POLYGON_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}" "/home/ubuntu/.
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${POLYGON_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
 
-# Amoy
 echo
 echo
-echo -e "${PREFIX_INFO} Replacing existing Amoy block with transactions syncronizer service definition with ${AMOY_SYNCHRONIZE_SERVICE}"
-chmod 644 "${SCRIPT_DIR}/${AMOY_SYNCHRONIZE_SERVICE}"
-cp "${SCRIPT_DIR}/${AMOY_SYNCHRONIZE_SERVICE}" "/home/ubuntu/.config/systemd/user/${AMOY_SYNCHRONIZE_SERVICE}"
+echo -e "${PREFIX_INFO} Replacing existing Mumbai block with transactions syncronizer service definition with ${MUMBAI_SYNCHRONIZE_SERVICE}"
+chmod 644 "${SCRIPT_DIR}/${MUMBAI_SYNCHRONIZE_SERVICE}"
+cp "${SCRIPT_DIR}/${MUMBAI_SYNCHRONIZE_SERVICE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_SYNCHRONIZE_SERVICE}"
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${AMOY_SYNCHRONIZE_SERVICE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${MUMBAI_SYNCHRONIZE_SERVICE}"
 
 echo
 echo
-echo -e "${PREFIX_INFO} Replacing existing Amoy missing service and timer with: ${AMOY_MISSING_SERVICE_FILE}, ${AMOY_MISSING_TIMER_FILE}"
-chmod 644 "${SCRIPT_DIR}/${AMOY_MISSING_SERVICE_FILE}" "${SCRIPT_DIR}/${AMOY_MISSING_TIMER_FILE}"
-cp "${SCRIPT_DIR}/${AMOY_MISSING_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${AMOY_MISSING_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${AMOY_MISSING_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${AMOY_MISSING_TIMER_FILE}"
+echo -e "${PREFIX_INFO} Replacing existing Mumbai missing service and timer with: ${MUMBAI_MISSING_SERVICE_FILE}, ${MUMBAI_MISSING_TIMER_FILE}"
+chmod 644 "${SCRIPT_DIR}/${MUMBAI_MISSING_SERVICE_FILE}" "${SCRIPT_DIR}/${MUMBAI_MISSING_TIMER_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_MISSING_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_MISSING_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_MISSING_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_MISSING_TIMER_FILE}"
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${AMOY_MISSING_TIMER_FILE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${MUMBAI_MISSING_TIMER_FILE}"
 
 echo
 echo
-echo -e "${PREFIX_INFO} Replacing existing Amoy moonworm crawler service definition with ${AMOY_MOONWORM_CRAWLER_SERVICE_FILE}"
-chmod 644 "${SCRIPT_DIR}/${AMOY_MOONWORM_CRAWLER_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${AMOY_MOONWORM_CRAWLER_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${AMOY_MOONWORM_CRAWLER_SERVICE_FILE}"
+echo -e "${PREFIX_INFO} Replacing existing Mumbai moonworm crawler service definition with ${MUMBAI_MOONWORM_CRAWLER_SERVICE_FILE}"
+chmod 644 "${SCRIPT_DIR}/${MUMBAI_MOONWORM_CRAWLER_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_MOONWORM_CRAWLER_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_MOONWORM_CRAWLER_SERVICE_FILE}"
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${AMOY_MOONWORM_CRAWLER_SERVICE_FILE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${MUMBAI_MOONWORM_CRAWLER_SERVICE_FILE}"
 
 echo
 echo
-echo -e "${PREFIX_INFO} Replacing existing Amoy historical transactions crawler service and timer with: ${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}, ${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
-chmod 644 "${SCRIPT_DIR}/${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}" "${SCRIPT_DIR}/${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
-cp "${SCRIPT_DIR}/${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
+echo -e "${PREFIX_INFO} Replacing existing MUMBAI state service and timer with: ${MUMBAI_STATE_SERVICE_FILE}, ${MUMBAI_STATE_TIMER_FILE}"
+chmod 644 "${SCRIPT_DIR}/${MUMBAI_STATE_SERVICE_FILE}" "${SCRIPT_DIR}/${MUMBAI_STATE_TIMER_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_STATE_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_STATE_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_STATE_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_STATE_TIMER_FILE}"
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${AMOY_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${MUMBAI_STATE_TIMER_FILE}"
 
 echo
 echo
-echo -e "${PREFIX_INFO} Replacing existing Amoy historical events crawler service and timer with: ${AMOY_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}, ${AMOY_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
-chmod 644 "${SCRIPT_DIR}/${AMOY_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}" "${SCRIPT_DIR}/${AMOY_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
-cp "${SCRIPT_DIR}/${AMOY_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${AMOY_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${AMOY_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${AMOY_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
+echo -e "${PREFIX_INFO} Replacing existing MUMBAI state clean service and timer with: ${MUMBAI_STATE_CLEAN_SERVICE_FILE}, ${MUMBAI_STATE_CLEAN_TIMER_FILE}"
+chmod 644 "${SCRIPT_DIR}/${MUMBAI_STATE_CLEAN_SERVICE_FILE}" "${SCRIPT_DIR}/${MUMBAI_STATE_CLEAN_TIMER_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_STATE_CLEAN_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_STATE_CLEAN_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_STATE_CLEAN_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_STATE_CLEAN_TIMER_FILE}"
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000"  systemctl --user restart --no-block "${AMOY_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${MUMBAI_STATE_CLEAN_TIMER_FILE}"
+
+echo
+echo
+echo -e "${PREFIX_INFO} Replacing existing MUMBAI metadata service and timer with: ${MUMBAI_METADATA_SERVICE_FILE}, ${MUMBAI_METADATA_TIMER_FILE}"
+chmod 644 "${SCRIPT_DIR}/${MUMBAI_METADATA_SERVICE_FILE}" "${SCRIPT_DIR}/${MUMBAI_METADATA_TIMER_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_METADATA_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_METADATA_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_METADATA_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_METADATA_TIMER_FILE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${MUMBAI_METADATA_TIMER_FILE}"
+
+echo
+echo
+echo -e "${PREFIX_INFO} Replacing existing MUMBAI historical transactions crawler service and timer with: ${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}, ${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
+chmod 644 "${SCRIPT_DIR}/${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}" "${SCRIPT_DIR}/${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${MUMBAI_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
+
+echo
+echo
+echo -e "${PREFIX_INFO} Replacing existing MUMBAI historical events crawler service and timer with: ${MUMBAI_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}, ${MUMBAI_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
+chmod 644 "${SCRIPT_DIR}/${MUMBAI_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}" "${SCRIPT_DIR}/${MUMBAI_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${MUMBAI_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${MUMBAI_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
+XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
+XDG_RUNTIME_DIR="/run/user/1000"  systemctl --user restart --no-block "${MUMBAI_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
 
-# Xdai
 echo
 echo
 echo -e "${PREFIX_INFO} Replacing existing XDai block with transactions syncronizer service definition with ${XDAI_SYNCHRONIZE_SERVICE}"
@@ -789,49 +809,3 @@ chmod 644 "${SCRIPT_DIR}/${BLAST_SEPOLIA_MOONWORM_CRAWLER_SERVICE_FILE}"
 cp "${SCRIPT_DIR}/${BLAST_SEPOLIA_MOONWORM_CRAWLER_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${BLAST_SEPOLIA_MOONWORM_CRAWLER_SERVICE_FILE}"
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
 XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${BLAST_SEPOLIA_MOONWORM_CRAWLER_SERVICE_FILE}"
-
-
-# Proofofplay Apex
-
-echo
-echo
-echo -e "${PREFIX_INFO} Replacing existing Proofofplay Apex block with transactions syncronizer service definition with ${PROOFOFPLAY_APEX_SYNCHRONIZE_SERVICE}"
-chmod 644 "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_SYNCHRONIZE_SERVICE}"
-cp "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_SYNCHRONIZE_SERVICE}" "/home/ubuntu/.config/systemd/user/${PROOFOFPLAY_APEX_SYNCHRONIZE_SERVICE}"
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${PROOFOFPLAY_APEX_SYNCHRONIZE_SERVICE}"
-
-echo
-echo
-echo -e "${PREFIX_INFO} Replacing existing Proofofplay Apex missing service and timer with: ${PROOFOFPLAY_APEX_MISSING_SERVICE_FILE}, ${PROOFOFPLAY_APEX_MISSING_TIMER_FILE}"
-chmod 644 "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_MISSING_SERVICE_FILE}" "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_MISSING_TIMER_FILE}"
-cp "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_MISSING_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${PROOFOFPLAY_APEX_MISSING_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_MISSING_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${PROOFOFPLAY_APEX_MISSING_TIMER_FILE}"
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${PROOFOFPLAY_APEX_MISSING_TIMER_FILE}"
-
-echo
-echo
-echo -e "${PREFIX_INFO} Replacing existing Proofofplay Apex moonworm crawler service definition with ${PROOFOFPLAY_APEX_MOONWORM_CRAWLER_SERVICE_FILE}"
-chmod 644 "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_MOONWORM_CRAWLER_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_MOONWORM_CRAWLER_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${PROOFOFPLAY_APEX_MOONWORM_CRAWLER_SERVICE_FILE}"
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${PROOFOFPLAY_APEX_MOONWORM_CRAWLER_SERVICE_FILE}"
-
-echo
-echo
-echo -e "${PREFIX_INFO} Replacing existing Proofofplay Apex historical transactions crawler service and timer with: ${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}, ${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
-chmod 644 "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}" "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
-cp "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_TRANSACTIONS_TIMER_FILE}"
-
-echo
-echo
-echo -e "${PREFIX_INFO} Replacing existing Proofofplay Apex historical events crawler service and timer with: ${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}, ${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
-chmod 644 "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}" "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
-cp "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}" "/home/ubuntu/.config/systemd/user/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_SERVICE_FILE}"
-cp "${SCRIPT_DIR}/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}" "/home/ubuntu/.config/systemd/user/${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user daemon-reload
-XDG_RUNTIME_DIR="/run/user/1000" systemctl --user restart --no-block "${PROOFOFPLAY_APEX_HISTORICAL_CRAWL_EVENTS_TIMER_FILE}"

crawlers/deploy/monitoring-crawlers.service

@@ -9,7 +9,7 @@ Restart=on-failure
 RestartSec=15s
 WorkingDirectory=/home/ubuntu/
 EnvironmentFile=/home/ubuntu/moonstream-secrets/monitoring.env
-ExecStart=/home/ubuntu/monitoring -plugin systemd -host "${AWS_LOCAL_IPV4}" -port 7171 -healthcheck -server -threshold 3 -config /home/ubuntu/.monitoring/monitoring-crawlers-config.json -service ethereum-moonworm-crawler.service -service amoy-moonworm-crawler.service -service polygon-moonworm-crawler.service -service zksync-era-moonworm-crawler.service -service zksync-era-sepolia-moonworm-crawler.service -service arbitrum-nova-moonworm-crawler.service -service arbitrum-sepolia-moonworm-crawler.service -service xai-moonworm-crawler.service -service xai-sepolia-moonworm-crawler.service -service avalanche-moonworm-crawler.service -service avalanche-fuji-moonworm-crawler.service -service blast-moonworm-crawler.service -service blast-sepolia-moonworm-crawler.service -service proofofplay-apex-moonworm-crawler.service
+ExecStart=/home/ubuntu/monitoring -plugin systemd -host "${AWS_LOCAL_IPV4}" -port 7171 -healthcheck -server -threshold 3 -config /home/ubuntu/.monitoring/monitoring-crawlers-config.json -service ethereum-moonworm-crawler.service -service mumbai-moonworm-crawler.service -service polygon-moonworm-crawler.service -service zksync-era-moonworm-crawler.service -service zksync-era-sepolia-moonworm-crawler.service -service arbitrum-nova-moonworm-crawler.service -service arbitrum-sepolia-moonworm-crawler.service -service xai-moonworm-crawler.service -service xai-sepolia-moonworm-crawler.service
 CPUWeight=90
 SyslogIdentifier=monitoring-crawlers
 

crawlers/deploy/mumbai-historical-crawl-events.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Amoy historical crawler events
+Description=Mumbai historical crawler events
 After=network.target
 StartLimitIntervalSec=300
 StartLimitBurst=3
@@ -9,9 +9,9 @@ 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 historical-crawl --blockchain-type amoy --find-deployed-blocks --end 0 --tasks-journal --only-events
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.moonworm_crawler.cli historical-crawl --blockchain-type mumbai --find-deployed-blocks --end 0 --tasks-journal --only-events
 CPUWeight=70
-SyslogIdentifier=amoy-historical-crawl-events
+SyslogIdentifier=mumbai-historical-crawl-events
 
 [Install]
 WantedBy=multi-user.target

crawlers/deploy/mumbai-historical-crawl-events.timer

@@ -1,5 +1,5 @@
 [Unit]
-Description=Runs events historical crawler on Amoy
+Description=Runs events historical crawler on mumbai
 
 [Timer]
 OnBootSec=60s

crawlers/deploy/mumbai-historical-crawl-transactions.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=ProofOfPlay Apex moonworm crawler
+Description=Mumbai historical crawler transactions
 After=network.target
 StartLimitIntervalSec=300
 StartLimitBurst=3
@@ -9,9 +9,9 @@ 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 crawl -b proofofplay_apex  --confirmations 50 --min-blocks-batch 20
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.moonworm_crawler.cli historical-crawl --blockchain-type mumbai --find-deployed-blocks --end 0 --tasks-journal --only-functions
 CPUWeight=70
-SyslogIdentifier=proofofplay-apex-moonworm-crawler
+SyslogIdentifier=mumbai-historical-crawl-transactions
 
 [Install]
 WantedBy=multi-user.target

crawlers/deploy/mumbai-historical-crawl-transactions.timer

@@ -1,5 +1,5 @@
 [Unit]
-Description=Runs transactions historical crawler on Amoy
+Description=Runs transactions historical crawler on mumbai
 
 [Timer]
 OnBootSec=60s

crawlers/deploy/mumbai-metadata.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Execute metadata crawler
+After=network.target
+
+[Service]
+Type=oneshot
+WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl
+EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.metadata_crawler.cli crawl --blockchain mumbai
+CPUWeight=60
+SyslogIdentifier=mumbai-metadata

crawlers/deploy/mumbai-metadata.timer

@@ -0,0 +1,9 @@
+[Unit]
+Description=Execute Mumbai metadata crawler each 10m
+
+[Timer]
+OnBootSec=20s
+OnUnitActiveSec=60m
+
+[Install]
+WantedBy=timers.target

crawlers/deploy/mumbai-missing.service

@@ -1,11 +1,11 @@
 [Unit]
-Description=Fill missing blocks at Amoy database
+Description=Fill missing blocks at Mumbai database
 After=network.target
 
 [Service]
 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 blocks missing --blockchain amoy -n
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler blocks missing --blockchain mumbai -n
 CPUWeight=50
-SyslogIdentifier=amoy-missing
+SyslogIdentifier=mumbai-missing

crawlers/deploy/mumbai-missing.timer

@@ -1,5 +1,5 @@
 [Unit]
-Description=Fill missing blocks at Amoy database
+Description=Fill missing blocks at Mumbai database
 
 [Timer]
 OnBootSec=120s

crawlers/deploy/mumbai-moonworm-crawler.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Amoy moonworm crawler
+Description=Mumbai moonworm crawler
 After=network.target
 StartLimitIntervalSec=300
 StartLimitBurst=3
@@ -9,9 +9,9 @@ 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 crawl -b amoy --confirmations 10 --min-blocks-batch 20
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.moonworm_crawler.cli crawl -b mumbai --confirmations 40
 CPUWeight=70
-SyslogIdentifier=amoy-moonworm-crawler
+SyslogIdentifier=mumbai-moonworm-crawler
 
 [Install]
 WantedBy=multi-user.target

crawlers/deploy/mumbai-state-clean.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Execute state clean labels crawler
+After=network.target
+
+[Service]
+Type=oneshot
+WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl
+EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.state_crawler.cli clean-state-labels --blockchain mumbai -N 10000
+CPUWeight=60
+SyslogIdentifier=mumbai-state-clean

crawlers/deploy/mumbai-state-clean.timer

@@ -0,0 +1,9 @@
+[Unit]
+Description=Execute Mumbai state clean labels crawler each 25m
+
+[Timer]
+OnBootSec=50s
+OnUnitActiveSec=25m
+
+[Install]
+WantedBy=timers.target

crawlers/deploy/mumbai-state.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Execute state crawler
+After=network.target
+
+[Service]
+Type=oneshot
+WorkingDirectory=/home/ubuntu/moonstream/crawlers/mooncrawl
+EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.state_crawler.cli crawl-jobs --moonstream-token "${MOONSTREAM_PUBLIC_QUERIES_DATA_ACCESS_TOKEN}" --blockchain mumbai --infura --jobs-file /home/ubuntu/moonstream/crawlers/mooncrawl/mooncrawl/state_crawler/jobs/mumbai-jobs.json
+CPUWeight=60
+SyslogIdentifier=mumbai-state

crawlers/deploy/mumbai-state.timer

@@ -0,0 +1,9 @@
+[Unit]
+Description=Execute Mumbai state crawler each 10m
+
+[Timer]
+OnBootSec=15s
+OnUnitActiveSec=10m
+
+[Install]
+WantedBy=timers.target

crawlers/deploy/mumbai-synchronize.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Amoy block with transactions synchronizer
+Description=Mumbai block with transactions synchronizer
 StartLimitIntervalSec=300
 StartLimitBurst=3
 After=network.target
@@ -9,9 +9,9 @@ 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 blocks synchronize --blockchain amoy -c 10 -j 2
+ExecStart=/home/ubuntu/moonstream-env/bin/python -m mooncrawl.crawler blocks synchronize --blockchain mumbai -c 20 -j 2
 CPUWeight=90
-SyslogIdentifier=amoy-synchronize
+SyslogIdentifier=mumbai-synchronize
 
 [Install]
 WantedBy=multi-user.target

crawlers/deploy/proofofplay-apex-historical-crawl-events.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=ProofOfPlay historical crawler events
-After=network.target
-StartLimitIntervalSec=300
-StartLimitBurst=3
-
-[Service]
-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 historical-crawl --blockchain-type proofofplay_apex --find-deployed-blocks --end 0 --tasks-journal --only-events
-CPUWeight=70
-SyslogIdentifier=proofofplay-apex-historical-crawl-events
-
-[Install]
-WantedBy=multi-user.target

crawlers/deploy/proofofplay-apex-historical-crawl-events.timer

@@ -1,9 +0,0 @@
-[Unit]
-Description=Runs events historical crawler on proofofplay apex
-
-[Timer]
-OnBootSec=60s
-OnUnitActiveSec=10m
-
-[Install]
-WantedBy=timers.target

crawlers/deploy/proofofplay-apex-historical-crawl-transactions.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=ProofOfPlay historical crawler transactions
-After=network.target
-StartLimitIntervalSec=300
-StartLimitBurst=3
-
-[Service]
-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 historical-crawl --blockchain-type proofofplay_apex --find-deployed-blocks --end 0 --tasks-journal --only-functions
-CPUWeight=70
-SyslogIdentifier=proofofplay-apex-historical-crawl-transactions
-
-[Install]
-WantedBy=multi-user.target

crawlers/deploy/proofofplay-apex-historical-crawl-transactions.timer

@@ -1,9 +0,0 @@
-[Unit]
-Description=Runs transactions historical crawler on proofofplay apex
-
-[Timer]
-OnBootSec=60s
-OnUnitActiveSec=10m
-
-[Install]
-WantedBy=timers.target

crawlers/deploy/proofofplay-apex-missing.service

@@ -1,11 +0,0 @@
-[Unit]
-Description=Fill missing blocks at ProofOfPlay database
-After=network.target
-
-[Service]
-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 blocks missing --blockchain proofofplay_apex -n
-CPUWeight=50
-SyslogIdentifier=proofofplay-apex-missing

crawlers/deploy/proofofplay-apex-missing.timer

@@ -1,9 +0,0 @@
-[Unit]
-Description=Fill missing blocks at ProofOfPlay database
-
-[Timer]
-OnBootSec=120s
-OnUnitActiveSec=15m
-
-[Install]
-WantedBy=timers.target

crawlers/deploy/proofofplay-apex-synchronize.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=ProofOfPlay Apex block with transactions synchronizer
-StartLimitIntervalSec=300
-StartLimitBurst=3
-After=network.target
-
-[Service]
-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 blocks synchronize --blockchain proofofplay_apex --confirmations 40 --jobs 2
-CPUWeight=90
-SyslogIdentifier=proofofplay-apex-synchronize
-
-[Install]
-WantedBy=multi-user.target

crawlers/mooncrawl/mooncrawl/blockchain.py

@@ -22,7 +22,6 @@ from .data import DateRange
 from .db import yield_db_session, yield_db_session_ctx
 from .settings import (
     MOONSTREAM_CRAWL_WORKERS,
-    MOONSTREAM_NODE_AMOY_A_EXTERNAL_URI,
     MOONSTREAM_NODE_ARBITRUM_NOVA_A_EXTERNAL_URI,
     MOONSTREAM_NODE_ARBITRUM_SEPOLIA_A_EXTERNAL_URI,
     MOONSTREAM_NODE_AVALANCHE_A_EXTERNAL_URI,
@@ -32,7 +31,6 @@ from .settings import (
     MOONSTREAM_NODE_ETHEREUM_A_EXTERNAL_URI,
     MOONSTREAM_NODE_MUMBAI_A_EXTERNAL_URI,
     MOONSTREAM_NODE_POLYGON_A_EXTERNAL_URI,
-    MOONSTREAM_NODE_PROOFOFPLAY_APEX_A_EXTERNAL_URI,
     MOONSTREAM_NODE_XAI_A_EXTERNAL_URI,
     MOONSTREAM_NODE_XAI_SEPOLIA_A_EXTERNAL_URI,
     MOONSTREAM_NODE_XDAI_A_EXTERNAL_URI,
@@ -68,8 +66,6 @@ def connect(
             web3_uri = MOONSTREAM_NODE_POLYGON_A_EXTERNAL_URI
         elif blockchain_type == AvailableBlockchainType.MUMBAI:
             web3_uri = MOONSTREAM_NODE_MUMBAI_A_EXTERNAL_URI
-        elif blockchain_type == AvailableBlockchainType.AMOY:
-            web3_uri = MOONSTREAM_NODE_AMOY_A_EXTERNAL_URI
         elif blockchain_type == AvailableBlockchainType.XDAI:
             web3_uri = MOONSTREAM_NODE_XDAI_A_EXTERNAL_URI
         elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA:
@@ -92,8 +88,6 @@ def connect(
             web3_uri = MOONSTREAM_NODE_BLAST_A_EXTERNAL_URI
         elif blockchain_type == AvailableBlockchainType.BLAST_SEPOLIA:
             web3_uri = MOONSTREAM_NODE_BLAST_SEPOLIA_A_EXTERNAL_URI
-        elif blockchain_type == AvailableBlockchainType.PROOFOFPLAY_APEX:
-            web3_uri = MOONSTREAM_NODE_PROOFOFPLAY_APEX_A_EXTERNAL_URI
         else:
             raise Exception("Wrong blockchain type provided for web3 URI")
 
@@ -178,7 +172,6 @@ def add_block(db_session, block: Any, blockchain_type: AvailableBlockchainType)
     elif (
         blockchain_type == AvailableBlockchainType.ARBITRUM_NOVA
         or blockchain_type == AvailableBlockchainType.ARBITRUM_SEPOLIA
-        or blockchain_type == AvailableBlockchainType.PROOFOFPLAY_APEX
     ):
         block_obj.sha3_uncles = block.get("sha3Uncles", "")
         block_obj.l1_block_number = hex_to_int(block.get("l1BlockNumber"))
@@ -259,7 +252,6 @@ def add_block_transactions(
             or blockchain_type == AvailableBlockchainType.ARBITRUM_SEPOLIA
             or blockchain_type == AvailableBlockchainType.XAI
             or blockchain_type == AvailableBlockchainType.XAI_SEPOLIA
-            or blockchain_type == AvailableBlockchainType.PROOFOFPLAY_APEX
         ):
             tx_obj.y_parity = hex_to_int(tx.get("yParity"))
 

crawlers/mooncrawl/mooncrawl/moonworm_crawler/cli.py

@@ -4,7 +4,6 @@ from typing import Optional
 from uuid import UUID
 
 from moonstreamdb.blockchain import AvailableBlockchainType
-from moonstreamdb.subscriptions import blockchain_type_to_subscription_type
 from web3 import Web3
 from web3.middleware import geth_poa_middleware
 
@@ -16,6 +15,8 @@ from ..settings import (
 )
 from .continuous_crawler import _retry_connect_web3, continuous_crawler
 from .crawler import (
+    SubscriptionTypes,
+    blockchain_type_to_subscription_type,
     find_all_deployed_blocks,
     get_crawl_job_entries,
     make_event_crawl_jobs,

crawlers/mooncrawl/mooncrawl/moonworm_crawler/continuous_crawler.py

@@ -6,8 +6,7 @@ from typing import Dict, List, Optional, Tuple
 from uuid import UUID
 
 from moonstreamdb.blockchain import AvailableBlockchainType
-from moonstreamdb.networks import blockchain_type_to_network_type
-from moonstreamdb.subscriptions import blockchain_type_to_subscription_type
+from moonstreamdb.networks import Network
 from moonworm.crawler.moonstream_ethereum_state_provider import (  # type: ignore
     MoonstreamEthereumStateProvider,
 )
@@ -22,6 +21,7 @@ from .crawler import (
     EventCrawlJob,
     FunctionCallCrawlJob,
     _retry_connect_web3,
+    blockchain_type_to_subscription_type,
     get_crawl_job_entries,
     heartbeat,
     make_event_crawl_jobs,
@@ -124,10 +124,40 @@ def continuous_crawler(
     if web3 is None:
         web3 = _retry_connect_web3(blockchain_type, web3_uri=web3_uri)
 
-    try:
-        network = blockchain_type_to_network_type(blockchain_type=blockchain_type)
-    except Exception as e:
-        raise Exception(e)
+    if blockchain_type == AvailableBlockchainType.ETHEREUM:
+        network = Network.ethereum
+    elif blockchain_type == AvailableBlockchainType.POLYGON:
+        network = Network.polygon
+    elif blockchain_type == AvailableBlockchainType.MUMBAI:
+        network = Network.mumbai
+    elif blockchain_type == AvailableBlockchainType.XDAI:
+        network = Network.xdai
+    elif blockchain_type == AvailableBlockchainType.WYRM:
+        network = Network.wyrm
+    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA_TESTNET:
+        network = Network.zksync_era_testnet
+    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA:
+        network = Network.zksync_era
+    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA_SEPOLIA:
+        network = Network.zksync_era_sepolia
+    elif blockchain_type == AvailableBlockchainType.ARBITRUM_NOVA:
+        network = Network.arbitrum_nova
+    elif blockchain_type == AvailableBlockchainType.ARBITRUM_SEPOLIA:
+        network = Network.arbitrum_sepolia
+    elif blockchain_type == AvailableBlockchainType.XAI:
+        network = Network.xai
+    elif blockchain_type == AvailableBlockchainType.XAI_SEPOLIA:
+        network = Network.xai_sepolia
+    elif blockchain_type == AvailableBlockchainType.AVALANCHE:
+        network = Network.avalanche
+    elif blockchain_type == AvailableBlockchainType.AVALANCHE_FUJI:
+        network = Network.avalanche_fuji
+    elif blockchain_type == AvailableBlockchainType.BLAST:
+        network = Network.blast
+    elif blockchain_type == AvailableBlockchainType.BLAST_SEPOLIA:
+        network = Network.blast_sepolia
+    else:
+        raise ValueError(f"Unknown blockchain type: {blockchain_type}")
 
     ethereum_state_provider = MoonstreamEthereumStateProvider(
         web3,

crawlers/mooncrawl/mooncrawl/moonworm_crawler/crawler.py

@@ -11,7 +11,6 @@ from uuid import UUID
 from bugout.data import BugoutJournalEntries, BugoutSearchResult
 from eth_typing.evm import ChecksumAddress
 from moonstreamdb.blockchain import AvailableBlockchainType
-from moonstreamdb.subscriptions import SubscriptionTypes
 from moonworm.deployment import find_deployment_block  # type: ignore
 from web3.main import Web3
 
@@ -30,6 +29,25 @@ logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 
+class SubscriptionTypes(Enum):
+    POLYGON_BLOCKCHAIN = "polygon_smartcontract"
+    ETHEREUM_BLOCKCHAIN = "ethereum_smartcontract"
+    MUMBAI_BLOCKCHAIN = "mumbai_smartcontract"
+    XDAI_BLOCKCHAIN = "xdai_smartcontract"
+    WYRM_BLOCKCHAIN = "wyrm_smartcontract"
+    ZKSYNC_ERA_TESTNET_BLOCKCHAIN = "zksync_era_testnet_smartcontract"
+    ZKSYNC_ERA_BLOCKCHAIN = "zksync_era_smartcontract"
+    ZKSYNC_ERA_SEPOLIA_BLOCKCHAIN = "zksync_era_sepolia_smartcontract"
+    ARBITRUM_NOVA_BLOCKCHAIN = "arbitrum_nova_smartcontract"
+    ARBITRUM_SEPOLIA_BLOCKCHAIN = "arbitrum_sepolia_smartcontract"
+    XAI_BLOCKCHAIN = "xai_smartcontract"
+    XAI_SEPOLIA_BLOCKCHAIN = "xai_sepolia_smartcontract"
+    AVALANCHE_BLOCKCHAIN = "avalanche_smartcontract"
+    AVALANCHE_FUJI_BLOCKCHAIN = "avalanche_fuji_smartcontract"
+    BLAST_BLOCKCHAIN = "blast_smartcontract"
+    BLAST_SEPOLIA_BLOCKCHAIN = "blast_sepolia_smartcontract"
+
+
 def abi_input_signature(input_abi: Dict[str, Any]) -> str:
     """
     Stringifies a function ABI input object according to the ABI specification:
@@ -119,6 +137,45 @@ def _retry_connect_web3(
     )
 
 
+def blockchain_type_to_subscription_type(
+    blockchain_type: AvailableBlockchainType,
+) -> SubscriptionTypes:
+    if blockchain_type == AvailableBlockchainType.ETHEREUM:
+        return SubscriptionTypes.ETHEREUM_BLOCKCHAIN
+    elif blockchain_type == AvailableBlockchainType.POLYGON:
+        return SubscriptionTypes.POLYGON_BLOCKCHAIN
+    elif blockchain_type == AvailableBlockchainType.MUMBAI:
+        return SubscriptionTypes.MUMBAI_BLOCKCHAIN
+    elif blockchain_type == AvailableBlockchainType.XDAI:
+        return SubscriptionTypes.XDAI_BLOCKCHAIN
+    elif blockchain_type == AvailableBlockchainType.WYRM:
+        return SubscriptionTypes.WYRM_BLOCKCHAIN
+    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA_TESTNET:
+        return SubscriptionTypes.ZKSYNC_ERA_TESTNET_BLOCKCHAIN
+    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA:
+        return SubscriptionTypes.ZKSYNC_ERA_BLOCKCHAIN
+    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA_SEPOLIA:
+        return SubscriptionTypes.ZKSYNC_ERA_SEPOLIA_BLOCKCHAIN
+    elif blockchain_type == AvailableBlockchainType.ARBITRUM_NOVA:
+        return SubscriptionTypes.ARBITRUM_NOVA_BLOCKCHAIN
+    elif blockchain_type == AvailableBlockchainType.ARBITRUM_SEPOLIA:
+        return SubscriptionTypes.ARBITRUM_SEPOLIA_BLOCKCHAIN
+    elif blockchain_type == AvailableBlockchainType.XAI:
+        return SubscriptionTypes.XAI_BLOCKCHAIN
+    elif blockchain_type == AvailableBlockchainType.XAI_SEPOLIA:
+        return SubscriptionTypes.XAI_SEPOLIA_BLOCKCHAIN
+    elif blockchain_type == AvailableBlockchainType.AVALANCHE:
+        return SubscriptionTypes.AVALANCHE_BLOCKCHAIN
+    elif blockchain_type == AvailableBlockchainType.AVALANCHE_FUJI:
+        return SubscriptionTypes.AVALANCHE_FUJI_BLOCKCHAIN
+    elif blockchain_type == AvailableBlockchainType.BLAST:
+        return SubscriptionTypes.BLAST_BLOCKCHAIN
+    elif blockchain_type == AvailableBlockchainType.BLAST_SEPOLIA:
+        return SubscriptionTypes.BLAST_SEPOLIA_BLOCKCHAIN
+    else:
+        raise ValueError(f"Unknown blockchain type: {blockchain_type}")
+
+
 @dataclass
 class EventCrawlJob:
     event_abi_hash: str

crawlers/mooncrawl/mooncrawl/moonworm_crawler/function_call_crawler.py

@@ -2,7 +2,7 @@ import logging
 from typing import List
 
 from moonstreamdb.blockchain import AvailableBlockchainType
-from moonstreamdb.networks import blockchain_type_to_network_type  # type: ignore
+from moonstreamdb.networks import Network  # type: ignore
 from moonworm.crawler.function_call_crawler import (  # type: ignore
     ContractFunctionCall,
     FunctionCallCrawler,
@@ -58,10 +58,40 @@ def function_call_crawler(
     end_block: int,
     batch_size: int,
 ):
-    try:
-        network = blockchain_type_to_network_type(blockchain_type=blockchain_type)
-    except Exception as e:
-        raise Exception(e)
+    if blockchain_type == AvailableBlockchainType.ETHEREUM:
+        network = Network.ethereum
+    elif blockchain_type == AvailableBlockchainType.POLYGON:
+        network = Network.polygon
+    elif blockchain_type == AvailableBlockchainType.MUMBAI:
+        network = Network.mumbai
+    elif blockchain_type == AvailableBlockchainType.XDAI:
+        network = Network.xdai
+    elif blockchain_type == AvailableBlockchainType.WYRM:
+        network = Network.wyrm
+    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA_TESTNET:
+        network = Network.zksync_era_testnet
+    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA:
+        network = Network.zksync_era
+    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA_SEPOLIA:
+        network = Network.zksync_era_sepolia
+    elif blockchain_type == AvailableBlockchainType.ARBITRUM_NOVA:
+        network = Network.arbitrum_nova
+    elif blockchain_type == AvailableBlockchainType.ARBITRUM_SEPOLIA:
+        network = Network.arbitrum_sepolia
+    elif blockchain_type == AvailableBlockchainType.XAI:
+        network = Network.xai
+    elif blockchain_type == AvailableBlockchainType.XAI_SEPOLIA:
+        network = Network.xai_sepolia
+    elif blockchain_type == AvailableBlockchainType.AVALANCHE:
+        network = Network.avalanche
+    elif blockchain_type == AvailableBlockchainType.AVALANCHE_FUJI:
+        network = Network.avalanche_fuji
+    elif blockchain_type == AvailableBlockchainType.BLAST:
+        network = Network.blast
+    elif blockchain_type == AvailableBlockchainType.BLAST_SEPOLIA:
+        network = Network.blast_sepolia
+    else:
+        raise ValueError(f"Unknown blockchain type: {blockchain_type}")
 
     ethereum_state_provider = MoonstreamEthereumStateProvider(
         web3,

crawlers/mooncrawl/mooncrawl/moonworm_crawler/historical_crawler.py

@@ -5,7 +5,7 @@ from uuid import UUID
 
 from eth_typing.evm import ChecksumAddress
 from moonstreamdb.blockchain import AvailableBlockchainType
-from moonstreamdb.networks import blockchain_type_to_network_type  # type: ignore
+from moonstreamdb.networks import Network  # type: ignore
 from moonworm.crawler.moonstream_ethereum_state_provider import (  # type: ignore
     MoonstreamEthereumStateProvider,
 )
@@ -52,10 +52,40 @@ def historical_crawler(
         web3.eth.block_number >= start_block
     ), "start_block must be less than current block"
 
-    try:
-        network = blockchain_type_to_network_type(blockchain_type=blockchain_type)
-    except Exception as e:
-        raise Exception(e)
+    if blockchain_type == AvailableBlockchainType.ETHEREUM:
+        network = Network.ethereum
+    elif blockchain_type == AvailableBlockchainType.POLYGON:
+        network = Network.polygon
+    elif blockchain_type == AvailableBlockchainType.MUMBAI:
+        network = Network.mumbai
+    elif blockchain_type == AvailableBlockchainType.XDAI:
+        network = Network.xdai
+    elif blockchain_type == AvailableBlockchainType.WYRM:
+        network = Network.wyrm
+    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA_TESTNET:
+        network = Network.zksync_era_testnet
+    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA:
+        network = Network.zksync_era
+    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA_SEPOLIA:
+        network = Network.zksync_era_sepolia
+    elif blockchain_type == AvailableBlockchainType.ARBITRUM_NOVA:
+        network = Network.arbitrum_nova
+    elif blockchain_type == AvailableBlockchainType.ARBITRUM_SEPOLIA:
+        network = Network.arbitrum_sepolia
+    elif blockchain_type == AvailableBlockchainType.XAI:
+        network = Network.xai
+    elif blockchain_type == AvailableBlockchainType.XAI_SEPOLIA:
+        network = Network.xai_sepolia
+    elif blockchain_type == AvailableBlockchainType.AVALANCHE:
+        network = Network.avalanche
+    elif blockchain_type == AvailableBlockchainType.AVALANCHE_FUJI:
+        network = Network.avalanche_fuji
+    elif blockchain_type == AvailableBlockchainType.BLAST:
+        network = Network.blast
+    elif blockchain_type == AvailableBlockchainType.BLAST_SEPOLIA:
+        network = Network.blast_sepolia
+    else:
+        raise Exception("Unsupported blockchain type provided")
 
     ethereum_state_provider = MoonstreamEthereumStateProvider(
         web3,

crawlers/mooncrawl/mooncrawl/settings.py

@@ -96,12 +96,6 @@ MOONSTREAM_NODE_MUMBAI_A_EXTERNAL_URI = os.environ.get(
 if MOONSTREAM_NODE_MUMBAI_A_EXTERNAL_URI == "":
     raise Exception("MOONSTREAM_NODE_MUMBAI_A_EXTERNAL_URI env variable is not set")
 
-MOONSTREAM_NODE_AMOY_A_EXTERNAL_URI = os.environ.get(
-    "MOONSTREAM_NODE_AMOY_A_EXTERNAL_URI", ""
-)
-if MOONSTREAM_NODE_AMOY_A_EXTERNAL_URI == "":
-    raise Exception("MOONSTREAM_NODE_AMOY_A_EXTERNAL_URI env variable is not set")
-
 MOONSTREAM_NODE_XDAI_A_EXTERNAL_URI = os.environ.get(
     "MOONSTREAM_NODE_XDAI_A_EXTERNAL_URI", ""
 )
@@ -180,15 +174,6 @@ if MOONSTREAM_NODE_BLAST_SEPOLIA_A_EXTERNAL_URI == "":
         "MOONSTREAM_NODE_BLAST_SEPOLIA_A_EXTERNAL_URI env variable is not set"
     )
 
-MOONSTREAM_NODE_PROOFOFPLAY_APEX_A_EXTERNAL_URI = os.environ.get(
-    "MOONSTREAM_NODE_PROOFOFPLAY_APEX_A_EXTERNAL_URI", ""
-)
-if MOONSTREAM_NODE_PROOFOFPLAY_APEX_A_EXTERNAL_URI == "":
-    raise Exception(
-        "MOONSTREAM_NODE_PROOFOFPLAY_APEX_A_EXTERNAL_URI env variable is not set"
-    )
-
-
 MOONSTREAM_CRAWL_WORKERS = 4
 MOONSTREAM_CRAWL_WORKERS_RAW = os.environ.get("MOONSTREAM_CRAWL_WORKERS")
 try:

crawlers/mooncrawl/mooncrawl/stats_worker/dashboard.py

@@ -24,10 +24,6 @@ from moonstreamdb.blockchain import (
     get_label_model,
     get_transaction_model,
 )
-from moonstreamdb.subscriptions import (
-    blockchain_by_subscription_id,
-    subscription_id_by_blockchain,
-)
 from sqlalchemy import and_
 from sqlalchemy import cast as sqlalchemy_cast
 from sqlalchemy import distinct, extract, func, text
@@ -51,6 +47,61 @@ logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 
+subscription_id_by_blockchain = {
+    "ethereum": "ethereum_smartcontract",
+    "polygon": "polygon_smartcontract",
+    "mumbai": "mumbai_smartcontract",
+    "xdai": "xdai_smartcontract",
+    "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",
+    "blast": "blast_smartcontract",
+    "blast_sepolia": "blast_sepolia_smartcontract",
+}
+
+blockchain_by_subscription_id = {
+    "ethereum_blockchain": "ethereum",
+    "polygon_blockchain": "polygon",
+    "mumbai_blockchain": "mumbai",
+    "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",
+    "blast_blockchain": "blast",
+    "blast_sepolia_blockchain": "blast_sepolia",
+    "ethereum_smartcontract": "ethereum",
+    "polygon_smartcontract": "polygon",
+    "mumbai_smartcontract": "mumbai",
+    "xdai_smartcontract": "xdai",
+    "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",
+    "blast_smartcontract": "blast",
+    "blast_sepolia_smartcontract": "blast_sepolia",
+}
+
+
 class TimeScale(Enum):
     # TODO(Andrey) Unlock when we be sure about perfomanse of agregation on transactions table.
     # Right now it can be hungs

crawlers/mooncrawl/mooncrawl/version.py

@@ -2,4 +2,4 @@
 Moonstream crawlers version.
 """
 
-MOONCRAWL_VERSION = "0.4.4"
+MOONCRAWL_VERSION = "0.4.2"

crawlers/mooncrawl/sample.env

@@ -23,9 +23,7 @@ export NFT_HUMBUG_TOKEN="<Token_for_nft_crawler>"
 # Blockchain nodes environment variables
 export MOONSTREAM_NODE_ETHEREUM_A_EXTERNAL_URI="https://<connection_path_uri_to_node>"
 export MOONSTREAM_NODE_POLYGON_A_EXTERNAL_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_NODE_PROOFOFPLAY_APEX_A_EXTERNAL_URI="https://<connection_path_uri_to_node>"
 export MOONSTREAM_NODE_MUMBAI_A_EXTERNAL_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_NODE_AMOY_A_EXTERNAL_URI="https://<connection_path_uri_to_node>"
 export MOONSTREAM_NODE_XDAI_A_EXTERNAL_URI="https://<connection_path_uri_to_node>"
 export MOONSTREAM_NODE_ZKSYNC_ERA_A_EXTERNAL_URI="https://<connection_path_uri_to_node>"
 export MOONSTREAM_NODE_ZKSYNC_ERA_SEPOLIA_A_EXTERNAL_URI="https://<connection_path_uri_to_node>"

crawlers/mooncrawl/setup.py

@@ -37,7 +37,7 @@ setup(
         "bugout>=0.2.13",
         "chardet",
         "fastapi",
-        "moonstreamdb>=0.4.2",
+        "moonstreamdb>=0.3.12",
         "moonstream>=0.1.1",
         "moonworm[moonstream]>=0.6.2",
         "humbug",

engineapi/engineapi/settings.py

@@ -87,43 +87,46 @@ MOONSTREAM_AWS_SIGNER_INSTANCE_PORT = 17181
 
 # Blockchain configuration
 
+MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI = os.environ.get(
+    "MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI"
+)
+MOONSTREAM_MUMBAI_WEB3_PROVIDER_URI = os.environ.get(
+    "MOONSTREAM_MUMBAI_WEB3_PROVIDER_URI"
+)
+MOONSTREAM_POLYGON_WEB3_PROVIDER_URI = os.environ.get(
+    "MOONSTREAM_POLYGON_WEB3_PROVIDER_URI"
+)
+MOONSTREAM_XDAI_WEB3_PROVIDER_URI = os.environ.get("MOONSTREAM_XDAI_WEB3_PROVIDER_URI")
+
+# TODO(kompotkot): Leave a comment here explaining templated *_WEB3_PROVIDER_URI when we set
+# NODEBALANCER_ACCESS_ID
+ETHEREUM_PROVIDER_URI = MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI
+MUMBAI_PROVIDER_URI = MOONSTREAM_MUMBAI_WEB3_PROVIDER_URI
+POLYGON_PROVIDER_URI = MOONSTREAM_POLYGON_WEB3_PROVIDER_URI
+XDAI_PROVIDER_URI = MOONSTREAM_XDAI_WEB3_PROVIDER_URI
+
 NODEBALANCER_ACCESS_ID = os.environ.get("ENGINE_NODEBALANCER_ACCESS_ID")
+if NODEBALANCER_ACCESS_ID is not None:
+    NODEBALANCER_URI_TEMPLATE = "{}?access_id={}&data_source=blockchain"
+    ETHEREUM_PROVIDER_URI = NODEBALANCER_URI_TEMPLATE.format(
+        MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI, NODEBALANCER_ACCESS_ID
+    )
+    MUMBAI_PROVIDER_URI = NODEBALANCER_URI_TEMPLATE.format(
+        MOONSTREAM_MUMBAI_WEB3_PROVIDER_URI, NODEBALANCER_ACCESS_ID
+    )
+    POLYGON_PROVIDER_URI = NODEBALANCER_URI_TEMPLATE.format(
+        MOONSTREAM_POLYGON_WEB3_PROVIDER_URI, NODEBALANCER_ACCESS_ID
+    )
+    XDAI_PROVIDER_URI = NODEBALANCER_URI_TEMPLATE.format(
+        MOONSTREAM_XDAI_WEB3_PROVIDER_URI, NODEBALANCER_ACCESS_ID
+    )
 
-BLOCKCHAIN_PROVIDER_URIS = {}
-
-blockchain_names = [
-    "ethereum",
-    "polygon",
-    "mumbai",
-    "amoy",
-    "xdai",
-    "zksync_era",
-    "zksync_era_sepolia",
-    "arbitrum_nova",
-    "arbitrum_sepolia",
-    "xai",
-    "xai_sepolia",
-    "avalanche",
-    "avalanche_fuji",
-    "blast",
-    "blast_sepolia",
-    "proofofplay_apex",
-]
-
-for b in blockchain_names:
-    provider_uri = os.environ.get(f"MOONSTREAM_{b.upper()}_WEB3_PROVIDER_URI")
-    if provider_uri is None:
-        continue
-
-    if NODEBALANCER_ACCESS_ID is not None:
-        NODEBALANCER_URI_TEMPLATE = "{}?access_id={}&data_source=blockchain"
-        provider_uri = NODEBALANCER_URI_TEMPLATE.format(
-            provider_uri, NODEBALANCER_ACCESS_ID
-        )
-
-    BLOCKCHAIN_PROVIDER_URIS[b] = provider_uri
-
-    globals()[f"MOONSTREAM_{b.upper()}_WEB3_PROVIDER_URI"] = provider_uri
+BLOCKCHAIN_PROVIDER_URIS = {
+    "ethereum": ETHEREUM_PROVIDER_URI,
+    "mumbai": MUMBAI_PROVIDER_URI,
+    "polygon": POLYGON_PROVIDER_URI,
+    "xdai": XDAI_PROVIDER_URI,
+}
 
 SUPPORTED_BLOCKCHAINS = ", ".join(BLOCKCHAIN_PROVIDER_URIS)
 UNSUPPORTED_BLOCKCHAIN_ERROR_MESSAGE = f"That blockchain is not supported. The supported blockchains are: {SUPPORTED_BLOCKCHAINS}."

engineapi/engineapi/version.txt

@@ -1 +1 @@
-0.0.9
+0.0.8

engineapi/sample.env

@@ -14,21 +14,10 @@ export ENGINE_REDIS_PASSWORD="<redis_requirepass_password>"
 export ENGINE_REDIS_URL="localhost:6380"
 
 # Web3 Provider URIs
-export MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_POLYGON_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_MUMBAI_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_AMOY_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_XDAI_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_ZKSYNC_ERA_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_ZKSYNC_ERA_SEPOLIA_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_ARBITRUM_NOVA_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_ARBITRUM_SEPOLIA_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_XAI_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_XAI_SEPOLIA_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_AVALANCHE_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_AVALANCHE_FUJI_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_BLAST_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_BLAST_SEPOLIA_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
+export MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI="<JSON_RPC_API_URL>"
+export MOONSTREAM_MUMBAI_WEB3_PROVIDER_URI="<JSON_RPC_API_URL>"
+export MOONSTREAM_POLYGON_WEB3_PROVIDER_URI="<JSON_RPC_API_URL>"
+export MOONSTREAM_XDAI_WEB3_PROVIDER_URI="<JSON_RPC_API_URL>"
 export ENGINE_NODEBALANCER_ACCESS_ID="<access_id_for_Moonstream_Node_Balancer-if_provided_it_is_interpolated_into_provider_URIs>"
 
 # leaderboard config

moonstreamapi/configs/sample.env

@@ -17,9 +17,7 @@ export MOONSTREAM_DATA_JOURNAL_ID="<bugout_journal_id_to_store_blockchain_data>"
 export HUMBUG_TXPOOL_CLIENT_ID="<Bugout_Humbug_client_id_for_txpool_transactions_in_journal>"
 export MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
 export MOONSTREAM_POLYGON_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_PROOFOFPLAY_APEX_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
 export MOONSTREAM_MUMBAI_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
-export MOONSTREAM_AMOY_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
 export MOONSTREAM_XDAI_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
 export MOONSTREAM_WYRM_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"
 export MOONSTREAM_ZKSYNC_ERA_TESTNET_WEB3_PROVIDER_URI="https://<connection_path_uri_to_node>"

moonstreamapi/moonstreamapi/actions.py

@@ -25,7 +25,6 @@ from ens.utils import is_valid_ens_name  # type: ignore
 from eth_utils.address import is_address  # type: ignore
 from moonstreamdb.blockchain import AvailableBlockchainType
 from moonstreamdb.models import EthereumLabel
-from moonstreamdb.subscriptions import blockchain_by_subscription_id
 from slugify import slugify  # type: ignore
 from sqlalchemy import text
 from sqlalchemy.orm import Session
@@ -53,6 +52,42 @@ from .web3_provider import FunctionSignature, connect, multicall
 logger = logging.getLogger(__name__)
 
 
+blockchain_by_subscription_id = {
+    "ethereum_blockchain": "ethereum",
+    "polygon_blockchain": "polygon",
+    "mumbai_blockchain": "mumbai",
+    "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",
+    "blast_blockchain": "blast",
+    "blast_sepolia_blockchain": "blast_sepolia",
+    "ethereum_smartcontract": "ethereum",
+    "polygon_smartcontract": "polygon",
+    "mumbai_smartcontract": "mumbai",
+    "xdai_smartcontract": "xdai",
+    "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",
+    "blast_smartcontract": "blast",
+    "blast_sepolia_smartcontract": "blast_sepolia",
+}
+
+
 class StatusAPIException(Exception):
     """
     Raised during checking Moonstream API statuses.

moonstreamapi/moonstreamapi/admin/subscription_types.py

@@ -40,17 +40,6 @@ CANONICAL_SUBSCRIPTION_TYPES = {
         stripe_price_id=None,
         active=True,
     ),
-    "proofofplay_apex_smartcontract": SubscriptionTypeResourceData(
-        id="proofofplay_apex_smartcontract",
-        name="Proof of Play Apex smartcontracts",
-        blockchain="proofofplay_apex",
-        choices=["input:address", "tag:erc721"],
-        description="Contracts events and tx_calls of contract of Proof of Play Apex blockchain",
-        icon_url="https://static.simiotics.com/moonstream/assets/ethereum/eth-diamond-purple.png",
-        stripe_product_id=None,
-        stripe_price_id=None,
-        active=True,
-    ),
     "mumbai_smartcontract": SubscriptionTypeResourceData(
         id="mumbai_smartcontract",
         name="Mumbai smartcontracts",
@@ -62,17 +51,6 @@ CANONICAL_SUBSCRIPTION_TYPES = {
         stripe_price_id=None,
         active=True,
     ),
-    "amoy_smartcontract": SubscriptionTypeResourceData(
-        id="amoy_smartcontract",
-        name="Amoy smartcontracts",
-        blockchain="amoy",
-        choices=["input:address", "tag:erc721"],
-        description="Contracts events and tx_calls of contract of Amoy blockchain",
-        icon_url="https://static.simiotics.com/moonstream/assets/matic-token-inverted-icon.png",
-        stripe_product_id=None,
-        stripe_price_id=None,
-        active=True,
-    ),
     "xdai_smartcontract": SubscriptionTypeResourceData(
         id="xdai_smartcontract",
         name="XDai smartcontract",
@@ -238,17 +216,6 @@ CANONICAL_SUBSCRIPTION_TYPES = {
         stripe_price_id=None,
         active=False,
     ),
-    "proofofplay_apex_blockchain": SubscriptionTypeResourceData(
-        id="proofofplay_apex_blockchain",
-        name="Proof of Play Apex transactions",
-        blockchain="proofofplay_apex",
-        choices=["input:address", "tag:erc721"],
-        description="Transactions that have been mined into the Proof of Play Apex blockchain",
-        icon_url="https://static.simiotics.com/moonstream/assets/ethereum/eth-diamond-purple.png",
-        stripe_product_id=None,
-        stripe_price_id=None,
-        active=False,
-    ),
     "mumbai_blockchain": SubscriptionTypeResourceData(
         id="mumbai_blockchain",
         name="Mumbai transactions",
@@ -260,17 +227,6 @@ CANONICAL_SUBSCRIPTION_TYPES = {
         stripe_price_id=None,
         active=False,
     ),
-    "amoy_blockchain": SubscriptionTypeResourceData(
-        id="amoy_blockchain",
-        name="Amoy transactions",
-        blockchain="amoy",
-        choices=["input:address", "tag:erc721"],
-        description="Transactions that have been mined into the Amoy blockchain",
-        icon_url="https://static.simiotics.com/moonstream/assets/matic-token-inverted-icon.png",
-        stripe_product_id=None,
-        stripe_price_id=None,
-        active=False,
-    ),
     "xdai_blockchain": SubscriptionTypeResourceData(
         id="xdai_blockchain",
         name="XDai transactions",

moonstreamapi/moonstreamapi/providers/__init__.py

@@ -49,9 +49,7 @@ class ReceivingEventsException(Exception):
 event_providers: Dict[str, Any] = {
     moonworm_provider.EthereumMoonwormProvider.event_type: moonworm_provider.EthereumMoonwormProvider,
     moonworm_provider.PolygonMoonwormProvider.event_type: moonworm_provider.PolygonMoonwormProvider,
-    moonworm_provider.ProofOfPlayApexMoonwormProvider.event_type: moonworm_provider.ProofOfPlayApexMoonwormProvider,
     moonworm_provider.MumbaiMoonwormProvider.event_type: moonworm_provider.MumbaiMoonwormProvider,
-    moonworm_provider.AmoyMoonwormProvider.event_type: moonworm_provider.AmoyMoonwormProvider,
     moonworm_provider.XDaiMoonwormProvider.event_type: moonworm_provider.XDaiMoonwormProvider,
     moonworm_provider.ZkSyncEraTestnetMoonwormProvider.event_type: moonworm_provider.ZkSyncEraTestnetMoonwormProvider,
     moonworm_provider.ZkSyncEraMoonwormProvider.event_type: moonworm_provider.ZkSyncEraMoonwormProvider,
@@ -66,9 +64,7 @@ event_providers: Dict[str, Any] = {
     moonworm_provider.BlastSepoliaMoonwormProvider.event_type: moonworm_provider.BlastSepoliaMoonwormProvider,
     transactions.EthereumTransactions.event_type: transactions.EthereumTransactions,
     transactions.PolygonTransactions.event_type: transactions.PolygonTransactions,
-    transactions.ProofOfPlayApexTransactions.event_type: transactions.ProofOfPlayApexTransactions,
     transactions.MumbaiTransactions.event_type: transactions.MumbaiTransactions,
-    transactions.AmoyTransactions.event_type: transactions.AmoyTransactions,
     transactions.XDaiTransactions.event_type: transactions.XDaiTransactions,
     transactions.ZkSyncEraTestnetTransactions.event_type: transactions.ZkSyncEraTestnetTransactions,
     transactions.ZkSyncEraTransactions.event_type: transactions.ZkSyncEraTransactions,

moonstreamapi/moonstreamapi/providers/moonworm_provider.py

@@ -19,9 +19,7 @@ logger.setLevel(logging.WARN)
 
 ethereum_event_type = "ethereum_blockchain"
 polygon_event_type = "polygon_blockchain"
-proofofplay_apex_event_type = "proofofplay_apex_blockchain"
 mumbai_event_type = "mumbai_blockchain"
-amoy_event_type = "amoy_blockchain"
 xdai_event_type = "xdai_blockchain"
 zksync_era_testnet_event_type = "zksync_era_testnet_blockchain"
 zksync_era_event_type = "zksync_era_blockchain"
@@ -421,13 +419,6 @@ MumbaiMoonwormProvider = MoonwormProvider(
     streamboaundary_range_limit=2 * 60 * 60,
 )
 
-AmoyMoonwormProvider = MoonwormProvider(
-    event_type="amoy_smartcontract",
-    blockchain=AvailableBlockchainType("amoy"),
-    description="Provider for reviving transactions from Amoy tables.",
-    streamboaundary_range_limit=2 * 60 * 60,
-)
-
 XDaiMoonwormProvider = MoonwormProvider(
     event_type="xdai_smartcontract",
     blockchain=AvailableBlockchainType("xdai"),
@@ -511,10 +502,3 @@ BlastSepoliaMoonwormProvider = MoonwormProvider(
     description="Provider for reviving transactions from Blast Sepolia tables.",
     streamboaundary_range_limit=2 * 60 * 60,
 )
-
-ProofOfPlayApexMoonwormProvider = MoonwormProvider(
-    event_type="proofofplay_apex_smartcontract",
-    blockchain=AvailableBlockchainType("proofofplay_apex"),
-    description="Provider for reviving transactions from Proof of Play Apex tables.",
-    streamboaundary_range_limit=2 * 60 * 60,
-)

moonstreamapi/moonstreamapi/providers/transactions.py

@@ -469,13 +469,6 @@ MumbaiTransactions = TransactionsProvider(
     streamboaundary_range_limit=2 * 60 * 60,
 )
 
-AmoyTransactions = TransactionsProvider(
-    event_type="amoy_blockchain",
-    blockchain=AvailableBlockchainType("amoy"),
-    description="Provider for resiving transactions from Amoy tables.",
-    streamboaundary_range_limit=2 * 60 * 60,
-)
-
 XDaiTransactions = TransactionsProvider(
     event_type="xdai_blockchain",
     blockchain=AvailableBlockchainType("xdai"),
@@ -559,10 +552,3 @@ BlastSepoliaTransactions = TransactionsProvider(
     description="Provider for resiving transactions from Blast Sepolia tables.",
     streamboaundary_range_limit=2 * 60 * 60,
 )
-
-ProofOfPlayApexTransactions = TransactionsProvider(
-    event_type="proofofplay_apex_blockchain",
-    blockchain=AvailableBlockchainType("proofofplay_apex"),
-    description="Provider for resiving transactions from Proof of Play Apex tables.",
-    streamboaundary_range_limit=2 * 60 * 60,
-)

moonstreamapi/moonstreamapi/settings.py

@@ -118,12 +118,6 @@ MOONSTREAM_MUMBAI_WEB3_PROVIDER_URI = os.environ.get(
 if MOONSTREAM_MUMBAI_WEB3_PROVIDER_URI == "":
     raise Exception("MOONSTREAM_MUMBAI_WEB3_PROVIDER_URI env variable is not set")
 
-MOONSTREAM_AMOY_WEB3_PROVIDER_URI = os.environ.get(
-    "MOONSTREAM_AMOY_WEB3_PROVIDER_URI", ""
-)
-if MOONSTREAM_AMOY_WEB3_PROVIDER_URI == "":
-    raise Exception("MOONSTREAM_AMOY_WEB3_PROVIDER_URI env variable is not set")
-
 MOONSTREAM_XDAI_WEB3_PROVIDER_URI = os.environ.get(
     "MOONSTREAM_XDAI_WEB3_PROVIDER_URI", ""
 )
@@ -214,14 +208,6 @@ if MOONSTREAM_BLAST_SEPOLIA_WEB3_PROVIDER_URI == "":
         "MOONSTREAM_BLAST_SEPOLIA_WEB3_PROVIDER_URI env variable is not set"
     )
 
-MOONSTREAM_PROOFOFPLAY_APEX_WEB3_PROVIDER_URI = os.environ.get(
-    "MOONSTREAM_PROOFOFPLAY_APEX_WEB3_PROVIDER_URI", ""
-)
-if MOONSTREAM_PROOFOFPLAY_APEX_WEB3_PROVIDER_URI == "":
-    raise Exception(
-        "MOONSTREAM_PROOFOFPLAY_APEX_WEB3_PROVIDER_URI env variable is not set"
-    )
-
 ## QueryAPI
 
 MOONSTREAM_S3_QUERIES_BUCKET = os.environ.get("MOONSTREAM_S3_QUERIES_BUCKET", "")
@@ -272,7 +258,6 @@ THREAD_TIMEOUT_SECONDS = 10
 multicall_contracts: Dict[AvailableBlockchainType, str] = {
     AvailableBlockchainType.POLYGON: "0xc8E51042792d7405184DfCa245F2d27B94D013b6",
     AvailableBlockchainType.MUMBAI: "0xe9939e7Ea7D7fb619Ac57f648Da7B1D425832631",
-    AvailableBlockchainType.AMOY: "0xcA11bde05977b3631167028862bE2a173976CA11",
     AvailableBlockchainType.ETHEREUM: "0x5BA1e12693Dc8F9c48aAD8770482f4739bEeD696",
     AvailableBlockchainType.ARBITRUM_NOVA: "0xcA11bde05977b3631167028862bE2a173976CA11",
     AvailableBlockchainType.ARBITRUM_SEPOLIA: "0xcA11bde05977b3631167028862bE2a173976CA11",

moonstreamapi/moonstreamapi/version.py

@@ -2,4 +2,4 @@
 Moonstream library and API version.
 """
 
-MOONSTREAMAPI_VERSION = "0.4.2"
+MOONSTREAMAPI_VERSION = "0.3.6"

moonstreamapi/moonstreamapi/web3_provider.py

@@ -12,7 +12,6 @@ from web3.middleware import geth_poa_middleware
 from web3.providers.rpc import HTTPProvider
 
 from .settings import (
-    MOONSTREAM_AMOY_WEB3_PROVIDER_URI,
     MOONSTREAM_ARBITRUM_NOVA_WEB3_PROVIDER_URI,
     MOONSTREAM_ARBITRUM_SEPOLIA_WEB3_PROVIDER_URI,
     MOONSTREAM_AVALANCHE_FUJI_WEB3_PROVIDER_URI,
@@ -22,7 +21,6 @@ from .settings import (
     MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI,
     MOONSTREAM_MUMBAI_WEB3_PROVIDER_URI,
     MOONSTREAM_POLYGON_WEB3_PROVIDER_URI,
-    MOONSTREAM_PROOFOFPLAY_APEX_WEB3_PROVIDER_URI,
     MOONSTREAM_WYRM_WEB3_PROVIDER_URI,
     MOONSTREAM_XAI_SEPOLIA_WEB3_PROVIDER_URI,
     MOONSTREAM_XAI_WEB3_PROVIDER_URI,
@@ -76,8 +74,6 @@ def connect(
             web3_uri = MOONSTREAM_POLYGON_WEB3_PROVIDER_URI
         elif blockchain_type == AvailableBlockchainType.MUMBAI:
             web3_uri = MOONSTREAM_MUMBAI_WEB3_PROVIDER_URI
-        elif blockchain_type == AvailableBlockchainType.AMOY:
-            web3_uri = MOONSTREAM_AMOY_WEB3_PROVIDER_URI
         elif blockchain_type == AvailableBlockchainType.XDAI:
             web3_uri = MOONSTREAM_XDAI_WEB3_PROVIDER_URI
         elif blockchain_type == AvailableBlockchainType.WYRM:
@@ -104,8 +100,6 @@ def connect(
             web3_uri = MOONSTREAM_BLAST_WEB3_PROVIDER_URI
         elif blockchain_type == AvailableBlockchainType.BLAST_SEPOLIA:
             web3_uri = MOONSTREAM_BLAST_SEPOLIA_WEB3_PROVIDER_URI
-        elif blockchain_type == AvailableBlockchainType.PROOFOFPLAY_APEX:
-            web3_uri = MOONSTREAM_PROOFOFPLAY_APEX_WEB3_PROVIDER_URI
         else:
             raise Exception("Wrong blockchain type provided for web3 URI")
 

moonstreamapi/requirements.txt

@@ -37,7 +37,7 @@ lru-dict==1.1.8
 Mako==1.2.3
 MarkupSafe==2.1.1
 moonstream==0.1.1
-moonstreamdb==0.4.2
+moonstreamdb==0.3.12
 multiaddr==0.0.9
 multidict==6.0.2
 netaddr==0.8.0

moonstreamapi/setup.py

@@ -16,7 +16,7 @@ setup(
         "bugout>=0.2.15",
         "fastapi",
         "moonstream",
-        "moonstreamdb>=0.4.2",
+        "moonstreamdb>=0.3.12",
         "humbug",
         "pydantic==1.10.2",
         "pyevmasm",

moonstreamdb/alembic/env.py

@@ -25,9 +25,6 @@ target_metadata = MoonstreamBase.metadata
 # my_important_option = config.get_main_option("my_important_option")
 # ... etc.
 from moonstreamdb.models import (
-    AmoyBlock,
-    AmoyTransaction,
-    AmoyLabel,
     ArbitrumNovaBlock,
     ArbitrumNovaLabel,
     ArbitrumNovaTransaction,
@@ -79,9 +76,6 @@ from moonstreamdb.models import (
     BlastSepoliaBlock,
     BlastSepoliaLabel,
     BlastSepoliaTransaction,
-    ProofOfPlayApexBlock,
-    ProofOfPlayApexLabel,
-    ProofOfPlayApexTransaction,
 )
 
 
@@ -96,9 +90,6 @@ def include_symbol(tablename, schema):
         MumbaiBlock.__tablename__,
         MumbaiTransaction.__tablename__,
         MumbaiLabel.__tablename__,
-        AmoyBlock.__tablename__,
-        AmoyTransaction.__tablename__,
-        AmoyLabel.__tablename__,
         ESDFunctionSignature.__tablename__,
         ESDEventSignature.__tablename__,
         OpenSeaCrawlingState.__tablename__,
@@ -141,9 +132,6 @@ def include_symbol(tablename, schema):
         BlastSepoliaBlock.__tablename__,
         BlastSepoliaLabel.__tablename__,
         BlastSepoliaTransaction.__tablename__,
-        ProofOfPlayApexBlock.__tablename__,
-        ProofOfPlayApexLabel.__tablename__,
-        ProofOfPlayApexTransaction.__tablename__,
     }
 
 

moonstreamdb/alembic/versions/a1d9fab5f904_proofofplay_apex_blockchain.py

@@ -1,285 +0,0 @@
-"""ProofOfPlay Apex blockchain
-
-Revision ID: a1d9fab5f904
-Revises: c8eaa4ff9d76
-Create Date: 2024-04-17 02:35:52.418934
-
-"""
-
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision = "a1d9fab5f904"
-down_revision = "c8eaa4ff9d76"
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table(
-        "proofofplay_apex_blocks",
-        sa.Column("block_number", sa.BigInteger(), nullable=False),
-        sa.Column("difficulty", sa.BigInteger(), nullable=True),
-        sa.Column("extra_data", sa.VARCHAR(length=128), nullable=True),
-        sa.Column("gas_limit", sa.BigInteger(), nullable=True),
-        sa.Column("gas_used", sa.BigInteger(), nullable=True),
-        sa.Column("base_fee_per_gas", sa.Numeric(precision=78, scale=0), nullable=True),
-        sa.Column("hash", sa.VARCHAR(length=256), nullable=True),
-        sa.Column("logs_bloom", sa.VARCHAR(length=1024), nullable=True),
-        sa.Column("miner", sa.VARCHAR(length=256), nullable=True),
-        sa.Column("nonce", sa.VARCHAR(length=256), nullable=True),
-        sa.Column("parent_hash", sa.VARCHAR(length=256), nullable=True),
-        sa.Column("receipt_root", sa.VARCHAR(length=256), nullable=True),
-        sa.Column("uncles", sa.VARCHAR(length=256), nullable=True),
-        sa.Column("size", sa.Integer(), nullable=True),
-        sa.Column("state_root", sa.VARCHAR(length=256), nullable=True),
-        sa.Column("timestamp", sa.BigInteger(), nullable=True),
-        sa.Column("total_difficulty", sa.VARCHAR(length=256), nullable=True),
-        sa.Column("transactions_root", sa.VARCHAR(length=256), nullable=True),
-        sa.Column(
-            "indexed_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.text("TIMEZONE('utc', statement_timestamp())"),
-            nullable=False,
-        ),
-        sa.Column("sha3_uncles", sa.VARCHAR(length=256), nullable=True),
-        sa.Column("l1_block_number", sa.BigInteger(), nullable=True),
-        sa.Column("send_count", sa.BigInteger(), nullable=True),
-        sa.Column("send_root", sa.VARCHAR(length=256), nullable=True),
-        sa.Column("mix_hash", sa.VARCHAR(length=256), nullable=True),
-        sa.PrimaryKeyConstraint(
-            "block_number", name=op.f("pk_proofofplay_apex_blocks")
-        ),
-    )
-    op.create_index(
-        op.f("ix_proofofplay_apex_blocks_block_number"),
-        "proofofplay_apex_blocks",
-        ["block_number"],
-        unique=True,
-    )
-    op.create_index(
-        op.f("ix_proofofplay_apex_blocks_hash"),
-        "proofofplay_apex_blocks",
-        ["hash"],
-        unique=False,
-    )
-    op.create_index(
-        op.f("ix_proofofplay_apex_blocks_timestamp"),
-        "proofofplay_apex_blocks",
-        ["timestamp"],
-        unique=False,
-    )
-    op.create_table(
-        "proofofplay_apex_labels",
-        sa.Column("id", sa.UUID(), nullable=False),
-        sa.Column("label", sa.VARCHAR(length=256), nullable=False),
-        sa.Column("block_number", sa.BigInteger(), nullable=True),
-        sa.Column("address", sa.VARCHAR(length=256), nullable=True),
-        sa.Column("transaction_hash", sa.VARCHAR(length=256), nullable=True),
-        sa.Column("label_data", postgresql.JSONB(astext_type=sa.Text()), nullable=True),
-        sa.Column("block_timestamp", sa.BigInteger(), nullable=True),
-        sa.Column("log_index", sa.Integer(), nullable=True),
-        sa.Column(
-            "created_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.text("TIMEZONE('utc', statement_timestamp())"),
-            nullable=False,
-        ),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_proofofplay_apex_labels")),
-        sa.UniqueConstraint("id", name=op.f("uq_proofofplay_apex_labels_id")),
-    )
-    op.create_index(
-        op.f("ix_proofofplay_apex_labels_address"),
-        "proofofplay_apex_labels",
-        ["address"],
-        unique=False,
-    )
-    op.create_index(
-        "ix_proofofplay_apex_labels_address_block_number",
-        "proofofplay_apex_labels",
-        ["address", "block_number"],
-        unique=False,
-    )
-    op.create_index(
-        "ix_proofofplay_apex_labels_address_block_timestamp",
-        "proofofplay_apex_labels",
-        ["address", "block_timestamp"],
-        unique=False,
-    )
-    op.create_index(
-        op.f("ix_proofofplay_apex_labels_block_number"),
-        "proofofplay_apex_labels",
-        ["block_number"],
-        unique=False,
-    )
-    op.create_index(
-        op.f("ix_proofofplay_apex_labels_block_timestamp"),
-        "proofofplay_apex_labels",
-        ["block_timestamp"],
-        unique=False,
-    )
-    op.create_index(
-        op.f("ix_proofofplay_apex_labels_label"),
-        "proofofplay_apex_labels",
-        ["label"],
-        unique=False,
-    )
-    op.create_index(
-        op.f("ix_proofofplay_apex_labels_transaction_hash"),
-        "proofofplay_apex_labels",
-        ["transaction_hash"],
-        unique=False,
-    )
-    op.create_table(
-        "proofofplay_apex_transactions",
-        sa.Column("hash", sa.VARCHAR(length=256), nullable=False),
-        sa.Column("block_number", sa.BigInteger(), nullable=False),
-        sa.Column("from_address", sa.VARCHAR(length=256), nullable=True),
-        sa.Column("to_address", sa.VARCHAR(length=256), nullable=True),
-        sa.Column("gas", sa.Numeric(precision=78, scale=0), nullable=True),
-        sa.Column("gas_price", sa.Numeric(precision=78, scale=0), nullable=True),
-        sa.Column("max_fee_per_gas", sa.Numeric(precision=78, scale=0), nullable=True),
-        sa.Column(
-            "max_priority_fee_per_gas", sa.Numeric(precision=78, scale=0), nullable=True
-        ),
-        sa.Column("input", sa.Text(), nullable=True),
-        sa.Column("nonce", sa.VARCHAR(length=256), nullable=True),
-        sa.Column("transaction_index", sa.BigInteger(), nullable=True),
-        sa.Column("transaction_type", sa.Integer(), nullable=True),
-        sa.Column("value", sa.Numeric(precision=78, scale=0), nullable=True),
-        sa.Column(
-            "indexed_at",
-            sa.DateTime(timezone=True),
-            server_default=sa.text("TIMEZONE('utc', statement_timestamp())"),
-            nullable=False,
-        ),
-        sa.Column("y_parity", sa.BigInteger(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["block_number"],
-            ["proofofplay_apex_blocks.block_number"],
-            name=op.f(
-                "fk_proofofplay_apex_transactions_block_number_proofofplay_apex_blocks"
-            ),
-            ondelete="CASCADE",
-        ),
-        sa.PrimaryKeyConstraint("hash", name=op.f("pk_proofofplay_apex_transactions")),
-    )
-    op.create_index(
-        op.f("ix_proofofplay_apex_transactions_block_number"),
-        "proofofplay_apex_transactions",
-        ["block_number"],
-        unique=False,
-    )
-    op.create_index(
-        op.f("ix_proofofplay_apex_transactions_from_address"),
-        "proofofplay_apex_transactions",
-        ["from_address"],
-        unique=False,
-    )
-    op.create_index(
-        op.f("ix_proofofplay_apex_transactions_gas"),
-        "proofofplay_apex_transactions",
-        ["gas"],
-        unique=False,
-    )
-    op.create_index(
-        op.f("ix_proofofplay_apex_transactions_gas_price"),
-        "proofofplay_apex_transactions",
-        ["gas_price"],
-        unique=False,
-    )
-    op.create_index(
-        op.f("ix_proofofplay_apex_transactions_hash"),
-        "proofofplay_apex_transactions",
-        ["hash"],
-        unique=True,
-    )
-    op.create_index(
-        op.f("ix_proofofplay_apex_transactions_to_address"),
-        "proofofplay_apex_transactions",
-        ["to_address"],
-        unique=False,
-    )
-    op.create_index(
-        op.f("ix_proofofplay_apex_transactions_value"),
-        "proofofplay_apex_transactions",
-        ["value"],
-        unique=False,
-    )
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_index(
-        op.f("ix_proofofplay_apex_transactions_value"),
-        table_name="proofofplay_apex_transactions",
-    )
-    op.drop_index(
-        op.f("ix_proofofplay_apex_transactions_to_address"),
-        table_name="proofofplay_apex_transactions",
-    )
-    op.drop_index(
-        op.f("ix_proofofplay_apex_transactions_hash"),
-        table_name="proofofplay_apex_transactions",
-    )
-    op.drop_index(
-        op.f("ix_proofofplay_apex_transactions_gas_price"),
-        table_name="proofofplay_apex_transactions",
-    )
-    op.drop_index(
-        op.f("ix_proofofplay_apex_transactions_gas"),
-        table_name="proofofplay_apex_transactions",
-    )
-    op.drop_index(
-        op.f("ix_proofofplay_apex_transactions_from_address"),
-        table_name="proofofplay_apex_transactions",
-    )
-    op.drop_index(
-        op.f("ix_proofofplay_apex_transactions_block_number"),
-        table_name="proofofplay_apex_transactions",
-    )
-    op.drop_table("proofofplay_apex_transactions")
-    op.drop_index(
-        op.f("ix_proofofplay_apex_labels_transaction_hash"),
-        table_name="proofofplay_apex_labels",
-    )
-    op.drop_index(
-        op.f("ix_proofofplay_apex_labels_label"), table_name="proofofplay_apex_labels"
-    )
-    op.drop_index(
-        op.f("ix_proofofplay_apex_labels_block_timestamp"),
-        table_name="proofofplay_apex_labels",
-    )
-    op.drop_index(
-        op.f("ix_proofofplay_apex_labels_block_number"),
-        table_name="proofofplay_apex_labels",
-    )
-    op.drop_index(
-        "ix_proofofplay_apex_labels_address_block_timestamp",
-        table_name="proofofplay_apex_labels",
-    )
-    op.drop_index(
-        "ix_proofofplay_apex_labels_address_block_number",
-        table_name="proofofplay_apex_labels",
-    )
-    op.drop_index(
-        op.f("ix_proofofplay_apex_labels_address"), table_name="proofofplay_apex_labels"
-    )
-    op.drop_table("proofofplay_apex_labels")
-    op.drop_index(
-        op.f("ix_proofofplay_apex_blocks_timestamp"),
-        table_name="proofofplay_apex_blocks",
-    )
-    op.drop_index(
-        op.f("ix_proofofplay_apex_blocks_hash"), table_name="proofofplay_apex_blocks"
-    )
-    op.drop_index(
-        op.f("ix_proofofplay_apex_blocks_block_number"),
-        table_name="proofofplay_apex_blocks",
-    )
-    op.drop_table("proofofplay_apex_blocks")
-    # ### end Alembic commands ###

moonstreamdb/alembic/versions/c8eaa4ff9d76_amoy_blockchain.py

@@ -1,120 +0,0 @@
-"""Amoy blockchain
-
-Revision ID: c8eaa4ff9d76
-Revises: 181c5800cb1b
-Create Date: 2024-04-15 08:06:30.569765
-
-"""
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision = 'c8eaa4ff9d76'
-down_revision = '181c5800cb1b'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('amoy_blocks',
-    sa.Column('block_number', sa.BigInteger(), nullable=False),
-    sa.Column('difficulty', sa.BigInteger(), nullable=True),
-    sa.Column('extra_data', sa.VARCHAR(length=128), nullable=True),
-    sa.Column('gas_limit', sa.BigInteger(), nullable=True),
-    sa.Column('gas_used', sa.BigInteger(), nullable=True),
-    sa.Column('base_fee_per_gas', sa.Numeric(precision=78, scale=0), nullable=True),
-    sa.Column('hash', sa.VARCHAR(length=256), nullable=True),
-    sa.Column('logs_bloom', sa.VARCHAR(length=1024), nullable=True),
-    sa.Column('miner', sa.VARCHAR(length=256), nullable=True),
-    sa.Column('nonce', sa.VARCHAR(length=256), nullable=True),
-    sa.Column('parent_hash', sa.VARCHAR(length=256), nullable=True),
-    sa.Column('receipt_root', sa.VARCHAR(length=256), nullable=True),
-    sa.Column('uncles', sa.VARCHAR(length=256), nullable=True),
-    sa.Column('size', sa.Integer(), nullable=True),
-    sa.Column('state_root', sa.VARCHAR(length=256), nullable=True),
-    sa.Column('timestamp', sa.BigInteger(), nullable=True),
-    sa.Column('total_difficulty', sa.VARCHAR(length=256), nullable=True),
-    sa.Column('transactions_root', sa.VARCHAR(length=256), nullable=True),
-    sa.Column('indexed_at', sa.DateTime(timezone=True), server_default=sa.text("TIMEZONE('utc', statement_timestamp())"), nullable=False),
-    sa.PrimaryKeyConstraint('block_number', name=op.f('pk_amoy_blocks'))
-    )
-    op.create_index(op.f('ix_amoy_blocks_block_number'), 'amoy_blocks', ['block_number'], unique=True)
-    op.create_index(op.f('ix_amoy_blocks_hash'), 'amoy_blocks', ['hash'], unique=False)
-    op.create_index(op.f('ix_amoy_blocks_timestamp'), 'amoy_blocks', ['timestamp'], unique=False)
-    op.create_table('amoy_labels',
-    sa.Column('id', sa.UUID(), nullable=False),
-    sa.Column('label', sa.VARCHAR(length=256), nullable=False),
-    sa.Column('block_number', sa.BigInteger(), nullable=True),
-    sa.Column('address', sa.VARCHAR(length=256), nullable=True),
-    sa.Column('transaction_hash', sa.VARCHAR(length=256), nullable=True),
-    sa.Column('label_data', postgresql.JSONB(astext_type=sa.Text()), nullable=True),
-    sa.Column('block_timestamp', sa.BigInteger(), nullable=True),
-    sa.Column('log_index', sa.Integer(), nullable=True),
-    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text("TIMEZONE('utc', statement_timestamp())"), nullable=False),
-    sa.PrimaryKeyConstraint('id', name=op.f('pk_amoy_labels')),
-    sa.UniqueConstraint('id', name=op.f('uq_amoy_labels_id'))
-    )
-    op.create_index(op.f('ix_amoy_labels_address'), 'amoy_labels', ['address'], unique=False)
-    op.create_index('ix_amoy_labels_address_block_number', 'amoy_labels', ['address', 'block_number'], unique=False)
-    op.create_index('ix_amoy_labels_address_block_timestamp', 'amoy_labels', ['address', 'block_timestamp'], unique=False)
-    op.create_index(op.f('ix_amoy_labels_block_number'), 'amoy_labels', ['block_number'], unique=False)
-    op.create_index(op.f('ix_amoy_labels_block_timestamp'), 'amoy_labels', ['block_timestamp'], unique=False)
-    op.create_index(op.f('ix_amoy_labels_label'), 'amoy_labels', ['label'], unique=False)
-    op.create_index(op.f('ix_amoy_labels_transaction_hash'), 'amoy_labels', ['transaction_hash'], unique=False)
-    op.create_table('amoy_transactions',
-    sa.Column('hash', sa.VARCHAR(length=256), nullable=False),
-    sa.Column('block_number', sa.BigInteger(), nullable=False),
-    sa.Column('from_address', sa.VARCHAR(length=256), nullable=True),
-    sa.Column('to_address', sa.VARCHAR(length=256), nullable=True),
-    sa.Column('gas', sa.Numeric(precision=78, scale=0), nullable=True),
-    sa.Column('gas_price', sa.Numeric(precision=78, scale=0), nullable=True),
-    sa.Column('max_fee_per_gas', sa.Numeric(precision=78, scale=0), nullable=True),
-    sa.Column('max_priority_fee_per_gas', sa.Numeric(precision=78, scale=0), nullable=True),
-    sa.Column('input', sa.Text(), nullable=True),
-    sa.Column('nonce', sa.VARCHAR(length=256), nullable=True),
-    sa.Column('transaction_index', sa.BigInteger(), nullable=True),
-    sa.Column('transaction_type', sa.Integer(), nullable=True),
-    sa.Column('value', sa.Numeric(precision=78, scale=0), nullable=True),
-    sa.Column('indexed_at', sa.DateTime(timezone=True), server_default=sa.text("TIMEZONE('utc', statement_timestamp())"), nullable=False),
-    sa.ForeignKeyConstraint(['block_number'], ['amoy_blocks.block_number'], name=op.f('fk_amoy_transactions_block_number_amoy_blocks'), ondelete='CASCADE'),
-    sa.PrimaryKeyConstraint('hash', name=op.f('pk_amoy_transactions'))
-    )
-    op.create_index(op.f('ix_amoy_transactions_block_number'), 'amoy_transactions', ['block_number'], unique=False)
-    op.create_index(op.f('ix_amoy_transactions_from_address'), 'amoy_transactions', ['from_address'], unique=False)
-    op.create_index(op.f('ix_amoy_transactions_gas'), 'amoy_transactions', ['gas'], unique=False)
-    op.create_index(op.f('ix_amoy_transactions_gas_price'), 'amoy_transactions', ['gas_price'], unique=False)
-    op.create_index(op.f('ix_amoy_transactions_hash'), 'amoy_transactions', ['hash'], unique=True)
-    op.create_index(op.f('ix_amoy_transactions_to_address'), 'amoy_transactions', ['to_address'], unique=False)
-    op.create_index(op.f('ix_amoy_transactions_value'), 'amoy_transactions', ['value'], unique=False)
-    op.create_unique_constraint(op.f('uq_blast_labels_id'), 'blast_labels', ['id'])
-    op.create_unique_constraint(op.f('uq_blast_sepolia_labels_id'), 'blast_sepolia_labels', ['id'])
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_constraint(op.f('uq_blast_sepolia_labels_id'), 'blast_sepolia_labels', type_='unique')
-    op.drop_constraint(op.f('uq_blast_labels_id'), 'blast_labels', type_='unique')
-    op.drop_index(op.f('ix_amoy_transactions_value'), table_name='amoy_transactions')
-    op.drop_index(op.f('ix_amoy_transactions_to_address'), table_name='amoy_transactions')
-    op.drop_index(op.f('ix_amoy_transactions_hash'), table_name='amoy_transactions')
-    op.drop_index(op.f('ix_amoy_transactions_gas_price'), table_name='amoy_transactions')
-    op.drop_index(op.f('ix_amoy_transactions_gas'), table_name='amoy_transactions')
-    op.drop_index(op.f('ix_amoy_transactions_from_address'), table_name='amoy_transactions')
-    op.drop_index(op.f('ix_amoy_transactions_block_number'), table_name='amoy_transactions')
-    op.drop_table('amoy_transactions')
-    op.drop_index(op.f('ix_amoy_labels_transaction_hash'), table_name='amoy_labels')
-    op.drop_index(op.f('ix_amoy_labels_label'), table_name='amoy_labels')
-    op.drop_index(op.f('ix_amoy_labels_block_timestamp'), table_name='amoy_labels')
-    op.drop_index(op.f('ix_amoy_labels_block_number'), table_name='amoy_labels')
-    op.drop_index('ix_amoy_labels_address_block_timestamp', table_name='amoy_labels')
-    op.drop_index('ix_amoy_labels_address_block_number', table_name='amoy_labels')
-    op.drop_index(op.f('ix_amoy_labels_address'), table_name='amoy_labels')
-    op.drop_table('amoy_labels')
-    op.drop_index(op.f('ix_amoy_blocks_timestamp'), table_name='amoy_blocks')
-    op.drop_index(op.f('ix_amoy_blocks_hash'), table_name='amoy_blocks')
-    op.drop_index(op.f('ix_amoy_blocks_block_number'), table_name='amoy_blocks')
-    op.drop_table('amoy_blocks')
-    # ### end Alembic commands ###

moonstreamdb/moonstreamdb/blockchain.py

@@ -2,9 +2,6 @@ from enum import Enum
 from typing import Type, Union
 
 from .models import (
-    AmoyBlock,
-    AmoyLabel,
-    AmoyTransaction,
     ArbitrumNovaBlock,
     ArbitrumNovaLabel,
     ArbitrumNovaTransaction,
@@ -32,9 +29,6 @@ from .models import (
     PolygonBlock,
     PolygonLabel,
     PolygonTransaction,
-    ProofOfPlayApexBlock,
-    ProofOfPlayApexLabel,
-    ProofOfPlayApexTransaction,
     WyrmBlock,
     WyrmLabel,
     WyrmTransaction,
@@ -63,7 +57,6 @@ class AvailableBlockchainType(Enum):
     ETHEREUM = "ethereum"
     POLYGON = "polygon"
     MUMBAI = "mumbai"
-    AMOY = "amoy"
     XDAI = "xdai"
     WYRM = "wyrm"
     ZKSYNC_ERA = "zksync_era"
@@ -77,7 +70,6 @@ class AvailableBlockchainType(Enum):
     AVALANCHE_FUJI = "avalanche_fuji"
     BLAST = "blast"
     BLAST_SEPOLIA = "blast_sepolia"
-    PROOFOFPLAY_APEX = "proofofplay_apex"
 
 
 def get_block_model(
@@ -87,7 +79,6 @@ def get_block_model(
         EthereumBlock,
         PolygonBlock,
         MumbaiBlock,
-        AmoyBlock,
         XDaiBlock,
         WyrmBlock,
         ZkSyncEraTestnetBlock,
@@ -101,18 +92,17 @@ def get_block_model(
         AvalancheFujiBlock,
         BlastBlock,
         BlastSepoliaBlock,
-        ProofOfPlayApexBlock,
     ]
 ]:
     """
-    Depends on provided blockchain type set proper blocks model.
+    Depends on provided blockchain type: Ethereum, Polygon, Mumbai, XDai, Wyrm, ZkSyncEra, ZkSyncEraTestnet, ArbitrumNova, ArbitrumSepolia, Xai, XaiSepolia
+    set proper blocks model.
     """
     block_model: Type[
         Union[
             EthereumBlock,
             PolygonBlock,
             MumbaiBlock,
-            AmoyBlock,
             XDaiBlock,
             WyrmBlock,
             ZkSyncEraTestnetBlock,
@@ -126,7 +116,6 @@ def get_block_model(
             AvalancheFujiBlock,
             BlastBlock,
             BlastSepoliaBlock,
-            ProofOfPlayApexBlock,
         ]
     ]
     if blockchain_type == AvailableBlockchainType.ETHEREUM:
@@ -135,8 +124,6 @@ def get_block_model(
         block_model = PolygonBlock
     elif blockchain_type == AvailableBlockchainType.MUMBAI:
         block_model = MumbaiBlock
-    elif blockchain_type == AvailableBlockchainType.AMOY:
-        block_model = AmoyBlock
     elif blockchain_type == AvailableBlockchainType.XDAI:
         block_model = XDaiBlock
     elif blockchain_type == AvailableBlockchainType.WYRM:
@@ -163,8 +150,6 @@ def get_block_model(
         block_model = BlastBlock
     elif blockchain_type == AvailableBlockchainType.BLAST_SEPOLIA:
         block_model = BlastSepoliaBlock
-    elif blockchain_type == AvailableBlockchainType.PROOFOFPLAY_APEX:
-        block_model = ProofOfPlayApexBlock
     else:
         raise Exception("Unsupported blockchain type provided")
 
@@ -178,7 +163,6 @@ def get_label_model(
         EthereumLabel,
         PolygonLabel,
         MumbaiLabel,
-        AmoyLabel,
         XDaiLabel,
         WyrmLabel,
         ZkSyncEraTestnetLabel,
@@ -192,18 +176,17 @@ def get_label_model(
         AvalancheFujiLabel,
         BlastLabel,
         BlastSepoliaLabel,
-        ProofOfPlayApexLabel,
     ]
 ]:
     """
-    Depends on provided blockchain type set proper block label model.
+    Depends on provided blockchain type: Ethereum, Polygon, Mumbai, XDai, Wyrm, ZkSyncEra, ZkSyncEraTestnet, ArbitrumNova, ArbitrumSepolia, Xai, XaiSepolia
+    set proper block label model.
     """
     label_model: Type[
         Union[
             EthereumLabel,
             PolygonLabel,
             MumbaiLabel,
-            AmoyLabel,
             XDaiLabel,
             WyrmLabel,
             ZkSyncEraTestnetLabel,
@@ -217,7 +200,6 @@ def get_label_model(
             AvalancheFujiLabel,
             BlastLabel,
             BlastSepoliaLabel,
-            ProofOfPlayApexLabel,
         ]
     ]
     if blockchain_type == AvailableBlockchainType.ETHEREUM:
@@ -226,8 +208,6 @@ def get_label_model(
         label_model = PolygonLabel
     elif blockchain_type == AvailableBlockchainType.MUMBAI:
         label_model = MumbaiLabel
-    elif blockchain_type == AvailableBlockchainType.AMOY:
-        label_model = AmoyLabel
     elif blockchain_type == AvailableBlockchainType.XDAI:
         label_model = XDaiLabel
     elif blockchain_type == AvailableBlockchainType.WYRM:
@@ -254,8 +234,6 @@ def get_label_model(
         label_model = BlastLabel
     elif blockchain_type == AvailableBlockchainType.BLAST_SEPOLIA:
         label_model = BlastSepoliaLabel
-    elif blockchain_type == AvailableBlockchainType.PROOFOFPLAY_APEX:
-        label_model = ProofOfPlayApexLabel
     else:
         raise Exception("Unsupported blockchain type provided")
 
@@ -269,7 +247,6 @@ def get_transaction_model(
         EthereumTransaction,
         PolygonTransaction,
         MumbaiTransaction,
-        AmoyTransaction,
         XDaiTransaction,
         WyrmTransaction,
         ZkSyncEraTestnetTransaction,
@@ -283,18 +260,17 @@ def get_transaction_model(
         AvalancheFujiTransaction,
         BlastTransaction,
         BlastSepoliaTransaction,
-        ProofOfPlayApexTransaction,
     ]
 ]:
     """
-    Depends on provided blockchain type set proper block transactions model.
+    Depends on provided blockchain type: Ethereum, Polygon, Mumbai, XDai, Wyrm, ZkSyncEra, ZkSyncEraTestnet, ArbitrumNova, ArbitrumSepolia, Xai, XaiSepolia
+    set proper block transactions model.
     """
     transaction_model: Type[
         Union[
             EthereumTransaction,
             PolygonTransaction,
             MumbaiTransaction,
-            AmoyTransaction,
             XDaiTransaction,
             WyrmTransaction,
             ZkSyncEraTestnetTransaction,
@@ -308,7 +284,6 @@ def get_transaction_model(
             AvalancheFujiTransaction,
             BlastTransaction,
             BlastSepoliaTransaction,
-            ProofOfPlayApexTransaction,
         ]
     ]
     if blockchain_type == AvailableBlockchainType.ETHEREUM:
@@ -317,8 +292,6 @@ def get_transaction_model(
         transaction_model = PolygonTransaction
     elif blockchain_type == AvailableBlockchainType.MUMBAI:
         transaction_model = MumbaiTransaction
-    elif blockchain_type == AvailableBlockchainType.AMOY:
-        transaction_model = AmoyTransaction
     elif blockchain_type == AvailableBlockchainType.XDAI:
         transaction_model = XDaiTransaction
     elif blockchain_type == AvailableBlockchainType.WYRM:
@@ -345,8 +318,6 @@ def get_transaction_model(
         transaction_model = BlastTransaction
     elif blockchain_type == AvailableBlockchainType.BLAST_SEPOLIA:
         transaction_model = BlastSepoliaTransaction
-    elif blockchain_type == AvailableBlockchainType.PROOFOFPLAY_APEX:
-        transaction_model = ProofOfPlayApexTransaction
     else:
         raise Exception("Unsupported blockchain type provided")
 

moonstreamdb/moonstreamdb/models.py

@@ -368,113 +368,6 @@ class MumbaiLabel(Base):  # type: ignore
     )
 
 
-class AmoyBlock(Base):  # type: ignore
-    __tablename__ = "amoy_blocks"
-
-    block_number = Column(
-        BigInteger, primary_key=True, unique=True, nullable=False, index=True
-    )
-    difficulty = Column(BigInteger)
-    extra_data = Column(VARCHAR(128))
-    gas_limit = Column(BigInteger)
-    gas_used = Column(BigInteger)
-    base_fee_per_gas = Column(Numeric(precision=78, scale=0), nullable=True)
-    hash = Column(VARCHAR(256), index=True)
-    logs_bloom = Column(VARCHAR(1024))
-    miner = Column(VARCHAR(256))
-    nonce = Column(VARCHAR(256))
-    parent_hash = Column(VARCHAR(256))
-    receipt_root = Column(VARCHAR(256))
-    uncles = Column(VARCHAR(256))
-    size = Column(Integer)
-    state_root = Column(VARCHAR(256))
-    timestamp = Column(BigInteger, index=True)
-    total_difficulty = Column(VARCHAR(256))
-    transactions_root = Column(VARCHAR(256))
-
-    indexed_at = Column(
-        DateTime(timezone=True), server_default=utcnow(), nullable=False
-    )
-
-
-class AmoyTransaction(Base):  # type: ignore
-    __tablename__ = "amoy_transactions"
-
-    hash = Column(
-        VARCHAR(256), primary_key=True, unique=True, nullable=False, index=True
-    )
-    block_number = Column(
-        BigInteger,
-        ForeignKey("amoy_blocks.block_number", ondelete="CASCADE"),
-        nullable=False,
-        index=True,
-    )
-    from_address = Column(VARCHAR(256), index=True)
-    to_address = Column(VARCHAR(256), index=True)
-    gas = Column(Numeric(precision=78, scale=0), index=True)
-    gas_price = Column(Numeric(precision=78, scale=0), index=True)
-    max_fee_per_gas = Column(Numeric(precision=78, scale=0), nullable=True)
-    max_priority_fee_per_gas = Column(Numeric(precision=78, scale=0), nullable=True)
-    input = Column(Text)
-    nonce = Column(VARCHAR(256))
-    transaction_index = Column(BigInteger)
-    transaction_type = Column(Integer, nullable=True)
-    value = Column(Numeric(precision=78, scale=0), index=True)
-
-    indexed_at = Column(
-        DateTime(timezone=True), server_default=utcnow(), nullable=False
-    )
-
-
-class AmoyLabel(Base):  # type: ignore
-    __tablename__ = "amoy_labels"
-
-    __table_args__ = (
-        Index(
-            "ix_amoy_labels_address_block_number",
-            "address",
-            "block_number",
-            unique=False,
-        ),
-        Index(
-            "ix_amoy_labels_address_block_timestamp",
-            "address",
-            "block_timestamp",
-            unique=False,
-        ),
-    )
-
-    id = Column(
-        UUID(as_uuid=True),
-        primary_key=True,
-        default=uuid.uuid4,
-        unique=True,
-        nullable=False,
-    )
-    label = Column(VARCHAR(256), nullable=False, index=True)
-    block_number = Column(
-        BigInteger,
-        nullable=True,
-        index=True,
-    )
-    address = Column(
-        VARCHAR(256),
-        nullable=True,
-        index=True,
-    )
-    transaction_hash = Column(
-        VARCHAR(256),
-        nullable=True,
-        index=True,
-    )
-    label_data = Column(JSONB, nullable=True)
-    block_timestamp = Column(BigInteger, index=True)
-    log_index = Column(Integer, nullable=True)
-    created_at = Column(
-        DateTime(timezone=True), server_default=utcnow(), nullable=False
-    )
-
-
 class XDaiBlock(Base):  # type: ignore
     __tablename__ = "xdai_blocks"
 
@@ -1936,120 +1829,6 @@ class BlastSepoliaLabel(Base):  # type: ignore
     )
 
 
-class ProofOfPlayApexBlock(Base):  # type: ignore
-    __tablename__ = "proofofplay_apex_blocks"
-
-    block_number = Column(
-        BigInteger, primary_key=True, unique=True, nullable=False, index=True
-    )
-    difficulty = Column(BigInteger)
-    extra_data = Column(VARCHAR(128))
-    gas_limit = Column(BigInteger)
-    gas_used = Column(BigInteger)
-    base_fee_per_gas = Column(Numeric(precision=78, scale=0), nullable=True)
-    hash = Column(VARCHAR(256), index=True)
-    logs_bloom = Column(VARCHAR(1024))
-    miner = Column(VARCHAR(256))
-    nonce = Column(VARCHAR(256))
-    parent_hash = Column(VARCHAR(256))
-    receipt_root = Column(VARCHAR(256))
-    uncles = Column(VARCHAR(256))
-    size = Column(Integer)
-    state_root = Column(VARCHAR(256))
-    timestamp = Column(BigInteger, index=True)
-    total_difficulty = Column(VARCHAR(256))
-    transactions_root = Column(VARCHAR(256))
-    indexed_at = Column(
-        DateTime(timezone=True), server_default=utcnow(), nullable=False
-    )
-
-    sha3_uncles = Column(VARCHAR(256), nullable=True)
-    l1_block_number = Column(BigInteger, nullable=True)
-    send_count = Column(BigInteger, nullable=True)
-    send_root = Column(VARCHAR(256), nullable=True)
-    mix_hash = Column(VARCHAR(256), nullable=True)
-
-
-class ProofOfPlayApexTransaction(Base):  # type: ignore
-    __tablename__ = "proofofplay_apex_transactions"
-
-    hash = Column(
-        VARCHAR(256), primary_key=True, unique=True, nullable=False, index=True
-    )
-    block_number = Column(
-        BigInteger,
-        ForeignKey("proofofplay_apex_blocks.block_number", ondelete="CASCADE"),
-        nullable=False,
-        index=True,
-    )
-    from_address = Column(VARCHAR(256), index=True)
-    to_address = Column(VARCHAR(256), index=True)
-    gas = Column(Numeric(precision=78, scale=0), index=True)
-    gas_price = Column(Numeric(precision=78, scale=0), index=True)
-    max_fee_per_gas = Column(Numeric(precision=78, scale=0), nullable=True)
-    max_priority_fee_per_gas = Column(Numeric(precision=78, scale=0), nullable=True)
-    input = Column(Text)
-    nonce = Column(VARCHAR(256))
-    transaction_index = Column(BigInteger)
-    transaction_type = Column(Integer, nullable=True)
-    value = Column(Numeric(precision=78, scale=0), index=True)
-
-    indexed_at = Column(
-        DateTime(timezone=True), server_default=utcnow(), nullable=False
-    )
-
-    y_parity = Column(BigInteger, nullable=True)
-
-
-class ProofOfPlayApexLabel(Base):  # type: ignore
-    __tablename__ = "proofofplay_apex_labels"
-
-    __table_args__ = (
-        Index(
-            "ix_proofofplay_apex_labels_address_block_number",
-            "address",
-            "block_number",
-            unique=False,
-        ),
-        Index(
-            "ix_proofofplay_apex_labels_address_block_timestamp",
-            "address",
-            "block_timestamp",
-            unique=False,
-        ),
-    )
-
-    id = Column(
-        UUID(as_uuid=True),
-        primary_key=True,
-        default=uuid.uuid4,
-        unique=True,
-        nullable=False,
-    )
-    label = Column(VARCHAR(256), nullable=False, index=True)
-    block_number = Column(
-        BigInteger,
-        nullable=True,
-        index=True,
-    )
-    address = Column(
-        VARCHAR(256),
-        nullable=True,
-        index=True,
-    )
-    transaction_hash = Column(
-        VARCHAR(256),
-        nullable=True,
-        index=True,
-    )
-    label_data = Column(JSONB, nullable=True)
-    block_timestamp = Column(BigInteger, index=True)
-    log_index = Column(Integer, nullable=True)
-    created_at = Column(
-        DateTime(timezone=True), server_default=utcnow(), nullable=False
-    )
-
-
 class ESDFunctionSignature(Base):  # type: ignore
     """
     Function signature from blockchain (Ethereum/Polygon) Signature Database.

moonstreamdb/moonstreamdb/networks.py

@@ -1,11 +1,7 @@
 from enum import Enum
 from typing import Dict, Union
 
-from .blockchain import AvailableBlockchainType
 from .models import (
-    AmoyBlock,
-    AmoyLabel,
-    AmoyTransaction,
     ArbitrumNovaBlock,
     ArbitrumNovaLabel,
     ArbitrumNovaTransaction,
@@ -34,9 +30,6 @@ from .models import (
     PolygonBlock,
     PolygonLabel,
     PolygonTransaction,
-    ProofOfPlayApexBlock,
-    ProofOfPlayApexLabel,
-    ProofOfPlayApexTransaction,
     WyrmBlock,
     WyrmLabel,
     WyrmTransaction,
@@ -65,7 +58,6 @@ class Network(Enum):
     ethereum = "ethereum"
     polygon = "polygon"
     mumbai = "mumbai"
-    amoy = "amoy"
     xdai = "xdai"
     wyrm = "wyrm"
     zksync_era_testnet = "zksync_era_testnet"
@@ -79,13 +71,11 @@ class Network(Enum):
     avalanche_fuji = "avalanche_fuji"
     blast = "blast"
     blast_sepolia = "blast_sepolia"
-    proofofplay_apex = "proofofplay_apex"
 
 
 tx_raw_types = Union[
     EthereumTransaction,
     MumbaiTransaction,
-    AmoyTransaction,
     PolygonTransaction,
     WyrmTransaction,
     XDaiTransaction,
@@ -100,7 +90,6 @@ tx_raw_types = Union[
     AvalancheFujiTransaction,
     BlastTransaction,
     BlastSepoliaTransaction,
-    ProofOfPlayApexTransaction,
 ]
 
 MODELS: Dict[Network, Dict[str, Base]] = {
@@ -114,11 +103,6 @@ MODELS: Dict[Network, Dict[str, Base]] = {
         "labels": MumbaiLabel,
         "transactions": MumbaiTransaction,
     },
-    Network.amoy: {
-        "blocks": AmoyBlock,
-        "labels": AmoyLabel,
-        "transactions": AmoyTransaction,
-    },
     Network.polygon: {
         "blocks": PolygonBlock,
         "labels": PolygonLabel,
@@ -189,52 +173,4 @@ MODELS: Dict[Network, Dict[str, Base]] = {
         "labels": BlastSepoliaLabel,
         "transactions": BlastSepoliaTransaction,
     },
-    Network.proofofplay_apex: {
-        "blocks": ProofOfPlayApexBlock,
-        "labels": ProofOfPlayApexLabel,
-        "transactions": ProofOfPlayApexTransaction,
-    },
 }
-
-
-def blockchain_type_to_network_type(
-    blockchain_type: AvailableBlockchainType,
-) -> Network:
-    if blockchain_type == AvailableBlockchainType.ETHEREUM:
-        return Network.ethereum
-    elif blockchain_type == AvailableBlockchainType.POLYGON:
-        return Network.polygon
-    elif blockchain_type == AvailableBlockchainType.MUMBAI:
-        return Network.mumbai
-    elif blockchain_type == AvailableBlockchainType.AMOY:
-        return Network.amoy
-    elif blockchain_type == AvailableBlockchainType.XDAI:
-        return Network.xdai
-    elif blockchain_type == AvailableBlockchainType.WYRM:
-        return Network.wyrm
-    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA_TESTNET:
-        return Network.zksync_era_testnet
-    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA:
-        return Network.zksync_era
-    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA_SEPOLIA:
-        return Network.zksync_era_sepolia
-    elif blockchain_type == AvailableBlockchainType.ARBITRUM_NOVA:
-        return Network.arbitrum_nova
-    elif blockchain_type == AvailableBlockchainType.ARBITRUM_SEPOLIA:
-        return Network.arbitrum_sepolia
-    elif blockchain_type == AvailableBlockchainType.XAI:
-        return Network.xai
-    elif blockchain_type == AvailableBlockchainType.XAI_SEPOLIA:
-        return Network.xai_sepolia
-    elif blockchain_type == AvailableBlockchainType.AVALANCHE:
-        return Network.avalanche
-    elif blockchain_type == AvailableBlockchainType.AVALANCHE_FUJI:
-        return Network.avalanche_fuji
-    elif blockchain_type == AvailableBlockchainType.BLAST:
-        return Network.blast
-    elif blockchain_type == AvailableBlockchainType.BLAST_SEPOLIA:
-        return Network.blast_sepolia
-    elif blockchain_type == AvailableBlockchainType.PROOFOFPLAY_APEX:
-        return Network.proofofplay_apex
-    else:
-        raise ValueError(f"Unknown blockchain type: {blockchain_type}")

moonstreamdb/moonstreamdb/subscriptions.py

@@ -1,128 +0,0 @@
-from enum import Enum
-
-from .blockchain import AvailableBlockchainType
-
-
-class SubscriptionTypes(Enum):
-    POLYGON_BLOCKCHAIN = "polygon_smartcontract"
-    ETHEREUM_BLOCKCHAIN = "ethereum_smartcontract"
-    MUMBAI_BLOCKCHAIN = "mumbai_smartcontract"
-    AMOY_BLOCKCHAIN = "amoy_smartcontract"
-    XDAI_BLOCKCHAIN = "xdai_smartcontract"
-    WYRM_BLOCKCHAIN = "wyrm_smartcontract"
-    ZKSYNC_ERA_TESTNET_BLOCKCHAIN = "zksync_era_testnet_smartcontract"
-    ZKSYNC_ERA_BLOCKCHAIN = "zksync_era_smartcontract"
-    ZKSYNC_ERA_SEPOLIA_BLOCKCHAIN = "zksync_era_sepolia_smartcontract"
-    ARBITRUM_NOVA_BLOCKCHAIN = "arbitrum_nova_smartcontract"
-    ARBITRUM_SEPOLIA_BLOCKCHAIN = "arbitrum_sepolia_smartcontract"
-    XAI_BLOCKCHAIN = "xai_smartcontract"
-    XAI_SEPOLIA_BLOCKCHAIN = "xai_sepolia_smartcontract"
-    AVALANCHE_BLOCKCHAIN = "avalanche_smartcontract"
-    AVALANCHE_FUJI_BLOCKCHAIN = "avalanche_fuji_smartcontract"
-    BLAST_BLOCKCHAIN = "blast_smartcontract"
-    BLAST_SEPOLIA_BLOCKCHAIN = "blast_sepolia_smartcontract"
-    PROOFOFPLAY_APEX_BLOCKCHAIN = "proofofplay_apex_smartcontract"
-
-
-def blockchain_type_to_subscription_type(
-    blockchain_type: AvailableBlockchainType,
-) -> SubscriptionTypes:
-    if blockchain_type == AvailableBlockchainType.ETHEREUM:
-        return SubscriptionTypes.ETHEREUM_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.POLYGON:
-        return SubscriptionTypes.POLYGON_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.MUMBAI:
-        return SubscriptionTypes.MUMBAI_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.AMOY:
-        return SubscriptionTypes.AMOY_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.XDAI:
-        return SubscriptionTypes.XDAI_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.WYRM:
-        return SubscriptionTypes.WYRM_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA_TESTNET:
-        return SubscriptionTypes.ZKSYNC_ERA_TESTNET_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA:
-        return SubscriptionTypes.ZKSYNC_ERA_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.ZKSYNC_ERA_SEPOLIA:
-        return SubscriptionTypes.ZKSYNC_ERA_SEPOLIA_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.ARBITRUM_NOVA:
-        return SubscriptionTypes.ARBITRUM_NOVA_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.ARBITRUM_SEPOLIA:
-        return SubscriptionTypes.ARBITRUM_SEPOLIA_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.XAI:
-        return SubscriptionTypes.XAI_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.XAI_SEPOLIA:
-        return SubscriptionTypes.XAI_SEPOLIA_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.AVALANCHE:
-        return SubscriptionTypes.AVALANCHE_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.AVALANCHE_FUJI:
-        return SubscriptionTypes.AVALANCHE_FUJI_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.BLAST:
-        return SubscriptionTypes.BLAST_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.BLAST_SEPOLIA:
-        return SubscriptionTypes.BLAST_SEPOLIA_BLOCKCHAIN
-    elif blockchain_type == AvailableBlockchainType.PROOFOFPLAY_APEX:
-        return SubscriptionTypes.PROOFOFPLAY_APEX_BLOCKCHAIN
-    else:
-        raise ValueError(f"Unknown blockchain type: {blockchain_type}")
-
-
-subscription_id_by_blockchain = {
-    "ethereum": "ethereum_smartcontract",
-    "polygon": "polygon_smartcontract",
-    "mumbai": "mumbai_smartcontract",
-    "amoy": "amoy_smartcontract",
-    "xdai": "xdai_smartcontract",
-    "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",
-    "blast": "blast_smartcontract",
-    "blast_sepolia": "blast_sepolia_smartcontract",
-    "proofofplay_apex": "proofofplay_apex_smartcontract",
-}
-
-blockchain_by_subscription_id = {
-    "ethereum_blockchain": "ethereum",
-    "polygon_blockchain": "polygon",
-    "mumbai_blockchain": "mumbai",
-    "amoy_blockchain": "amoy",
-    "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",
-    "blast_blockchain": "blast",
-    "blast_sepolia_blockchain": "blast_sepolia",
-    "proofofplay_apex_blockchain": "proofofplay_apex",
-    "ethereum_smartcontract": "ethereum",
-    "polygon_smartcontract": "polygon",
-    "mumbai_smartcontract": "mumbai",
-    "amoy_smartcontract": "amoy",
-    "xdai_smartcontract": "xdai",
-    "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",
-    "blast_smartcontract": "blast",
-    "blast_sepolia_smartcontract": "blast_sepolia",
-    "proofofplay_apex_smartcontract": "proofofplay_apex",
-}

moonstreamdb/moonstreamdb/version.py

@@ -2,4 +2,4 @@
 Moonstream database version.
 """
 
-MOONSTREAMDB_VERSION = "0.4.2"
+MOONSTREAMDB_VERSION = "0.3.12"