golem-vm-provider 0.1.53__tar.gz → 0.1.55__tar.gz

{golem_vm_provider-0.1.53 → golem_vm_provider-0.1.55}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: golem-vm-provider
-Version: 0.1.53
+Version: 0.1.55
 Summary: VM on Golem Provider Node - Run your own provider node to offer VMs on the Golem Network
 Keywords: golem,vm,provider,cloud,decentralized
 Author: Phillip Jensen
@@ -45,7 +45,35 @@ Description-Content-Type: text/markdown
 
 # VM on Golem Provider Node
 
-The Provider Node enables participation in the Golem Network by managing virtual machines and computing resources. It handles VM lifecycle management, resource allocation, network proxying, and automated discovery advertisement.
+Earn by renting out your machine’s compute — like Airbnb for servers. The Provider service runs VMs for requestors, verifies payments via streaming, and lets you withdraw earnings.
+
+## Quick Start (Host and Earn)
+
+1) Install (Python 3.11+ recommended):
+
+```bash
+pip install golem-vm-provider
+```
+
+2) Start the provider (testnet by default is fine):
+
+```bash
+golem-provider start --network testnet
+```
+
+3) Set pricing in USD (GLM rates auto‑compute):
+
+```bash
+golem-provider pricing set --usd-per-core 12 --usd-per-mem 4 --usd-per-disk 0.1
+```
+
+4) On testnets, optionally fund gas for withdrawals:
+
+```bash
+golem-provider wallet faucet-l2
+```
+
+You are now discoverable to requestors and will earn as your VMs run.
 
 ## System Architecture
 
@@ -178,26 +206,26 @@ sequenceDiagram
 -   Clean connection handling
 -   Automatic proxy cleanup
 
-## Installation
+## Installation (from source / development)
 
 1. Prerequisites:
+   - Python 3.11+
+   - Multipass
+   - Poetry (for development)
 
-    - Python 3.9+
-    - Multipass
-    - Poetry
+2. Install from source:
 
-2. Install dependencies:
+```bash
+cd provider-server
+poetry install
+```
 
-    ```bash
-    cd provider-server
-    poetry install
-    ```
+3. Local environment (optional):
 
-3. Configure environment:
-    ```bash
-    cp .env.example .env
-    # Edit .env with your settings
-    ```
+```bash
+cp .env.example .env
+# Edit .env to tweak defaults if needed
+```
 
 ## Configuration
 
@@ -227,9 +255,9 @@ GOLEM_PROVIDER_PORT_RANGE_START={start_port}  # Default: 50800
 GOLEM_PROVIDER_PORT_RANGE_END={end_port}      # Default: 50900
 GOLEM_PROVIDER_PUBLIC_IP="auto"
 
-# Discovery Settings
-GOLEM_PROVIDER_DISCOVERY_URL="http://discovery.golem.network:9001"
-GOLEM_PROVIDER_ADVERTISEMENT_INTERVAL=240
+# Legacy discovery (optional; not required in normal operation)
+# GOLEM_PROVIDER_DISCOVERY_URL="http://discovery.golem.network:9001"
+# GOLEM_PROVIDER_ADVERTISEMENT_INTERVAL=240
 
 # Network Selection
 # Adds an annotation to on-chain advertisements and can be used by requestors to filter
@@ -266,7 +294,7 @@ When enabled, the provider verifies each VM creation request’s `stream_id` and
 - deposit is zero, stream not started, or stream halted
 - (Optional) remaining runway < `STREAM_MIN_REMAINING_SECONDS`
 
-## API Reference
+## API Reference (for integrators)
 
 ### Create VM
 
@@ -372,11 +400,11 @@ Notes:
 ### Starting the Provider
 
 ```bash
-# To run in production mode
-poetry run golem-provider start
+# Production mode
+golem-provider start
 
-# To run in development mode, set the environment and optionally network
-GOLEM_PROVIDER_ENVIRONMENT=development poetry run golem-provider start --network testnet
+# Development mode with extra logs and reload
+GOLEM_PROVIDER_ENVIRONMENT=development golem-provider start --network testnet
 ```
 
 ### Mode vs. Network
@@ -390,6 +418,9 @@ GOLEM_PROVIDER_ENVIRONMENT=development poetry run golem-provider start --network
   - Pair with appropriate RPC envs (`GOLEM_PROVIDER_GOLEM_BASE_RPC_URL`, `GOLEM_PROVIDER_GOLEM_BASE_WS_URL`).
   - Does not change dev ergonomics (logging, reload, or port verification behavior).
 
+- Payments Network (`GOLEM_PROVIDER_PAYMENTS_NETWORK`)
+  - Selects the payments chain profile (e.g., `l2.holesky`, `mainnet`). Determines default payments RPC, faucet enablement, and symbols.
+
 Common setups:
 - Local dev on testnet: `GOLEM_PROVIDER_ENVIRONMENT=development` plus `--network testnet`.
 - Staging on testnet: keep `ENVIRONMENT=production`, set `--network testnet` and testnet RPCs.
@@ -406,17 +437,20 @@ The provider will:
 4. Begin resource advertisement
 5. Listen for VM requests
 
+Notes:
+- Advertisements include both `golem_network` (testnet/mainnet) and `golem_payments_network` (e.g., `l2.holesky`). Requestors default to matching both; they can list all payments networks with a CLI flag.
+
 ### Faucet
 
 - L3 (Golem Base adverts): provider auto-requests funds on startup from `FAUCET_URL` (defaults to EthWarsaw Holesky) protected by CAPTCHA at `CAPTCHA_URL/05381a2cef5e`.
-- L2 (payments): Use the CLI to request native ETH:
+- L2 (payments): Use the CLI to request native ETH (enabled only on testnet profiles):
 
 ```bash
-poetry run golem-provider wallet faucet-l2
+golem-provider wallet faucet-l2
 ```
 
 Defaults:
-- L2 faucet: `https://l2.holesky.golemdb.io/faucet`
+- Faucet URL and enablement come from the active payments profile. On `mainnet` (or other profiles without faucet) the command is disabled.
 - CAPTCHA: `https://cap.gobas.me/05381a2cef5e`
 - Override with env: `GOLEM_PROVIDER_L2_FAUCET_URL`, `GOLEM_PROVIDER_L2_CAPTCHA_URL`, `GOLEM_PROVIDER_L2_CAPTCHA_API_KEY`.
 
@@ -460,10 +494,10 @@ Configure monitor and withdraw via CLI:
 
 ```bash
 # Set monitor to require 1h remaining, check every 30s
-poetry run golem-provider config monitor --enable true --interval 30 --min-remaining 3600
+golem-provider config monitor --enable true --interval 30 --min-remaining 3600
 
 # Enable auto-withdraw every 15 minutes when >= 1e15 wei
-poetry run golem-provider config withdraw --enable true --interval 900 --min-wei 1000000000000000
+golem-provider config withdraw --enable true --interval 900 --min-wei 1000000000000000
 ```
 
 ### Resource Advertisement Flow
@@ -476,6 +510,7 @@ sequenceDiagram
     participant DS as Discovery Service
 
     P->>RT: Initialize
+    P->>RT: Sync with existing VMs
     RT->>AD: Register Callback
     loop Every 4 minutes
         AD->>RT: Get Resources
@@ -485,6 +520,8 @@ sequenceDiagram
     end
 ```
 
+On startup, the provider syncs the resource tracker with all VMs currently running on the host (via Multipass). This ensures advertisements reflect already-allocated CPU, RAM, and storage after restarts, preventing false “outdated advertisement” updates when existing VMs are consuming resources. The sync is based on actual VMs present, independent of any still-open payment streams.
+
 ### Monitoring
 
 The provider includes comprehensive logging:

{golem_vm_provider-0.1.53 → golem_vm_provider-0.1.55}/README.md

@@ -1,6 +1,34 @@
 # VM on Golem Provider Node
 
-The Provider Node enables participation in the Golem Network by managing virtual machines and computing resources. It handles VM lifecycle management, resource allocation, network proxying, and automated discovery advertisement.
+Earn by renting out your machine’s compute — like Airbnb for servers. The Provider service runs VMs for requestors, verifies payments via streaming, and lets you withdraw earnings.
+
+## Quick Start (Host and Earn)
+
+1) Install (Python 3.11+ recommended):
+
+```bash
+pip install golem-vm-provider
+```
+
+2) Start the provider (testnet by default is fine):
+
+```bash
+golem-provider start --network testnet
+```
+
+3) Set pricing in USD (GLM rates auto‑compute):
+
+```bash
+golem-provider pricing set --usd-per-core 12 --usd-per-mem 4 --usd-per-disk 0.1
+```
+
+4) On testnets, optionally fund gas for withdrawals:
+
+```bash
+golem-provider wallet faucet-l2
+```
+
+You are now discoverable to requestors and will earn as your VMs run.
 
 ## System Architecture
 
@@ -133,26 +161,26 @@ sequenceDiagram
 -   Clean connection handling
 -   Automatic proxy cleanup
 
-## Installation
+## Installation (from source / development)
 
 1. Prerequisites:
+   - Python 3.11+
+   - Multipass
+   - Poetry (for development)
 
-    - Python 3.9+
-    - Multipass
-    - Poetry
+2. Install from source:
 
-2. Install dependencies:
+```bash
+cd provider-server
+poetry install
+```
 
-    ```bash
-    cd provider-server
-    poetry install
-    ```
+3. Local environment (optional):
 
-3. Configure environment:
-    ```bash
-    cp .env.example .env
-    # Edit .env with your settings
-    ```
+```bash
+cp .env.example .env
+# Edit .env to tweak defaults if needed
+```
 
 ## Configuration
 
@@ -182,9 +210,9 @@ GOLEM_PROVIDER_PORT_RANGE_START={start_port}  # Default: 50800
 GOLEM_PROVIDER_PORT_RANGE_END={end_port}      # Default: 50900
 GOLEM_PROVIDER_PUBLIC_IP="auto"
 
-# Discovery Settings
-GOLEM_PROVIDER_DISCOVERY_URL="http://discovery.golem.network:9001"
-GOLEM_PROVIDER_ADVERTISEMENT_INTERVAL=240
+# Legacy discovery (optional; not required in normal operation)
+# GOLEM_PROVIDER_DISCOVERY_URL="http://discovery.golem.network:9001"
+# GOLEM_PROVIDER_ADVERTISEMENT_INTERVAL=240
 
 # Network Selection
 # Adds an annotation to on-chain advertisements and can be used by requestors to filter
@@ -221,7 +249,7 @@ When enabled, the provider verifies each VM creation request’s `stream_id` and
 - deposit is zero, stream not started, or stream halted
 - (Optional) remaining runway < `STREAM_MIN_REMAINING_SECONDS`
 
-## API Reference
+## API Reference (for integrators)
 
 ### Create VM
 
@@ -327,11 +355,11 @@ Notes:
 ### Starting the Provider
 
 ```bash
-# To run in production mode
-poetry run golem-provider start
+# Production mode
+golem-provider start
 
-# To run in development mode, set the environment and optionally network
-GOLEM_PROVIDER_ENVIRONMENT=development poetry run golem-provider start --network testnet
+# Development mode with extra logs and reload
+GOLEM_PROVIDER_ENVIRONMENT=development golem-provider start --network testnet
 ```
 
 ### Mode vs. Network
@@ -345,6 +373,9 @@ GOLEM_PROVIDER_ENVIRONMENT=development poetry run golem-provider start --network
   - Pair with appropriate RPC envs (`GOLEM_PROVIDER_GOLEM_BASE_RPC_URL`, `GOLEM_PROVIDER_GOLEM_BASE_WS_URL`).
   - Does not change dev ergonomics (logging, reload, or port verification behavior).
 
+- Payments Network (`GOLEM_PROVIDER_PAYMENTS_NETWORK`)
+  - Selects the payments chain profile (e.g., `l2.holesky`, `mainnet`). Determines default payments RPC, faucet enablement, and symbols.
+
 Common setups:
 - Local dev on testnet: `GOLEM_PROVIDER_ENVIRONMENT=development` plus `--network testnet`.
 - Staging on testnet: keep `ENVIRONMENT=production`, set `--network testnet` and testnet RPCs.
@@ -361,17 +392,20 @@ The provider will:
 4. Begin resource advertisement
 5. Listen for VM requests
 
+Notes:
+- Advertisements include both `golem_network` (testnet/mainnet) and `golem_payments_network` (e.g., `l2.holesky`). Requestors default to matching both; they can list all payments networks with a CLI flag.
+
 ### Faucet
 
 - L3 (Golem Base adverts): provider auto-requests funds on startup from `FAUCET_URL` (defaults to EthWarsaw Holesky) protected by CAPTCHA at `CAPTCHA_URL/05381a2cef5e`.
-- L2 (payments): Use the CLI to request native ETH:
+- L2 (payments): Use the CLI to request native ETH (enabled only on testnet profiles):
 
 ```bash
-poetry run golem-provider wallet faucet-l2
+golem-provider wallet faucet-l2
 ```
 
 Defaults:
-- L2 faucet: `https://l2.holesky.golemdb.io/faucet`
+- Faucet URL and enablement come from the active payments profile. On `mainnet` (or other profiles without faucet) the command is disabled.
 - CAPTCHA: `https://cap.gobas.me/05381a2cef5e`
 - Override with env: `GOLEM_PROVIDER_L2_FAUCET_URL`, `GOLEM_PROVIDER_L2_CAPTCHA_URL`, `GOLEM_PROVIDER_L2_CAPTCHA_API_KEY`.
 
@@ -415,10 +449,10 @@ Configure monitor and withdraw via CLI:
 
 ```bash
 # Set monitor to require 1h remaining, check every 30s
-poetry run golem-provider config monitor --enable true --interval 30 --min-remaining 3600
+golem-provider config monitor --enable true --interval 30 --min-remaining 3600
 
 # Enable auto-withdraw every 15 minutes when >= 1e15 wei
-poetry run golem-provider config withdraw --enable true --interval 900 --min-wei 1000000000000000
+golem-provider config withdraw --enable true --interval 900 --min-wei 1000000000000000
 ```
 
 ### Resource Advertisement Flow
@@ -431,6 +465,7 @@ sequenceDiagram
     participant DS as Discovery Service
 
     P->>RT: Initialize
+    P->>RT: Sync with existing VMs
     RT->>AD: Register Callback
     loop Every 4 minutes
         AD->>RT: Get Resources
@@ -440,6 +475,8 @@ sequenceDiagram
     end
 ```
 
+On startup, the provider syncs the resource tracker with all VMs currently running on the host (via Multipass). This ensures advertisements reflect already-allocated CPU, RAM, and storage after restarts, preventing false “outdated advertisement” updates when existing VMs are consuming resources. The sync is based on actual VMs present, independent of any still-open payment streams.
+
 ### Monitoring
 
 The provider includes comprehensive logging:

{golem_vm_provider-0.1.53 → golem_vm_provider-0.1.55}/provider/config.py

@@ -57,6 +57,17 @@ class Settings(BaseSettings):
     # Logical network selector for annotation and client defaults
     NETWORK: str = "mainnet"  # one of: "testnet", "mainnet"
 
+    # Payments chain selection (modular network profiles). Keep default on l2.holesky
+    PAYMENTS_NETWORK: str = Field(
+        default="l2.holesky",
+        description="Payments network profile (e.g., 'l2.holesky', 'kaolin.holesky', 'mainnet')"
+    )
+
+    @field_validator("PAYMENTS_NETWORK", mode='before')
+    @classmethod
+    def prefer_payments_network_env(cls, v: str) -> str:
+        return os.environ.get("GOLEM_PROVIDER_PAYMENTS_NETWORK", v)
+
     @property
     def DEV_MODE(self) -> bool:
         return self.ENVIRONMENT == "development"
@@ -138,8 +149,8 @@ class Settings(BaseSettings):
 
     # Polygon / Payments
     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="",
@@ -181,8 +192,8 @@ class Settings(BaseSettings):
 
     # L2 payments faucet (native ETH)
     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"
     )
     L2_CAPTCHA_URL: str = Field(
         default="https://cap.gobas.me",
@@ -193,17 +204,42 @@ class Settings(BaseSettings):
         description="CAPTCHA API key path segment"
     )
 
+    @field_validator("L2_CAPTCHA_URL", mode='before')
+    @classmethod
+    def prefer_l2_captcha_url(cls, v: str) -> str:
+        return os.environ.get("GOLEM_PROVIDER_L2_CAPTCHA_URL", v)
+
+    @field_validator("L2_CAPTCHA_API_KEY", mode='before')
+    @classmethod
+    def prefer_l2_captcha_key(cls, v: str) -> str:
+        return os.environ.get("GOLEM_PROVIDER_L2_CAPTCHA_API_KEY", v)
+
     @field_validator("POLYGON_RPC_URL", mode='before')
     @classmethod
-    def prefer_custom_env(cls, v: str) -> str:
+    def prefer_custom_env(cls, v: str, values: dict) -> str:
         # Accept alternative aliases for payments RPC
         for key in ("GOLEM_PROVIDER_L2_RPC_URL", "GOLEM_PROVIDER_KAOLIN_RPC_URL"):
             if os.environ.get(key):
                 return os.environ[key]
-        return v
+        if v:
+            return v
+        # Default from profile
+        pn = values.data.get("PAYMENTS_NETWORK") or "l2.holesky"
+        return Settings._profile_defaults(pn)["rpc_url"]
+
+    @field_validator("L2_FAUCET_URL", mode='before')
+    @classmethod
+    def prefer_faucet_env(cls, v: str, values: dict) -> str:
+        for key in ("GOLEM_PROVIDER_L2_FAUCET_URL",):
+            if os.environ.get(key):
+                return os.environ[key]
+        if v:
+            return v
+        pn = values.data.get("PAYMENTS_NETWORK") or "l2.holesky"
+        return Settings._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 to load default StreamPayment + token from contracts/deployments/l2.json.
 
         Returns (stream_payment_address, glm_token_address) or (None, None) if not found.
@@ -212,15 +248,15 @@ class Settings(BaseSettings):
             # Allow override via env
             base = os.environ.get("GOLEM_DEPLOYMENTS_DIR")
             if base:
-                path = Path(base) / "l2.json"
+                path = Path(base) / f"{Settings._deployment_basename(network)}.json"
             else:
                 # repo root = ../../ from this file
-                path = Path(__file__).resolve().parents[2] / "contracts" / "deployments" / "l2.json"
+                path = Path(__file__).resolve().parents[2] / "contracts" / "deployments" / f"{Settings._deployment_basename(network)}.json"
             if not path.exists():
                 # Try package resource fallback
                 try:
                     import importlib.resources as ir
-                    with ir.files("provider.data.deployments").joinpath("l2.json").open("r") as fh:  # type: ignore[attr-defined]
+                    with ir.files("provider.data.deployments").joinpath(f"{Settings._deployment_basename(network)}.json").open("r") as fh:  # type: ignore[attr-defined]
                         data = json.load(fh)
                 except Exception:
                     return None, None
@@ -235,29 +271,90 @@ class Settings(BaseSettings):
             pass
         return None, None
 
+    # Backwards-compat helper used by tests expecting this method name
+    @staticmethod
+    def _load_l2_deployment() -> tuple[str | None, str | None]:
+        return Settings._load_deployment("l2.holesky")
+
+    @staticmethod
+    def _deployment_basename(network: str) -> str:
+        n = (network or "").lower()
+        if n in ("l2", "l2.holesky"):
+            return "l2"
+        if "." in n:
+            return n.split(".")[0]
+        return n or "l2"
+
+    @staticmethod
+    def _profile_defaults(network: str) -> dict[str, str | bool]:
+        n = (network or "l2.holesky").lower()
+        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",
+            },
+            "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, values: dict) -> str:
         # Disable payments during pytest to keep unit tests independent
         if os.environ.get("PYTEST_CURRENT_TEST"):
             return "0x0000000000000000000000000000000000000000"
         if v:
             return v
-        addr, _ = Settings._load_l2_deployment()
+        pn = values.data.get("PAYMENTS_NETWORK") or "l2.holesky"
+        addr, _ = Settings._load_deployment(pn)
         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, values: dict) -> str:
         if os.environ.get("PYTEST_CURRENT_TEST"):
             return "0x0000000000000000000000000000000000000000"
         if v:
             return v
-        _, token = Settings._load_l2_deployment()
+        pn = values.data.get("PAYMENTS_NETWORK") or "l2.holesky"
+        _, token = Settings._load_deployment(pn)
         return token or "0x0000000000000000000000000000000000000000"
 
     # VM Settings
     MAX_VMS: int = 10
+
+    # Optional human-friendly symbols from profile
+    TOKEN_SYMBOL: str = Field(default="", description="Payment token symbol, e.g., GLM")
+    GAS_TOKEN_SYMBOL: str = Field(default="", description="Gas token symbol, e.g., ETH")
+
+    @field_validator("TOKEN_SYMBOL", mode='before')
+    @classmethod
+    def default_token_symbol(cls, v: str, values: dict) -> str:
+        if v:
+            return v
+        pn = values.data.get("PAYMENTS_NETWORK") or "l2.holesky"
+        return str(Settings._profile_defaults(pn).get("token_symbol", ""))
+
+    @field_validator("GAS_TOKEN_SYMBOL", mode='before')
+    @classmethod
+    def default_gas_symbol(cls, v: str, values: dict) -> str:
+        if v:
+            return v
+        pn = values.data.get("PAYMENTS_NETWORK") or "l2.holesky"
+        return str(Settings._profile_defaults(pn).get("gas_symbol", ""))
+
+    @property
+    def FAUCET_ENABLED(self) -> bool:
+        return bool(self._profile_defaults(self.PAYMENTS_NETWORK).get("faucet_enabled", False))
     DEFAULT_VM_IMAGE: str = "ubuntu:24.04"
     VM_DATA_DIR: str = ""
     SSH_KEY_DIR: str = ""

{golem_vm_provider-0.1.53 → golem_vm_provider-0.1.55}/provider/discovery/golem_base_advertiser.py

@@ -68,6 +68,7 @@ class GolemBaseAdvertiser(Advertiser):
             string_annotations = [
                 Annotation(key="golem_type", value="provider"),
                 Annotation(key="golem_network", value=settings.NETWORK),
+                Annotation(key="golem_payments_network", value=settings.PAYMENTS_NETWORK),
                 Annotation(key="golem_provider_id", value=settings.PROVIDER_ID),
                 Annotation(key="golem_ip_address", value=ip_address),
                 Annotation(key="golem_country", value=settings.PROVIDER_COUNTRY),

{golem_vm_provider-0.1.53 → golem_vm_provider-0.1.55}/provider/main.py

@@ -149,6 +149,9 @@ def wallet_faucet_l2():
     from .config import settings
     from .security.l2_faucet import L2FaucetService
     try:
+        if not bool(getattr(settings, "FAUCET_ENABLED", False)):
+            print("Faucet is disabled for current payments network.")
+            raise typer.Exit(code=0)
         addr = settings.PROVIDER_ID
         async def _run():
             svc = L2FaucetService(settings)

{golem_vm_provider-0.1.53 → golem_vm_provider-0.1.55}/provider/payments/monitor.py

@@ -56,21 +56,41 @@ class StreamMonitor:
                         logger.warning(f"stream {stream_id} lookup failed: {e}")
                         continue
                     # Stop VM if remaining runway < threshold
-                    remaining = max(s["stopTime"] - now, 0)
+                    remaining = max(int(s["stopTime"]) - int(now), 0)
                     logger.debug(
                         f"stream {stream_id} for VM {vm_id}: start={s['startTime']} stop={s['stopTime']} "
                         f"rate={s['ratePerSecond']} withdrawn={s['withdrawn']} halted={s['halted']} remaining={remaining}s"
                     )
-                    if self._get("STREAM_MONITOR_ENABLED", False) and remaining < int(self._get("STREAM_MIN_REMAINING_SECONDS", 0)):
-                        logger.info(f"Stopping VM {vm_id} due to low stream runway ({remaining}s)")
+                    # If stream is force-halted, delete immediately to free all resources
+                    if bool(s.get("halted")):
+                        logger.info(
+                            f"Deleting VM {vm_id} due to halted stream (id={stream_id}, now={now})"
+                        )
+                        try:
+                            await self.vm_service.delete_vm(vm_id)
+                        except Exception as e:
+                            logger.warning(f"delete_vm failed for {vm_id}: {e}")
+                        try:
+                            await self.stream_map.remove(vm_id)
+                        except Exception as e:
+                            logger.debug(f"failed to remove vm {vm_id} from stream map: {e}")
+                        continue
+
+                    # Only stop a VM when runway is completely empty
+                    if remaining == 0:
+                        logger.info(
+                            f"Stopping VM {vm_id} as stream runway is exhausted (id={stream_id}, now={now}, stop={s.get('stopTime')})"
+                        )
                         try:
                             await self.vm_service.stop_vm(vm_id)
                         except Exception as e:
                             logger.warning(f"stop_vm failed for {vm_id}: {e}")
-                    else:
-                        logger.debug(
-                            f"VM {vm_id} stream {stream_id} healthy (remaining={remaining}s, threshold={self._get('STREAM_MIN_REMAINING_SECONDS', 0)}s)"
-                        )
+                        continue
+
+                    # Otherwise, do not stop; just log health and consider withdrawals
+                    logger.debug(
+                        f"VM {vm_id} stream {stream_id} healthy (remaining={remaining}s)"
+                    )
                     # Withdraw if enough vested and configured
                     if self._get("STREAM_WITHDRAW_ENABLED", False) and self.client:
                         vested = max(min(now, s["stopTime"]) - s["startTime"], 0) * s["ratePerSecond"]

{golem_vm_provider-0.1.53 → golem_vm_provider-0.1.55}/provider/security/l2_faucet.py

@@ -38,6 +38,10 @@ class L2FaucetService:
 
         Returns tx hash string on payout, or None if skipped/failed.
         """
+        # Respect profile gating only if explicitly present and false
+        if hasattr(self.cfg, "FAUCET_ENABLED") and not bool(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.")
@@ -60,4 +64,3 @@ class L2FaucetService:
         if tx:
             logger.success(f"L2 faucet sent tx: {tx}")
         return tx
-

golem_vm_provider-0.1.55/provider/service.py

@@ -0,0 +1,148 @@
+import asyncio
+from fastapi import FastAPI
+
+from .utils.logging import setup_logger
+from .vm.service import VMService
+from .discovery.service import AdvertisementService
+from .utils.pricing import PricingAutoUpdater
+
+logger = setup_logger(__name__)
+
+
+class ProviderService:
+    """Service for managing the provider's lifecycle."""
+
+    def __init__(self, vm_service: VMService, advertisement_service: AdvertisementService, port_manager):
+        self.vm_service = vm_service
+        self.advertisement_service = advertisement_service
+        self.port_manager = port_manager
+        self._pricing_updater: PricingAutoUpdater | None = None
+        self._stream_monitor = None
+
+    async def setup(self, app: FastAPI):
+        """Setup and initialize the provider components."""
+        from .config import settings
+        from .utils.ascii_art import startup_animation
+        from .security.faucet import FaucetClient
+
+        try:
+            # Display startup animation
+            await startup_animation()
+
+            logger.process("🔄 Initializing provider...")
+
+            # Setup directories
+            self._setup_directories()
+
+            # Initialize services
+            await self.port_manager.initialize()
+            await self.vm_service.provider.initialize()
+
+            # Before starting advertisement, sync allocated resources with existing VMs
+            try:
+                vm_resources = await self.vm_service.get_all_vms_resources()
+                await self.vm_service.resource_tracker.sync_with_multipass(vm_resources)
+            except Exception as e:
+                logger.warning(f"Failed to sync resources with existing VMs: {e}")
+
+            # Cross-check running VMs against payment streams. If a VM has no
+            # active stream, it is no longer rented: terminate it and free resources.
+            try:
+                # Only perform checks if payments are configured
+                if settings.STREAM_PAYMENT_ADDRESS and not settings.STREAM_PAYMENT_ADDRESS.lower().endswith("0000000000000000000000000000000000000000") and settings.POLYGON_RPC_URL:
+                    stream_map = app.container.stream_map()
+                    reader = app.container.stream_reader()
+
+                    # Use the most recent view of VMs from the previous sync
+                    vm_ids = list(vm_resources.keys()) if 'vm_resources' in locals() else []
+                    for vm_id in vm_ids:
+                        try:
+                            stream_id = await stream_map.get(vm_id)
+                        except Exception:
+                            stream_id = None
+
+                        if stream_id is None:
+                            reason = "no stream mapped"
+                            should_terminate = True
+                        else:
+                            try:
+                                ok, msg = reader.verify_stream(int(stream_id), settings.PROVIDER_ID)
+                                should_terminate = not ok
+                                reason = msg if not ok else "ok"
+                            except Exception as e:
+                                # If verification cannot be performed, be conservative and keep the VM
+                                logger.warning(f"Stream verification error for VM {vm_id} (stream {stream_id}): {e}")
+                                should_terminate = False
+                                reason = f"verification error: {e}"
+
+                        if should_terminate:
+                            logger.info(
+                                f"Deleting VM {vm_id}: inactive stream (stream_id={stream_id}, reason={reason})"
+                            )
+                            try:
+                                await self.vm_service.delete_vm(vm_id)
+                            except Exception as e:
+                                logger.warning(f"Failed to delete VM {vm_id}: {e}")
+                            try:
+                                await stream_map.remove(vm_id)
+                            except Exception:
+                                pass
+
+                    # Re-sync after any terminations to ensure ads reflect capacity
+                    try:
+                        vm_resources = await self.vm_service.get_all_vms_resources()
+                        await self.vm_service.resource_tracker.sync_with_multipass(vm_resources)
+                    except Exception as e:
+                        logger.warning(f"Post-termination resource sync failed: {e}")
+                else:
+                    logger.info("Payments not configured; skipping startup stream checks")
+            except Exception as e:
+                logger.warning(f"Failed to reconcile VMs with payment streams: {e}")
+
+            await self.advertisement_service.start()
+            # Start pricing auto-updater; trigger re-advertise after updates
+            async def _on_price_updated(platform: str, glm_usd):
+                await self.advertisement_service.trigger_update()
+            self._pricing_updater = PricingAutoUpdater(on_updated_callback=_on_price_updated)
+            asyncio.create_task(self._pricing_updater.start())
+
+            # Start stream monitor if enabled
+            from .container import Container
+            from .config import settings as cfg
+            if cfg.STREAM_MONITOR_ENABLED or cfg.STREAM_WITHDRAW_ENABLED:
+                self._stream_monitor = app.container.stream_monitor()
+                self._stream_monitor.start()
+
+            # Check wallet balance and request funds if needed
+            faucet_client = FaucetClient(
+                faucet_url=settings.FAUCET_URL,
+                captcha_url=settings.CAPTCHA_URL,
+                captcha_api_key=settings.CAPTCHA_API_KEY,
+            )
+            await faucet_client.get_funds(settings.PROVIDER_ID)
+
+            logger.success("✨ Provider setup complete")
+        except Exception as e:
+            logger.error(f"Startup failed: {e}")
+            await self.cleanup()
+            raise
+
+    async def cleanup(self):
+        """Cleanup provider components."""
+        logger.process("🔄 Cleaning up provider...")
+        await self.advertisement_service.stop()
+        await self.vm_service.provider.cleanup()
+        if self._pricing_updater:
+            self._pricing_updater.stop()
+        if self._stream_monitor:
+            await self._stream_monitor.stop()
+        logger.success("✨ Provider cleanup complete")
+
+    def _setup_directories(self):
+        """Create necessary directories for the provider."""
+        from .config import settings
+        from pathlib import Path
+        
+        Path(settings.VM_DATA_DIR).mkdir(parents=True, exist_ok=True)
+        Path(settings.SSH_KEY_DIR).mkdir(parents=True, exist_ok=True)
+        Path(settings.CLOUD_INIT_DIR).mkdir(parents=True, exist_ok=True)

{golem_vm_provider-0.1.53 → golem_vm_provider-0.1.55}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "golem-vm-provider"
-version = "0.1.53"
+version = "0.1.55"
 description = "VM on Golem Provider Node - Run your own provider node to offer VMs on the Golem Network"
 authors = ["Phillip Jensen <phillip+vm-on-golem@golemgrid.com>"]
 readme = "README.md"

golem_vm_provider-0.1.53/provider/service.py

@@ -1,86 +0,0 @@
-import asyncio
-from fastapi import FastAPI
-
-from .utils.logging import setup_logger
-from .vm.service import VMService
-from .discovery.service import AdvertisementService
-from .utils.pricing import PricingAutoUpdater
-
-logger = setup_logger(__name__)
-
-
-class ProviderService:
-    """Service for managing the provider's lifecycle."""
-
-    def __init__(self, vm_service: VMService, advertisement_service: AdvertisementService, port_manager):
-        self.vm_service = vm_service
-        self.advertisement_service = advertisement_service
-        self.port_manager = port_manager
-        self._pricing_updater: PricingAutoUpdater | None = None
-        self._stream_monitor = None
-
-    async def setup(self, app: FastAPI):
-        """Setup and initialize the provider components."""
-        from .config import settings
-        from .utils.ascii_art import startup_animation
-        from .security.faucet import FaucetClient
-
-        try:
-            # Display startup animation
-            await startup_animation()
-
-            logger.process("🔄 Initializing provider...")
-
-            # Setup directories
-            self._setup_directories()
-
-            # Initialize services
-            await self.port_manager.initialize()
-            await self.vm_service.provider.initialize()
-            await self.advertisement_service.start()
-            # Start pricing auto-updater; trigger re-advertise after updates
-            async def _on_price_updated(platform: str, glm_usd):
-                await self.advertisement_service.trigger_update()
-            self._pricing_updater = PricingAutoUpdater(on_updated_callback=_on_price_updated)
-            asyncio.create_task(self._pricing_updater.start())
-
-            # Start stream monitor if enabled
-            from .container import Container
-            from .config import settings as cfg
-            if cfg.STREAM_MONITOR_ENABLED or cfg.STREAM_WITHDRAW_ENABLED:
-                self._stream_monitor = app.container.stream_monitor()
-                self._stream_monitor.start()
-
-            # Check wallet balance and request funds if needed
-            faucet_client = FaucetClient(
-                faucet_url=settings.FAUCET_URL,
-                captcha_url=settings.CAPTCHA_URL,
-                captcha_api_key=settings.CAPTCHA_API_KEY,
-            )
-            await faucet_client.get_funds(settings.PROVIDER_ID)
-
-            logger.success("✨ Provider setup complete")
-        except Exception as e:
-            logger.error(f"Startup failed: {e}")
-            await self.cleanup()
-            raise
-
-    async def cleanup(self):
-        """Cleanup provider components."""
-        logger.process("🔄 Cleaning up provider...")
-        await self.advertisement_service.stop()
-        await self.vm_service.provider.cleanup()
-        if self._pricing_updater:
-            self._pricing_updater.stop()
-        if self._stream_monitor:
-            await self._stream_monitor.stop()
-        logger.success("✨ Provider cleanup complete")
-
-    def _setup_directories(self):
-        """Create necessary directories for the provider."""
-        from .config import settings
-        from pathlib import Path
-        
-        Path(settings.VM_DATA_DIR).mkdir(parents=True, exist_ok=True)
-        Path(settings.SSH_KEY_DIR).mkdir(parents=True, exist_ok=True)
-        Path(settings.CLOUD_INIT_DIR).mkdir(parents=True, exist_ok=True)