golem-vm-provider 0.1.52__py3-none-any.whl → 0.1.53__py3-none-any.whl

{golem_vm_provider-0.1.52.dist-info → golem_vm_provider-0.1.53.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: golem-vm-provider
-Version: 0.1.52
+Version: 0.1.53
 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
@@ -454,6 +454,8 @@ poetry run golem-provider streams withdraw --vm-id <vm_id>
 poetry run golem-provider streams withdraw --all
 ```
 
+Note: On testnets, the withdraw command auto-attempts to fund the provider's L2 address via the configured faucet if native gas balance is low.
+
 Configure monitor and withdraw via CLI:
 
 ```bash

{golem_vm_provider-0.1.52.dist-info → golem_vm_provider-0.1.53.dist-info}/RECORD

@@ -13,13 +13,14 @@ provider/discovery/multi_advertiser.py,sha256=_J79wA1-XQ4GsLzt9KrKpWigGSGBqtut7D
 provider/discovery/resource_monitor.py,sha256=AmiEc7yBGEGXCunQ-QKmVgosDX3gOhK1Y58LJZXrwAs,949
 provider/discovery/resource_tracker.py,sha256=MP7IXd3aIMsjB4xz5Oj9zFDTEnvrnw-Cyxpl33xcJcc,6006
 provider/discovery/service.py,sha256=vX_mVSxvn3arnb2cKDM_SeJp1ZgPdImP2aUubeXgdRg,915
-provider/main.py,sha256=-dkQEwMrU2g1ljGrdf2B6P6CcgpDAjeCEqbBy_E4ybk,32799
+provider/main.py,sha256=DJPVjvrTifFIw1l6jk0bwrOt35pmzmdVynv4A1fp9Y0,32137
 provider/network/port_verifier.py,sha256=3l6WNwBHydggJRFYkAsuBp1eCxaU619kjWuM-zSVj2o,13267
 provider/payments/blockchain_service.py,sha256=4GrzDKwCSUVoENqjD4RLyJ0qwBOJKMyVk5Li-XNsyTc,3567
 provider/payments/monitor.py,sha256=Rw17zYsxZre0zU6R0oeRNvVIzMdXLsgoUvSPHpJy6I0,4488
 provider/payments/stream_map.py,sha256=qk6Y8hS72DplAifZ0ZMWPHBAyc_3IWIQyWUBuCU3_To,1191
 provider/security/ethereum.py,sha256=EwPZj4JR8OEpto6LhKjuuT3Z9pBX6P7-UQaqJtqFkYQ,1242
 provider/security/faucet.py,sha256=8T4lW1fVQgUk8EQILgbrr9UUosw9e7eA40tlZ2_KCPQ,4368
+provider/security/l2_faucet.py,sha256=qp6Q2F44jsX5w8zZ14gzILesiGSxJhC1E_VVgqerBgY,2388
 provider/service.py,sha256=IIjeSM9T4r616nBRnxCUum_sgbyRusMMcja3yQd8zQI,3383
 provider/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 provider/utils/ascii_art.py,sha256=ykBFsztk57GIiz1NJ-EII5UvN74iECqQL4h9VmiW6Z8,3161
@@ -38,7 +39,7 @@ provider/vm/port_manager.py,sha256=iYSwjTjD_ziOhG8aI7juKHw1OwwRUTJQyQoRUNQvz9w,1
 provider/vm/provider.py,sha256=A7QN89EJjcSS40_SmKeinG1Jp_NGffJaLse-XdKciAs,1164
 provider/vm/proxy_manager.py,sha256=n4NTsyz2rtrvjtf_ceKBk-g2q_mzqPwruB1q7UlQVBc,14928
 provider/vm/service.py,sha256=Ki4SGNIZUq3XmaPMwAOoNzdZzKQsmFXid374wgjFPes,4636
-golem_vm_provider-0.1.52.dist-info/METADATA,sha256=-9IAEK4SfcsssCSwvniqN0hBaIvw3V8yxpEi9plknLw,17288
-golem_vm_provider-0.1.52.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-golem_vm_provider-0.1.52.dist-info/entry_points.txt,sha256=5Jiie1dIXygmxmDW66bKKxQpmBLJ7leSKRrb8bkQALw,52
-golem_vm_provider-0.1.52.dist-info/RECORD,,
+golem_vm_provider-0.1.53.dist-info/METADATA,sha256=mlrOME9VDQLPlCg8odOOc2u_q261s4Ox5C71-SjU8R0,17433
+golem_vm_provider-0.1.53.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+golem_vm_provider-0.1.53.dist-info/entry_points.txt,sha256=5Jiie1dIXygmxmDW66bKKxQpmBLJ7leSKRrb8bkQALw,52
+golem_vm_provider-0.1.53.dist-info/RECORD,,

provider/main.py

@@ -147,38 +147,17 @@ def main():
 def wallet_faucet_l2():
     """Request L2 faucet funds for the provider's payment address (native ETH)."""
     from .config import settings
-    from golem_faucet import PowFaucetClient
-    from web3 import Web3
+    from .security.l2_faucet import L2FaucetService
     try:
         addr = settings.PROVIDER_ID
-        faucet = PowFaucetClient(settings.L2_FAUCET_URL, settings.L2_CAPTCHA_URL, settings.L2_CAPTCHA_API_KEY)
-        # Check current L2 balance
-        w3 = Web3(Web3.HTTPProvider(settings.POLYGON_RPC_URL))
-        bal = 0.0
-        try:
-            bal = float(w3.from_wei(w3.eth.get_balance(Web3.to_checksum_address(addr)), 'ether'))
-        except Exception:
-            pass
-        if bal > 0.01:
-            print(f"Sufficient L2 funds ({bal} ETH); skipping faucet.")
-            return
         async def _run():
-            chall = await faucet.get_challenge()
-            if not chall:
-                print("Failed to get challenge")
-                raise typer.Exit(code=1)
-            sols = []
-            for salt, target in chall.get('challenge') or []:
-                sols.append((salt, target, PowFaucetClient.solve_challenge(salt, target)))
-            redeemed = await faucet.redeem(chall.get('token'), sols)
-            if not redeemed:
-                print("Failed to redeem solutions")
-                raise typer.Exit(code=1)
-            tx = await faucet.request_funds(addr, redeemed)
+            svc = L2FaucetService(settings)
+            tx = await svc.request_funds(addr)
             if tx:
                 print(f"Faucet tx: {tx}")
             else:
-                print("Faucet request failed")
+                # Either skipped due to sufficient balance or failed
+                pass
         asyncio.run(_run())
     except Exception as e:
         print(f"Error: {e}")
@@ -497,6 +476,7 @@ def streams_withdraw(
     """Withdraw vested funds for one or all streams."""
     from .container import Container
     from .config import settings
+    from .security.l2_faucet import L2FaucetService
     try:
         if not vm_id and not all_streams:
             print("Specify --vm-id or --all")
@@ -505,6 +485,12 @@ def streams_withdraw(
         c.config.from_pydantic(settings)
         stream_map = c.stream_map()
         client = c.stream_client()
+        # Ensure we have L2 gas for withdrawals (testnets)
+        try:
+            asyncio.run(L2FaucetService(settings).request_funds(settings.PROVIDER_ID))
+        except Exception:
+            # Non-fatal; proceed with withdraw attempt
+            pass
         targets = []
         if all_streams:
             items = asyncio.run(stream_map.all_items())

provider/security/l2_faucet.py

@@ -0,0 +1,63 @@
+from __future__ import annotations
+
+from typing import Optional, List, Tuple
+
+from web3 import Web3
+from golem_faucet import PowFaucetClient
+from ..utils.logging import setup_logger
+
+logger = setup_logger(__name__)
+
+
+class L2FaucetService:
+    """Request native ETH on the L2 payments chain via PoW faucet.
+
+    Uses provider settings for RPC and faucet endpoints.
+    """
+
+    def __init__(self, config):
+        # Config is expected to expose POLYGON_RPC_URL, L2_* faucet fields
+        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"),
+            captcha_base_url=getattr(config, "L2_CAPTCHA_URL", "https://cap.gobas.me"),
+            captcha_api_key=getattr(config, "L2_CAPTCHA_API_KEY", "05381a2cef5e"),
+        )
+
+    def _balance_eth(self, address: str) -> float:
+        try:
+            wei = self.web3.eth.get_balance(Web3.to_checksum_address(address))
+            return float(self.web3.from_wei(wei, "ether"))
+        except Exception as e:
+            logger.warning(f"L2 balance check failed: {e}")
+            return 0.0
+
+    async def request_funds(self, address: str) -> Optional[str]:
+        """Ensure some native ETH on L2; if low, solve PoW and request faucet payout.
+
+        Returns tx hash string on payout, or None if skipped/failed.
+        """
+        bal = self._balance_eth(address)
+        if bal > 0.01:
+            logger.info(f"Sufficient L2 funds ({bal} ETH), skipping faucet.")
+            return None
+        chall = await self.client.get_challenge()
+        if not chall:
+            logger.error("could not fetch faucet challenge")
+            return None
+        token = chall.get("token")
+        challenge_list = chall.get("challenge") or []
+        solutions: List[Tuple[str, str, int]] = []
+        for salt, target in challenge_list:
+            nonce = PowFaucetClient.solve_challenge(salt, target)
+            solutions.append((salt, target, nonce))
+        redeemed = await self.client.redeem(token, solutions)
+        if not redeemed:
+            logger.error("failed to redeem challenge")
+            return None
+        tx = await self.client.request_funds(address, redeemed)
+        if tx:
+            logger.success(f"L2 faucet sent tx: {tx}")
+        return tx
+