request-vm-on-golem 0.1.51__tar.gz → 0.1.53__tar.gz

{request_vm_on_golem-0.1.51 → request_vm_on_golem-0.1.53}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: request-vm-on-golem
-Version: 0.1.51
+Version: 0.1.53
 Summary: VM on Golem Requestor CLI - Create and manage virtual machines on the Golem Network
 Keywords: golem,vm,cloud,decentralized,cli
 Author: Phillip Jensen
@@ -41,7 +41,46 @@ Description-Content-Type: text/markdown
 
 # VM on Golem Requestor
 
-A sophisticated command-line interface for managing virtual machines on the Golem Network. The requestor works in tandem with provider nodes to create and manage VMs with secure SSH access.
+Rent compute on demand — like Airbnb for servers. The `golem` CLI helps you discover providers, fund pay‑as‑you‑go streams, launch VMs, and connect via SSH.
+
+## Quick Start (Rent a VM)
+
+1) Install:
+
+```bash
+pip install request-vm-on-golem
+```
+
+2) Find providers (testnet by default):
+
+```bash
+golem vm providers
+```
+
+3) Create a VM (auto‑opens a payment stream if needed):
+
+```bash
+golem vm create my-vm --provider-id 0xProvider --cpu 2 --memory 4 --storage 20
+```
+
+4) SSH in:
+
+```bash
+golem vm ssh my-vm
+```
+
+Check your installed version and whether an update is available:
+
+```bash
+golem version
+```
+
+5) Stop or destroy when done:
+
+```bash
+golem vm stop my-vm
+golem vm destroy my-vm
+```
 
 ## Architecture Overview
 
@@ -141,7 +180,7 @@ CLI helpers
 - Open a stream for a planned VM (computes rate from provider pricing):
 
 ```bash
-poetry run golem vm stream open \
+golem vm stream open \
   --provider-id 0xProvider \
   --cpu 2 --memory 4 --storage 20 \
   --hours 1
@@ -152,39 +191,39 @@ poetry run golem vm stream open \
 
 ```bash
 # Add 3 hours at prior rate
-poetry run golem vm stream topup --stream-id 123 --hours 3
+golem vm stream topup --stream-id 123 --hours 3
 
 # Or specify exact GLM amount
-poetry run golem vm stream topup --stream-id 123 --glm 25.0
+golem vm stream topup --stream-id 123 --glm 25.0
 ```
 
 - Check stream status via provider (by VM name recorded in your DB):
 
 ```bash
-poetry run golem vm stream status my-vm
+golem vm stream status my-vm
 # add --json for machine-readable output
 ```
 
 - Inspect a stream directly on-chain:
 
 ```bash
-poetry run golem vm stream inspect --stream-id 123
+golem vm stream inspect --stream-id 123
 ```
 
 - Stopping or destroying a VM ends the stream:
 
 ```bash
 # Stop VM and terminate payment stream (best-effort)
-poetry run golem vm stop my-vm
+golem vm stop my-vm
 
 # Destroy VM and terminate stream
-poetry run golem vm destroy my-vm
+golem vm destroy my-vm
 ```
 
 - Create a VM and attach an existing stream (no auto-streams are created by the requestor):
 
 ```bash
-poetry run golem vm create my-vm \
+golem vm create my-vm \
   --provider-id 0xProvider \
   --cpu 2 --memory 4 --storage 20 \
   --stream-id 123
@@ -192,7 +231,8 @@ poetry run golem vm create my-vm \
 
 Environment (env prefix `GOLEM_REQUESTOR_`):
 
-- `polygon_rpc_url` — EVM RPC URL (default L2 RPC)
+- `payments_network` — Payments network profile (defaults to `l2.holesky`). Profiles provide RPC + faucet defaults.
+- `polygon_rpc_url` — EVM RPC URL (defaults from `payments_network` profile; can be overridden)
 - `stream_payment_address` — StreamPayment address (defaults from `contracts/deployments/l2.json`; overridden by provider info)
 - `glm_token_address` — Token address (defaults from `contracts/deployments/l2.json`; zero address means native ETH)
   - Optional override of deployments directory: set `GOLEM_DEPLOYMENTS_DIR` to a folder containing `l2.json`.
@@ -210,16 +250,16 @@ Monitoring and auto top-up:
 - The requestor API runs a background monitor that keeps each running VM’s stream funded with at least 1 hour runway (configurable). It checks every 30s and tops up to the target runway.
 - Configure via env (prefix `GOLEM_REQUESTOR_`): `stream_monitor_enabled` (default true), `stream_monitor_interval_seconds` (default 30), `stream_min_remaining_seconds` (default 3600), `stream_topup_target_seconds` (default 3600).
 
-## Faucet (L2 ETH)
+## Faucet (Testnet only)
 
 - Request L2 test ETH to cover stream transactions:
 
 ```bash
-poetry run golem wallet faucet
+golem wallet faucet
 ```
 
 - Defaults:
-  - Faucet: `https://l2.holesky.golemdb.io/faucet`
+  - Faucet URL and enablement come from the active `payments_network` profile. On `mainnet` (or other profiles without faucet) the command is disabled.
   - CAPTCHA: `https://cap.gobas.me/05381a2cef5e`
   - Override with env: `GOLEM_REQUESTOR_l2_faucet_url`, `GOLEM_REQUESTOR_captcha_url`, `GOLEM_REQUESTOR_captcha_api_key`.
 
@@ -227,7 +267,7 @@ poetry run golem wallet faucet
 
 ```bash
 # Install using pip
-pip install golem-vm-requestor
+pip install request-vm-on-golem
 
 # Or install from source
 git clone https://github.com/golem/vm-on-golem.git
@@ -249,11 +289,7 @@ First, source the development environment variables:
 source .env.dev
 ```
 
-Then, run any `golem` command. For example:
-
-```bash
-poetry run golem vm providers
-```
+Then, run any `golem` command. For example: `golem vm providers`
 
 ### Prepending variables
 
@@ -270,19 +306,15 @@ GOLEM_REQUESTOR_ENVIRONMENT="development" GOLEM_REQUESTOR_FORCE_LOCALHOST="true"
   - Does not determine chain selection.
 
 - Network Selection (`--network` or `GOLEM_REQUESTOR_NETWORK`)
-  - Filters Golem Base discovery results by `golem_network=testnet|mainnet`.
-  - Combine with the appropriate RPC envs (`GOLEM_REQUESTOR_GOLEM_BASE_RPC_URL`, `GOLEM_REQUESTOR_GOLEM_BASE_WS_URL`) and any contract addresses.
-  - Independent from dev ergonomics.
+  - Filters results by `testnet|mainnet`. Defaults are sensible; most users don’t need to change anything.
+
+- Payments Network (`GOLEM_REQUESTOR_PAYMENTS_NETWORK`)
+  - Selects the payments chain profile (e.g., `l2.holesky`, `mainnet`) used for streaming payments; sets default RPC and faucet behavior.
+  - Provider discovery filters by this payments network via `vm providers` unless `--all-payments` is supplied. Override payments filter with `--payments-network <name>`.
 
 Examples:
-- List providers on mainnet without changing env:
-  ```bash
-  poetry run golem vm providers --network mainnet
-  ```
-- Create a VM while targeting testnet:
-  ```bash
-  poetry run golem vm create my-vm --provider-id 0xProvider --cpu 2 --memory 4 --storage 20 --network testnet
-  ```
+- List providers on mainnet without changing env: `golem vm providers --network mainnet`
+- Create a VM while targeting testnet: `golem vm create my-vm --provider-id 0xProvider --cpu 2 --memory 4 --storage 20 --network testnet`
 
 ## Usage
 
@@ -388,9 +420,6 @@ The requestor uses a hierarchical configuration system:
 1. Environment Variables:
 
 ```bash
-# Discovery Service
-export GOLEM_REQUESTOR_DISCOVERY_URL="http://discovery.golem.network:9001"
-
 # Base Directory (default: ~/.golem)
 export GOLEM_REQUESTOR_BASE_DIR="/path/to/golem/dir"
 
@@ -401,7 +430,7 @@ export GOLEM_REQUESTOR_DB_PATH="/path/to/database.db"
 # Environment Mode (defaults to "production")
 export GOLEM_REQUESTOR_ENVIRONMENT="development"  # Optional: Switch to development mode
 export GOLEM_REQUESTOR_FORCE_LOCALHOST="true"    # Optional: Force localhost in development mode
-export GOLEM_REQUESTOR_NETWORK="testnet"         # Or "mainnet"; filters Golem Base results by annotation
+export GOLEM_REQUESTOR_NETWORK="testnet"         # Or "mainnet"; optional filter for listing/creation
 ```
 
 2. Directory Structure:
@@ -438,7 +467,7 @@ Local state is maintained in SQLite:
 
 The requestor communicates with providers through:
 
-1. Discovery service for provider location
+1. Network discovery (uses sane defaults; no setup required for most users)
 2. Direct API calls for VM management
 3. SSH proxy system for secure access
 4. Resource tracking for capacity management

{request_vm_on_golem-0.1.51 → request_vm_on_golem-0.1.53}/README.md

@@ -1,6 +1,45 @@
 # VM on Golem Requestor
 
-A sophisticated command-line interface for managing virtual machines on the Golem Network. The requestor works in tandem with provider nodes to create and manage VMs with secure SSH access.
+Rent compute on demand — like Airbnb for servers. The `golem` CLI helps you discover providers, fund pay‑as‑you‑go streams, launch VMs, and connect via SSH.
+
+## Quick Start (Rent a VM)
+
+1) Install:
+
+```bash
+pip install request-vm-on-golem
+```
+
+2) Find providers (testnet by default):
+
+```bash
+golem vm providers
+```
+
+3) Create a VM (auto‑opens a payment stream if needed):
+
+```bash
+golem vm create my-vm --provider-id 0xProvider --cpu 2 --memory 4 --storage 20
+```
+
+4) SSH in:
+
+```bash
+golem vm ssh my-vm
+```
+
+Check your installed version and whether an update is available:
+
+```bash
+golem version
+```
+
+5) Stop or destroy when done:
+
+```bash
+golem vm stop my-vm
+golem vm destroy my-vm
+```
 
 ## Architecture Overview
 
@@ -100,7 +139,7 @@ CLI helpers
 - Open a stream for a planned VM (computes rate from provider pricing):
 
 ```bash
-poetry run golem vm stream open \
+golem vm stream open \
   --provider-id 0xProvider \
   --cpu 2 --memory 4 --storage 20 \
   --hours 1
@@ -111,39 +150,39 @@ poetry run golem vm stream open \
 
 ```bash
 # Add 3 hours at prior rate
-poetry run golem vm stream topup --stream-id 123 --hours 3
+golem vm stream topup --stream-id 123 --hours 3
 
 # Or specify exact GLM amount
-poetry run golem vm stream topup --stream-id 123 --glm 25.0
+golem vm stream topup --stream-id 123 --glm 25.0
 ```
 
 - Check stream status via provider (by VM name recorded in your DB):
 
 ```bash
-poetry run golem vm stream status my-vm
+golem vm stream status my-vm
 # add --json for machine-readable output
 ```
 
 - Inspect a stream directly on-chain:
 
 ```bash
-poetry run golem vm stream inspect --stream-id 123
+golem vm stream inspect --stream-id 123
 ```
 
 - Stopping or destroying a VM ends the stream:
 
 ```bash
 # Stop VM and terminate payment stream (best-effort)
-poetry run golem vm stop my-vm
+golem vm stop my-vm
 
 # Destroy VM and terminate stream
-poetry run golem vm destroy my-vm
+golem vm destroy my-vm
 ```
 
 - Create a VM and attach an existing stream (no auto-streams are created by the requestor):
 
 ```bash
-poetry run golem vm create my-vm \
+golem vm create my-vm \
   --provider-id 0xProvider \
   --cpu 2 --memory 4 --storage 20 \
   --stream-id 123
@@ -151,7 +190,8 @@ poetry run golem vm create my-vm \
 
 Environment (env prefix `GOLEM_REQUESTOR_`):
 
-- `polygon_rpc_url` — EVM RPC URL (default L2 RPC)
+- `payments_network` — Payments network profile (defaults to `l2.holesky`). Profiles provide RPC + faucet defaults.
+- `polygon_rpc_url` — EVM RPC URL (defaults from `payments_network` profile; can be overridden)
 - `stream_payment_address` — StreamPayment address (defaults from `contracts/deployments/l2.json`; overridden by provider info)
 - `glm_token_address` — Token address (defaults from `contracts/deployments/l2.json`; zero address means native ETH)
   - Optional override of deployments directory: set `GOLEM_DEPLOYMENTS_DIR` to a folder containing `l2.json`.
@@ -169,16 +209,16 @@ Monitoring and auto top-up:
 - The requestor API runs a background monitor that keeps each running VM’s stream funded with at least 1 hour runway (configurable). It checks every 30s and tops up to the target runway.
 - Configure via env (prefix `GOLEM_REQUESTOR_`): `stream_monitor_enabled` (default true), `stream_monitor_interval_seconds` (default 30), `stream_min_remaining_seconds` (default 3600), `stream_topup_target_seconds` (default 3600).
 
-## Faucet (L2 ETH)
+## Faucet (Testnet only)
 
 - Request L2 test ETH to cover stream transactions:
 
 ```bash
-poetry run golem wallet faucet
+golem wallet faucet
 ```
 
 - Defaults:
-  - Faucet: `https://l2.holesky.golemdb.io/faucet`
+  - Faucet URL and enablement come from the active `payments_network` profile. On `mainnet` (or other profiles without faucet) the command is disabled.
   - CAPTCHA: `https://cap.gobas.me/05381a2cef5e`
   - Override with env: `GOLEM_REQUESTOR_l2_faucet_url`, `GOLEM_REQUESTOR_captcha_url`, `GOLEM_REQUESTOR_captcha_api_key`.
 
@@ -186,7 +226,7 @@ poetry run golem wallet faucet
 
 ```bash
 # Install using pip
-pip install golem-vm-requestor
+pip install request-vm-on-golem
 
 # Or install from source
 git clone https://github.com/golem/vm-on-golem.git
@@ -208,11 +248,7 @@ First, source the development environment variables:
 source .env.dev
 ```
 
-Then, run any `golem` command. For example:
-
-```bash
-poetry run golem vm providers
-```
+Then, run any `golem` command. For example: `golem vm providers`
 
 ### Prepending variables
 
@@ -229,19 +265,15 @@ GOLEM_REQUESTOR_ENVIRONMENT="development" GOLEM_REQUESTOR_FORCE_LOCALHOST="true"
   - Does not determine chain selection.
 
 - Network Selection (`--network` or `GOLEM_REQUESTOR_NETWORK`)
-  - Filters Golem Base discovery results by `golem_network=testnet|mainnet`.
-  - Combine with the appropriate RPC envs (`GOLEM_REQUESTOR_GOLEM_BASE_RPC_URL`, `GOLEM_REQUESTOR_GOLEM_BASE_WS_URL`) and any contract addresses.
-  - Independent from dev ergonomics.
+  - Filters results by `testnet|mainnet`. Defaults are sensible; most users don’t need to change anything.
+
+- Payments Network (`GOLEM_REQUESTOR_PAYMENTS_NETWORK`)
+  - Selects the payments chain profile (e.g., `l2.holesky`, `mainnet`) used for streaming payments; sets default RPC and faucet behavior.
+  - Provider discovery filters by this payments network via `vm providers` unless `--all-payments` is supplied. Override payments filter with `--payments-network <name>`.
 
 Examples:
-- List providers on mainnet without changing env:
-  ```bash
-  poetry run golem vm providers --network mainnet
-  ```
-- Create a VM while targeting testnet:
-  ```bash
-  poetry run golem vm create my-vm --provider-id 0xProvider --cpu 2 --memory 4 --storage 20 --network testnet
-  ```
+- List providers on mainnet without changing env: `golem vm providers --network mainnet`
+- Create a VM while targeting testnet: `golem vm create my-vm --provider-id 0xProvider --cpu 2 --memory 4 --storage 20 --network testnet`
 
 ## Usage
 
@@ -347,9 +379,6 @@ The requestor uses a hierarchical configuration system:
 1. Environment Variables:
 
 ```bash
-# Discovery Service
-export GOLEM_REQUESTOR_DISCOVERY_URL="http://discovery.golem.network:9001"
-
 # Base Directory (default: ~/.golem)
 export GOLEM_REQUESTOR_BASE_DIR="/path/to/golem/dir"
 
@@ -360,7 +389,7 @@ export GOLEM_REQUESTOR_DB_PATH="/path/to/database.db"
 # Environment Mode (defaults to "production")
 export GOLEM_REQUESTOR_ENVIRONMENT="development"  # Optional: Switch to development mode
 export GOLEM_REQUESTOR_FORCE_LOCALHOST="true"    # Optional: Force localhost in development mode
-export GOLEM_REQUESTOR_NETWORK="testnet"         # Or "mainnet"; filters Golem Base results by annotation
+export GOLEM_REQUESTOR_NETWORK="testnet"         # Or "mainnet"; optional filter for listing/creation
 ```
 
 2. Directory Structure:
@@ -397,7 +426,7 @@ Local state is maintained in SQLite:
 
 The requestor communicates with providers through:
 
-1. Discovery service for provider location
+1. Network discovery (uses sane defaults; no setup required for most users)
 2. Direct API calls for VM management
 3. SSH proxy system for secure access
 4. Resource tracking for capacity management

{request_vm_on_golem-0.1.51 → request_vm_on_golem-0.1.53}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "request-vm-on-golem"
-version = "0.1.51"
+version = "0.1.53"
 description = "VM on Golem Requestor CLI - Create and manage virtual machines on the Golem Network"
 authors = ["Phillip Jensen <phillip+vm-on-golem@golemgrid.com>"]
 readme = "README.md"

{request_vm_on_golem-0.1.51 → request_vm_on_golem-0.1.53}/requestor/cli/commands.py

@@ -5,6 +5,7 @@ import json
 from typing import Optional
 from pathlib import Path
 import subprocess
+import os
 import aiohttp
 from tabulate import tabulate
 import uvicorn
@@ -89,6 +90,33 @@ def cli(network: str | None):
     pass
 
 
+@cli.command(name="version")
+def version_cmd():
+    """Show installed and latest versions from PyPI."""
+    pkg = "request-vm-on-golem"
+    try:
+        current = metadata.version(pkg)
+    except Exception:
+        current = "unknown"
+    latest = None
+    # Avoid network during pytest
+    if not os.environ.get("PYTEST_CURRENT_TEST"):
+        try:
+            import json as _json
+            from urllib.request import urlopen
+            with urlopen(f"https://pypi.org/pypi/{pkg}/json", timeout=5) as resp:
+                data = _json.loads(resp.read().decode("utf-8"))
+                latest = data.get("info", {}).get("version")
+        except Exception:
+            latest = None
+
+    if latest and latest != current:
+        click.echo(f"Requestor CLI: {current} (update available: {latest})")
+        click.echo("Update: pip install -U request-vm-on-golem")
+    else:
+        click.echo(f"Requestor CLI: {current} (up-to-date)" if latest else f"Requestor CLI: {current}")
+
+
 @cli.group()
 def vm():
     """VM management commands"""
@@ -101,11 +129,13 @@ def vm():
 @click.option('--storage', type=int, help='Minimum disk (GB) required')
 @click.option('--country', help='Preferred provider country')
 @click.option('--driver', type=click.Choice(['central', 'golem-base']), default=None, help='Discovery driver to use')
+@click.option('--payments-network', type=str, default=None, help='Filter by payments network profile (default: current config)')
+@click.option('--all-payments', is_flag=True, help='Do not filter by payments network (show all)')
 @click.option('--json', 'as_json', is_flag=True, help='Output in JSON format')
 @click.option('--network', type=click.Choice(['testnet', 'mainnet']), default=None,
               help='Override network filter for this command')
 @async_command
-async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Optional[int], country: Optional[str], driver: Optional[str], as_json: bool, network: Optional[str] = None):
+async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Optional[int], country: Optional[str], driver: Optional[str], payments_network: Optional[str] = None, all_payments: bool = False, as_json: bool = False, network: Optional[str] = None):
     """List available providers matching requirements."""
     try:
         if network:
@@ -124,7 +154,8 @@ async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Opt
 
         # Determine the discovery driver being used
         discovery_driver = driver or config.discovery_driver
-        logger.process(f"Querying discovery service via {discovery_driver} (network={config.network})")
+        eff_pn = payments_network if payments_network is not None else getattr(config, 'payments_network', None)
+        logger.process(f"Querying discovery via {discovery_driver} (network={config.network}, payments={eff_pn if not all_payments else 'ALL'})")
 
         # Initialize provider service
         provider_service = ProviderService()
@@ -132,13 +163,21 @@ async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Opt
             # If a full spec is provided, enable per-provider estimate display
             if cpu and memory and storage:
                 provider_service.estimate_spec = (cpu, memory, storage)
-            providers = await provider_service.find_providers(
-                cpu=cpu,
-                memory=memory,
-                storage=storage,
-                country=country,
-                driver=driver
-            )
+            try:
+                providers = await provider_service.find_providers(
+                    cpu=cpu,
+                    memory=memory,
+                    storage=storage,
+                    country=country,
+                    driver=driver,
+                    payments_network=eff_pn,
+                    include_all_payments=bool(all_payments),
+                )
+            except TypeError:
+                # Backward compatibility with older/dummy service stubs in tests
+                providers = await provider_service.find_providers(
+                    cpu=cpu, memory=memory, storage=storage, country=country, driver=driver
+                )
 
         if not providers:
             logger.warning("No providers found matching criteria")
@@ -606,6 +645,10 @@ def wallet():
 async def wallet_faucet():
     """Request L2 faucet funds for the requestor's payment address."""
     try:
+        if not getattr(config, 'faucet_enabled', False):
+            logger.warning("Faucet is disabled for the current payments network.")
+            click.echo(json.dumps({"error": "faucet_disabled", "network": getattr(config, 'payments_network', None)}, indent=2))
+            return
         from ..security.faucet import L2FaucetService
         from eth_account import Account
         acct = Account.from_key(config.ethereum_private_key)

{request_vm_on_golem-0.1.51 → request_vm_on_golem-0.1.53}/requestor/config.py

@@ -54,6 +54,13 @@ class RequestorConfig(BaseSettings):
         description="Target network: 'testnet' or 'mainnet'"
     )
     
+    # Payments chain selection (modular network profiles)
+    # Keep current standard as l2.holesky
+    payments_network: str = Field(
+        default="l2.holesky",
+        description="Payments network profile (e.g., 'l2.holesky', 'kaolin.holesky', 'mainnet')"
+    )
+    
     # Development Settings
     force_localhost: bool = Field(
         default=False,
@@ -102,8 +109,8 @@ class RequestorConfig(BaseSettings):
     
     # Payments (EVM RPC)
     polygon_rpc_url: str = Field(
-        default="https://l2.holesky.golemdb.io/rpc",
-        description="EVM RPC URL for streaming payments (L2 by default)"
+        default="",
+        description="EVM RPC URL for streaming payments; defaults from payments_network profile"
     )
     stream_payment_address: str = Field(
         default="",
@@ -130,10 +137,10 @@ class RequestorConfig(BaseSettings):
         default=3600,
         description="Target runway after top-up (seconds)"
     )
-    # Faucet settings (L2 payments)
+    # Faucet settings (payments)
     l2_faucet_url: str = Field(
-        default="https://l2.holesky.golemdb.io/faucet",
-        description="L2 faucet base URL (no trailing /api)"
+        default="",
+        description="Faucet base URL (no trailing /api). Only used on testnets. Defaults from payments_network profile"
     )
     captcha_url: str = Field(
         default="https://cap.gobas.me",
@@ -150,8 +157,8 @@ class RequestorConfig(BaseSettings):
 
     @field_validator("polygon_rpc_url", mode='before')
     @classmethod
-    def prefer_alt_env(cls, v: str) -> str:
-        # Accept alt aliases
+    def prefer_alt_env(cls, v: str, info: ValidationInfo) -> str:
+        # Accept alt aliases overriding the profile
         for key in (
             "GOLEM_REQUESTOR_l2_rpc_url",
             "GOLEM_REQUESTOR_L2_RPC_URL",
@@ -160,22 +167,45 @@ class RequestorConfig(BaseSettings):
         ):
             if os.environ.get(key):
                 return os.environ[key]
-        return v
+        if v:
+            return v
+        # Default from payments profile
+        pn = info.data.get("payments_network") or "l2.holesky"
+        return RequestorConfig._profile_defaults(pn)["rpc_url"]
+
+    @field_validator("l2_faucet_url", mode='before')
+    @classmethod
+    def default_faucet_env(cls, v: str, info: ValidationInfo) -> str:
+        for key in (
+            "GOLEM_REQUESTOR_l2_faucet_url",
+            "GOLEM_REQUESTOR_L2_FAUCET_URL",
+        ):
+            if os.environ.get(key):
+                return os.environ[key]
+        if v:
+            return v
+        pn = info.data.get("payments_network") or "l2.holesky"
+        return RequestorConfig._profile_defaults(pn).get("faucet_url", "")
 
     @staticmethod
-    def _load_l2_deployment() -> tuple[str | None, str | None]:
+    def _load_deployment(network: str) -> tuple[str | None, str | None]:
         try:
             base = os.environ.get("GOLEM_DEPLOYMENTS_DIR")
             if base:
-                path = Path(base) / "l2.json"
+                path = Path(base) / f"{RequestorConfig._deployment_basename(network)}.json"
             else:
                 # repo root assumption: ../../ relative to this file
-                path = Path(__file__).resolve().parents[2] / "contracts" / "deployments" / "l2.json"
+                path = (
+                    Path(__file__).resolve().parents[2]
+                    / "contracts" / "deployments" / f"{RequestorConfig._deployment_basename(network)}.json"
+                )
             if not path.exists():
                 # Try package resource fallback
                 try:
                     import importlib.resources as ir
-                    with ir.files("requestor.data.deployments").joinpath("l2.json").open("r") as fh:  # type: ignore[attr-defined]
+                    with ir.files("requestor.data.deployments").joinpath(
+                        f"{RequestorConfig._deployment_basename(network)}.json"
+                    ).open("r") as fh:  # type: ignore[attr-defined]
                         import json as _json
                         data = _json.load(fh)
                 except Exception:
@@ -192,22 +222,83 @@ class RequestorConfig(BaseSettings):
             pass
         return None, None
 
+    @staticmethod
+    def _deployment_basename(network: str) -> str:
+        # Map well-known network aliases to deployment file base names
+        n = (network or "").lower()
+        if n in ("l2", "l2.holesky"):  # current standard
+            return "l2"
+        if "." in n:
+            return n.split(".")[0]
+        return n or "l2"
+
+    @staticmethod
+    def _profile_defaults(network: str) -> Dict[str, str]:
+        n = (network or "l2.holesky").lower()
+        # Built-in profiles; extend easily in future
+        profiles = {
+            "l2.holesky": {
+                "rpc_url": "https://l2.holesky.golemdb.io/rpc",
+                "faucet_url": "https://l2.holesky.golemdb.io/faucet",
+                "faucet_enabled": True,
+                "token_symbol": "GLM",
+                "gas_symbol": "ETH",
+            },
+            # Example: mainnet has no faucet by default
+            "mainnet": {
+                "rpc_url": "",
+                "faucet_url": "",
+                "faucet_enabled": False,
+                "token_symbol": "GLM",
+                "gas_symbol": "ETH",
+            },
+        }
+        return profiles.get(n, profiles["l2.holesky"])  # default to current standard
+
     @field_validator("stream_payment_address", mode='before')
     @classmethod
-    def default_stream_addr(cls, v: str) -> str:
+    def default_stream_addr(cls, v: str, info: ValidationInfo) -> str:
         if v:
             return v
-        addr, _ = RequestorConfig._load_l2_deployment()
+        network = info.data.get("payments_network") or "l2.holesky"
+        addr, _ = RequestorConfig._load_deployment(network)
         return addr or "0x0000000000000000000000000000000000000000"
 
     @field_validator("glm_token_address", mode='before')
     @classmethod
-    def default_token_addr(cls, v: str) -> str:
+    def default_token_addr(cls, v: str, info: ValidationInfo) -> str:
         if v:
             return v
-        _, token = RequestorConfig._load_l2_deployment()
+        network = info.data.get("payments_network") or "l2.holesky"
+        _, token = RequestorConfig._load_deployment(network)
         return token or "0x0000000000000000000000000000000000000000"
 
+    # Optional convenience: expose token and gas symbols based on profile
+    token_symbol: str = Field(
+        default="",
+        description="Human-friendly symbol of payment token (e.g., GLM)"
+    )
+    gas_token_symbol: str = Field(
+        default="",
+        description="Symbol of gas token for the chain (e.g., ETH)"
+    )
+
+    @field_validator("token_symbol", mode="before")
+    @classmethod
+    def default_token_symbol(cls, v: str, info: ValidationInfo) -> str:
+        if v:
+            return v
+        pn = info.data.get("payments_network") or "l2.holesky"
+        return RequestorConfig._profile_defaults(pn).get("token_symbol", "")
+
+    @field_validator("gas_token_symbol", mode="before")
+    @classmethod
+    def default_gas_symbol(cls, v: str, info: ValidationInfo) -> str:
+        if v:
+            return v
+        pn = info.data.get("payments_network") or "l2.holesky"
+        return RequestorConfig._profile_defaults(pn).get("gas_symbol", "")
+
     # Base Directory
     base_dir: Path = Field(
         default_factory=lambda: Path.home() / ".golem" / "requestor",
@@ -240,6 +331,11 @@ class RequestorConfig(BaseSettings):
             kwargs['db_path'] = base_dir / "vms.db"
         super().__init__(**kwargs)
 
+    @property
+    def faucet_enabled(self) -> bool:
+        """Whether requesting funds from faucet is allowed for current payments network."""
+        return bool(self._profile_defaults(self.payments_network).get("faucet_enabled", False))
+
     def get_provider_url(self, ip_address: str) -> str:
         """Get provider API URL.
         

{request_vm_on_golem-0.1.51 → request_vm_on_golem-0.1.53}/requestor/security/faucet.py

@@ -15,7 +15,7 @@ class L2FaucetService:
         self.cfg = config
         self.web3 = Web3(Web3.HTTPProvider(config.polygon_rpc_url))
         self.client = PowFaucetClient(
-            faucet_url=getattr(config, 'l2_faucet_url', 'https://l2.holesky.golemdb.io/faucet'),
+            faucet_url=getattr(config, 'l2_faucet_url', '') or 'https://l2.holesky.golemdb.io/faucet',
             captcha_base_url=getattr(config, 'captcha_url', 'https://cap.gobas.me'),
             captcha_api_key=getattr(config, 'captcha_api_key', '05381a2cef5e'),
         )
@@ -29,6 +29,10 @@ class L2FaucetService:
             return 0.0
 
     async def request_funds(self, address: str) -> Optional[str]:
+        # Disallow faucet if explicitly disabled by profile
+        if hasattr(self.cfg, 'faucet_enabled') and not getattr(self.cfg, 'faucet_enabled'):
+            logger.info("Faucet disabled for current payments network; skipping.")
+            return None
         bal = self._balance_eth(address)
         if bal > 0.01:
             logger.info(f"Sufficient L2 funds ({bal} ETH), skipping faucet.")
@@ -51,4 +55,3 @@ class L2FaucetService:
         if tx:
             logger.success(f"L2 faucet sent tx: {tx}")
         return tx
-

{request_vm_on_golem-0.1.51 → request_vm_on_golem-0.1.53}/requestor/services/provider_service.py

@@ -66,7 +66,9 @@ class ProviderService:
         memory: Optional[int] = None,
         storage: Optional[int] = None,
         country: Optional[str] = None,
-        driver: Optional[str] = None
+        driver: Optional[str] = None,
+        payments_network: Optional[str] = None,
+        include_all_payments: bool = False,
     ) -> List[Dict]:
         """Find providers matching requirements."""
         discovery_driver = driver or config.discovery_driver
@@ -79,7 +81,11 @@ class ProviderService:
                     ws_url=config.golem_base_ws_url,
                     private_key=private_key_bytes,
                 )
-            return await self._find_providers_golem_base(cpu, memory, storage, country)
+            return await self._find_providers_golem_base(
+                cpu, memory, storage, country,
+                payments_network=payments_network,
+                include_all_payments=include_all_payments,
+            )
         else:
             return await self._find_providers_central(cpu, memory, storage, country)
 
@@ -88,7 +94,9 @@ class ProviderService:
         cpu: Optional[int] = None,
         memory: Optional[int] = None,
         storage: Optional[int] = None,
-        country: Optional[str] = None
+        country: Optional[str] = None,
+        payments_network: Optional[str] = None,
+        include_all_payments: bool = False,
     ) -> List[Dict]:
         """Find providers using Golem Base."""
         try:
@@ -104,6 +112,10 @@ class ProviderService:
             # Filter by advertised network to avoid cross-network results
             if config.network:
                 query += f' && golem_network="{config.network}"'
+            # Filter by payments network unless explicitly disabled
+            pn = payments_network if payments_network is not None else getattr(config, 'payments_network', None)
+            if pn and not include_all_payments:
+                query += f' && golem_payments_network="{pn}"'
             if cpu:
                 query += f' && golem_cpu>={cpu}'
             if memory:
@@ -130,6 +142,7 @@ class ProviderService:
                     'provider_name': annotations.get('golem_provider_name'),
                     'ip_address': annotations.get('golem_ip_address'),
                     'country': annotations.get('golem_country'),
+                    'payments_network': annotations.get('golem_payments_network'),
                     'resources': {
                         'cpu': int(annotations.get('golem_cpu', 0)),
                         'memory': int(annotations.get('golem_memory', 0)),