Mooncrawl ready to go with WEB3_URI instread of ips and ports

crawlers/mooncrawl/mooncrawl/blockchain.py

@@ -23,8 +23,8 @@ from web3.types import BlockData
 from .data import AvailableBlockchainType, DateRange
 from .settings import (
     MOONSTREAM_CRAWL_WORKERS,
-    MOONSTREAM_ETHEREUM_IPC_PATH,
-    MOONSTREAM_POLYGON_IPC_PATH,
+    MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI,
+    MOONSTREAM_POLYGON_WEB3_PROVIDER_URI,
 )
 
 logger = logging.getLogger(__name__)
@@ -42,9 +42,9 @@ def connect(blockchain_type: AvailableBlockchainType, web3_uri: Optional[str] =
 
     if web3_uri is None:
         if blockchain_type == AvailableBlockchainType.ETHEREUM:
-            web3_uri = MOONSTREAM_ETHEREUM_IPC_PATH
+            web3_uri = MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI
         elif blockchain_type == AvailableBlockchainType.POLYGON:
-            web3_uri = MOONSTREAM_POLYGON_IPC_PATH
+            web3_uri = MOONSTREAM_POLYGON_WEB3_PROVIDER_URI
         else:
             raise Exception("Wrong blockchain type provided for web3 URI")
 

crawlers/mooncrawl/mooncrawl/nft/cli.py

@@ -22,7 +22,7 @@ from ..publish import publish_json
 from ..settings import (
     MOONSTREAM_ADMIN_ACCESS_TOKEN,
     MOONSTREAM_DATA_JOURNAL_ID,
-    MOONSTREAM_ETHEREUM_IPC_PATH,
+    MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI,
     NFT_HUMBUG_TOKEN,
 )
 from ..version import MOONCRAWL_VERSION
@@ -45,15 +45,15 @@ BLOCKS_PER_SUMMARY = 40
 def web3_client_from_cli_or_env(args: argparse.Namespace) -> Web3:
     """
     Returns a web3 client either by parsing "--web3" argument on the given arguments or by looking up
-    the MOONSTREAM_ETHEREUM_IPC_PATH environment variable.
+    the MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI environment variable.
     """
-    web3_connection_string = MOONSTREAM_ETHEREUM_IPC_PATH
+    web3_connection_string = MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI
     args_web3 = vars(args).get("web3")
     if args_web3 is not None:
         web3_connection_string = cast(str, args_web3)
     if web3_connection_string is None:
         raise ValueError(
-            "Could not find Web3 connection information in arguments or in MOONSTREAM_ETHEREUM_IPC_PATH environment variable"
+            "Could not find Web3 connection information in arguments or in MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI environment variable"
         )
     return connect(AvailableBlockchainType.ETHEREUM, web3_connection_string)
 
@@ -294,7 +294,7 @@ def main() -> None:
         "--web3",
         type=str,
         default=None,
-        help="(Optional) Web3 connection string. If not provided, uses the value specified by MOONSTREAM_ETHEREUM_IPC_PATH environment variable.",
+        help="(Optional) Web3 connection string. If not provided, uses the value specified by MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI environment variable.",
     )
     parser_ethereum_label.set_defaults(func=ethereum_label_handler)
 

crawlers/mooncrawl/mooncrawl/settings.py

@@ -26,24 +26,16 @@ DOCS_TARGET_PATH = "docs"
 CRAWLER_LABEL = "moonworm-alpha"
 
 # Geth connection address
-MOONSTREAM_NODE_ETHEREUM_IPC_ADDR = os.environ.get(
-    "MOONSTREAM_NODE_ETHEREUM_IPC_ADDR", "127.0.0.1"
+MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI = os.environ.get(
+    "MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI"
 )
-MOONSTREAM_NODE_ETHEREUM_IPC_PORT = os.environ.get(
-    "MOONSTREAM_NODE_ETHEREUM_IPC_PORT", 8545
-)
-MOONSTREAM_ETHEREUM_IPC_PATH = (
-    f"http://{MOONSTREAM_NODE_ETHEREUM_IPC_ADDR}:{MOONSTREAM_NODE_ETHEREUM_IPC_PORT}"
-)
-MOONSTREAM_NODE_POLYGON_IPC_ADDR = os.environ.get(
-    "MOONSTREAM_NODE_POLYGON_IPC_ADDR", "127.0.0.1"
-)
-MOONSTREAM_NODE_POLYGON_IPC_PORT = os.environ.get(
-    "MOONSTREAM_NODE_POLYGON_IPC_PORT", 8545
-)
-MOONSTREAM_POLYGON_IPC_PATH = (
-    f"http://{MOONSTREAM_NODE_POLYGON_IPC_ADDR}:{MOONSTREAM_NODE_POLYGON_IPC_PORT}"
+if MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI is None:
+    raise Exception("MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI env variable is not set")
+MOONSTREAM_POLYGON_WEB3_PROVIDER_URI = os.environ.get(
+    "MOONSTREAM_POLYGON_WEB3_PROVIDER_URI"
 )
+if MOONSTREAM_POLYGON_WEB3_PROVIDER_URI is None:
+    raise Exception("MOONSTREAM_POLYGON_WEB3_PROVIDER_URI env variable is not set")
 
 MOONSTREAM_CRAWL_WORKERS = 4
 MOONSTREAM_CRAWL_WORKERS_RAW = os.environ.get("MOONSTREAM_CRAWL_WORKERS")

crawlers/mooncrawl/sample.env

@@ -1,10 +1,8 @@
 export BUGOUT_BROOD_URL="https://auth.bugout.dev"
 export BUGOUT_SPIRE_URL="https://spire.bugout.dev"
 export MOONSTREAM_CORS_ALLOWED_ORIGINS="http://localhost:3000,https://moonstream.to,https://www.moonstream.to"
-export MOONSTREAM_NODE_ETHEREUM_IPC_ADDR="127.0.0.1"
-export MOONSTREAM_NODE_ETHEREUM_IPC_PORT="8545"
-export MOONSTREAM_NODE_POLYGON_IPC_ADDR="127.0.0.1"
-export MOONSTREAM_NODE_POLYGON_IPC_PORT="8545"
+export MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI="https://<connection_path_uri_to_ethereum_node>"
+export MOONSTREAM_POLYGON_WEB3_PROVIDER_URI="https://<connection_path_uri_to_polygon_node>"
 export MOONSTREAM_CRAWL_WORKERS=4
 export MOONSTREAM_DB_URI="postgresql://<username>:<password>@<db_host>:<db_port>/<db_name>"
 export MOONSTREAM_ETHERSCAN_TOKEN="<Token for etherscan>"