Merge pull request #11 from blockblaz/feature

Add --docker flag to convert-validator-config for Docker devnet

Author: ch4r10t33r

convert-validator-config.py

@@ -7,55 +7,71 @@
 multiple lean nodes.
 
 Usage:
-    python3 convert-validator-config.py [validator-config.yaml] [output.json]
+    python3 convert-validator-config.py [validator-config.yaml] [output.json] [--docker]
 
-Example:
-    python3 convert-validator-config.py \
-        ../lean-quickstart/local-devnet/genesis/validator-config.yaml \
+Options:
+    --docker  Use host.docker.internal so leanpoint running in Docker can
+              reach a devnet on the host (e.g. upstreams-local-docker.json).
+
+Examples:
+    python3 convert-validator-config.py \\
+        ../lean-quickstart/local-devnet/genesis/validator-config.yaml \\
         upstreams.json
+
+    python3 convert-validator-config.py \\
+        ../lean-quickstart/local-devnet/genesis/validator-config.yaml \\
+        upstreams-local-docker.json --docker
 """
 
 import sys
 import json
 import yaml
 
 
-def convert_validator_config(yaml_path: str, output_path: str, base_port: int = 8081):
+def convert_validator_config(
+    yaml_path: str,
+    output_path: str,
+    base_port: int = 8081,
+    docker_host: bool = False,
+):
     """
     Convert validator-config.yaml to upstreams.json.
-    
+
     Args:
         yaml_path: Path to validator-config.yaml
         output_path: Path to output upstreams.json
-        base_port: Base HTTP port for beacon API (default: 5052)
+        base_port: Base HTTP port for beacon API (default: 8081)
+        docker_host: If True, use host.docker.internal so leanpoint in Docker
+            can reach a devnet running on the host (Docker Desktop/Orbstack).
     """
     with open(yaml_path, 'r') as f:
         config = yaml.safe_load(f)
-    
+
     if 'validators' not in config:
         print("Error: No 'validators' key found in config", file=sys.stderr)
         sys.exit(1)
-    
+
     upstreams = []
-    
+
     for idx, validator in enumerate(config['validators']):
         name = validator.get('name', f'validator_{idx}')
-        
+
         # Try to get IP from enrFields, default to localhost
         ip = "127.0.0.1"
         if 'enrFields' in validator and 'ip' in validator['enrFields']:
             ip = validator['enrFields']['ip']
-        
-        # Calculate HTTP port (base_port + index)
-        # This is a reasonable default; adjust if your setup differs
-        http_port = base_port + idx
-        
+        if docker_host:
+            ip = "host.docker.internal"
+
+        # Use metricsPort from config when present (validator-config uses it for API)
+        http_port = validator.get('metricsPort', base_port + idx)
+
         upstream = {
             "name": name,
             "url": f"http://{ip}:{http_port}",
             "path": "/v0/health"  # Health check endpoint
         }
-        
+
         upstreams.append(upstream)
 
     output = {"upstreams": upstreams}
@@ -72,20 +88,24 @@ def convert_validator_config(yaml_path: str, output_path: str, base_port: int =
 
 
 def main():
-    if len(sys.argv) < 2:
-        print(__doc__)
-        print("\nUsing default paths...")
-        yaml_path = "../lean-quickstart/local-devnet/genesis/validator-config.yaml"
-        output_path = "upstreams.json"
-    elif len(sys.argv) == 2:
-        yaml_path = sys.argv[1]
-        output_path = "upstreams.json"
+    args = [a for a in sys.argv[1:] if a != "--docker"]
+    docker_host = "--docker" in sys.argv
+
+    if len(args) < 2:
+        if len(args) == 0:
+            print(__doc__)
+            print("\nUsing default paths...")
+            yaml_path = "../lean-quickstart/local-devnet/genesis/validator-config.yaml"
+            output_path = "upstreams.json"
+        else:
+            yaml_path = args[0]
+            output_path = "upstreams-local-docker.json" if docker_host else "upstreams.json"
     else:
-        yaml_path = sys.argv[1]
-        output_path = sys.argv[2]
-    
+        yaml_path = args[0]
+        output_path = args[1]
+
     try:
-        convert_validator_config(yaml_path, output_path)
+        convert_validator_config(yaml_path, output_path, docker_host=docker_host)
     except FileNotFoundError as e:
         print(f"Error: File not found: {e}", file=sys.stderr)
         sys.exit(1)