iwa 0.0.1a2__py3-none-any.whl → 0.0.1a4__py3-none-any.whl

iwa/core/models.py

@@ -14,6 +14,20 @@ from iwa.core.types import EthereumAddress  # noqa: F401 - re-exported for backw
 from iwa.core.utils import singleton
 
 
+class EncryptedData(BaseModel):
+    """Encrypted data structure with explicit KDF parameters."""
+
+    kdf: str = "scrypt"
+    kdf_salt: str
+    kdf_n: int = 16384  # 2**14
+    kdf_r: int = 8
+    kdf_p: int = 1
+    kdf_len: int = 32
+    cipher: str = "aesgcm"
+    nonce: str
+    ciphertext: str
+
+
 class StoredAccount(BaseModel):
     """StoredAccount representing an EOA or contract account."""
 
@@ -32,12 +46,6 @@ class StoredSafeAccount(StoredAccount):
 class CoreConfig(BaseModel):
     """Core configuration settings."""
 
-    manual_claim_enabled: bool = Field(
-        default=False, description="Enable manual claiming of rewards"
-    )
-    request_activity_alert_enabled: bool = Field(
-        default=True, description="Enable alerts for suspicious activity"
-    )
     whitelist: Dict[str, EthereumAddress] = Field(
         default_factory=dict, description="Address whitelist for security"
     )
@@ -45,6 +53,20 @@ class CoreConfig(BaseModel):
         default_factory=dict, description="Custom token definitions per chain"
     )
 
+    # Web UI Configuration
+    web_enabled: bool = Field(default=False, description="Enable Web UI")
+    web_port: int = Field(default=8080, description="Web UI port")
+
+    # IPFS Configuration
+    ipfs_api_url: str = Field(default="http://localhost:5001", description="IPFS API URL")
+
+    # Tenderly Configuration
+    tenderly_profile: int = Field(default=1, description="Tenderly profile ID (1, 2, 3)")
+    tenderly_native_funds: float = Field(
+        default=1000.0, description="Native ETH amount for vNet funding"
+    )
+    tenderly_olas_funds: float = Field(default=100000.0, description="OLAS amount for vNet funding")
+
 
 T = TypeVar("T", bound="StorableModel")
 

iwa/core/pricing.py

@@ -7,7 +7,7 @@ from typing import Dict, Optional
 import requests
 from loguru import logger
 
-from iwa.core.settings import settings
+from iwa.core.secrets import secrets
 
 
 class PriceService:
@@ -17,12 +17,12 @@ class PriceService:
 
     def __init__(self, cache_ttl_minutes: int = 5):
         """Initialize PriceService."""
-        self.settings = settings
+        self.secrets = secrets
         self.cache: Dict[str, Dict] = {}  # {id_currency: {"price": float, "timestamp": datetime}}
         self.cache_ttl = timedelta(minutes=cache_ttl_minutes)
         self.api_key = (
-            self.settings.coingecko_api_key.get_secret_value()
-            if self.settings.coingecko_api_key
+            self.secrets.coingecko_api_key.get_secret_value()
+            if self.secrets.coingecko_api_key
             else None
         )
 

iwa/core/secrets.py

@@ -0,0 +1,77 @@
+"""Secrets module - loads sensitive values from environment variables.
+
+Secrets are loaded from:
+1. Environment variables (injected by docker-compose env_file in production)
+2. secrets.env file at project root (for local development)
+"""
+
+from pathlib import Path
+from typing import Optional
+
+from pydantic import SecretStr, model_validator
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+# secrets.env is at project root (not in data/)
+SECRETS_FILE = Path("secrets.env")
+
+
+class Secrets(BaseSettings):
+    """Application Secrets loaded from environment variables.
+
+    In production, these are injected via docker-compose:
+        env_file:
+          - ./secrets.env
+
+    For local development, secrets are loaded from secrets.env at project root.
+    """
+
+    # Testing mode - when True, uses Tenderly test RPCs; when False, uses production RPCs
+    testing: bool = False
+
+    # RPC endpoints
+    # When testing=True, these get overwritten with *_test_rpc values
+    gnosis_rpc: Optional[SecretStr] = None
+    base_rpc: Optional[SecretStr] = None
+    ethereum_rpc: Optional[SecretStr] = None
+
+    # Test RPCs (Tenderly)
+    gnosis_test_rpc: Optional[SecretStr] = None
+    ethereum_test_rpc: Optional[SecretStr] = None
+    base_test_rpc: Optional[SecretStr] = None
+
+    coingecko_api_key: Optional[SecretStr] = None
+    wallet_password: Optional[SecretStr] = None
+
+    webui_password: Optional[SecretStr] = None
+
+    # Load from environment AND secrets.env file (for local dev)
+    model_config = SettingsConfigDict(
+        env_file=str(SECRETS_FILE) if SECRETS_FILE.exists() else None,
+        env_file_encoding="utf-8",
+        extra="ignore",
+    )
+
+    @model_validator(mode="after")
+    def load_tenderly_profile_credentials(self) -> "Secrets":
+        """Load Tenderly credentials based on the selected profile."""
+        # Note: Logic moved to dynamic loading in tools/reset_tenderly.py
+        # using Config().core.tenderly_profile
+
+        # When in testing mode, override RPCs with test RPCs (Tenderly)
+        if self.testing:
+            if self.gnosis_test_rpc:
+                self.gnosis_rpc = self.gnosis_test_rpc
+            if self.ethereum_test_rpc:
+                self.ethereum_rpc = self.ethereum_test_rpc
+            if self.base_test_rpc:
+                self.base_rpc = self.base_test_rpc
+
+        # Convert empty webui_password to None (no auth required)
+        if self.webui_password and not self.webui_password.get_secret_value():
+            self.webui_password = None
+
+        return self
+
+
+# Global secrets instance
+secrets = Secrets()

iwa/core/services/safe.py

@@ -11,7 +11,7 @@ from safe_eth.safe.safe_tx import SafeTx
 from iwa.core.constants import ZERO_ADDRESS
 from iwa.core.db import log_transaction
 from iwa.core.models import StoredSafeAccount
-from iwa.core.settings import settings
+from iwa.core.secrets import secrets
 from iwa.core.utils import (
     get_safe_master_copy_address,
     get_safe_proxy_factory_address,
@@ -99,7 +99,7 @@ class SafeService:
         return owner_addresses
 
     def _get_ethereum_client(self, chain_name: str) -> EthereumClient:
-        rpc_secret = getattr(settings, f"{chain_name}_rpc")
+        rpc_secret = getattr(secrets, f"{chain_name}_rpc")
         return EthereumClient(rpc_secret.get_secret_value())
 
     def _deploy_safe_contract(
@@ -248,7 +248,7 @@ class SafeService:
                 continue
 
             for chain in account.chains:
-                rpc_secret = getattr(settings, f"{chain}_rpc")
+                rpc_secret = getattr(secrets, f"{chain}_rpc")
                 ethereum_client = EthereumClient(rpc_secret.get_secret_value())
 
                 code = ethereum_client.w3.eth.get_code(account.address)

iwa/core/utils.py

@@ -43,10 +43,15 @@ def configure_logger():
     if hasattr(configure_logger, "configured"):
         return logger
 
+    from iwa.core.constants import DATA_DIR
+
     logger.remove()
 
+    # Ensure data directory exists
+    DATA_DIR.mkdir(parents=True, exist_ok=True)
+
     logger.add(
-        "iwa.log",
+        DATA_DIR / "iwa.log",
         rotation="10 MB",
         level="INFO",
         format="{time:YYYY-MM-DD HH:mm:ss.SSS} | {level: <8} | {name}:{function}:{line} - {message}",

iwa/core/wallet.py

@@ -29,6 +29,10 @@ class Wallet:
     def __init__(self):
         """Initialize wallet."""
         self.key_storage = KeyStorage()
+
+        # Display mnemonic if a new master account was just created
+        self.key_storage.display_pending_mnemonic()
+
         self.account_service = AccountService(self.key_storage)
         self.balance_service = BalanceService(self.key_storage, self.account_service)
         self.safe_service = SafeService(self.key_storage, self.account_service)

iwa/plugins/gnosis/safe.py

@@ -8,7 +8,7 @@ from safe_eth.safe import Safe, SafeOperationEnum
 from safe_eth.safe.safe_tx import SafeTx
 
 from iwa.core.models import StoredSafeAccount
-from iwa.core.settings import settings
+from iwa.core.secrets import secrets
 from iwa.core.utils import configure_logger
 
 logger = configure_logger()
@@ -28,7 +28,7 @@ class SafeMultisig:
         if chain_name.lower() not in normalized_chains:
             raise ValueError(f"Safe account is not deployed on chain: {chain_name}")
 
-        rpc_secret = getattr(settings, f"{chain_name.lower()}_rpc")
+        rpc_secret = getattr(secrets, f"{chain_name.lower()}_rpc")
         ethereum_client = EthereumClient(rpc_secret.get_secret_value())
         self.multisig = Safe(safe_account.address, ethereum_client)
         self.ethereum_client = ethereum_client

iwa/plugins/gnosis/tests/test_safe.py

@@ -11,7 +11,7 @@ from iwa.plugins.gnosis.safe import SafeMultisig
 @pytest.fixture
 def mock_settings():
     """Mock settings."""
-    with patch("iwa.plugins.gnosis.safe.settings") as mock:
+    with patch("iwa.plugins.gnosis.safe.secrets") as mock:
         mock.gnosis_rpc.get_secret_value.return_value = "http://rpc"
         yield mock
 

iwa/plugins/olas/constants.py

@@ -100,6 +100,14 @@ OLAS_TRADER_STAKING_CONTRACTS: Dict[str, Dict[str, EthereumAddress]] = {
         "Expert 16 (10k OLAS)": EthereumAddress("0x6c65430515c70a3f5E62107CC301685B7D46f991"),
         "Expert 17 (10k OLAS)": EthereumAddress("0x1430107A785C3A36a0C1FC0ee09B9631e2E72aFf"),
         "Expert 18 (10k OLAS)": EthereumAddress("0x041e679d04Fc0D4f75Eb937Dea729Df09a58e454"),
+        "Expert 3 MM (1k OLAS)": EthereumAddress("0x75eeca6207be98cac3fde8a20ecd7b01e50b3472"),
+        "Expert 4 MM (2k OLAS)": EthereumAddress("0x9c7f6103e3a72e4d1805b9c683ea5b370ec1a99f"),
+        "Expert 5 MM (10k OLAS)": EthereumAddress("0xcdC603e0Ee55Aae92519f9770f214b2Be4967f7d"),
+        "Expert 6 MM (10k OLAS)": EthereumAddress("0x22d6cd3d587d8391c3aae83a783f26c67ab54a85"),
+        "Expert 7 MM (10k OLAS)": EthereumAddress("0xaaecdf4d0cbd6ca0622892ac6044472f3912a5f3"),
+        "Expert 8 MM (10k OLAS)": EthereumAddress("0x168aed532a0cd8868c22fc77937af78b363652b1"),
+        "Expert 9 MM (10k OLAS)": EthereumAddress("0xdda9cd214f12e7c2d58e871404a0a3b1177065c8"),
+        "Expert 10 MM (10k OLAS)": EthereumAddress("0x53a38655b4e659ef4c7f88a26fbf5c67932c7156"),
     },
     "ethereum": {},
     "base": {},

iwa/plugins/olas/contracts/abis/activity_checker.json

@@ -0,0 +1,110 @@
+[
+   {
+      "inputs":[
+         {
+            "internalType":"address",
+            "name":"_mechMarketplace",
+            "type":"address"
+         },
+         {
+            "internalType":"uint256",
+            "name":"_livenessRatio",
+            "type":"uint256"
+         }
+      ],
+      "stateMutability":"nonpayable",
+      "type":"constructor"
+   },
+   {
+      "inputs":[
+         
+      ],
+      "name":"ZeroAddress",
+      "type":"error"
+   },
+   {
+      "inputs":[
+         
+      ],
+      "name":"ZeroValue",
+      "type":"error"
+   },
+   {
+      "inputs":[
+         {
+            "internalType":"address",
+            "name":"multisig",
+            "type":"address"
+         }
+      ],
+      "name":"getMultisigNonces",
+      "outputs":[
+         {
+            "internalType":"uint256[]",
+            "name":"nonces",
+            "type":"uint256[]"
+         }
+      ],
+      "stateMutability":"view",
+      "type":"function"
+   },
+   {
+      "inputs":[
+         {
+            "internalType":"uint256[]",
+            "name":"curNonces",
+            "type":"uint256[]"
+         },
+         {
+            "internalType":"uint256[]",
+            "name":"lastNonces",
+            "type":"uint256[]"
+         },
+         {
+            "internalType":"uint256",
+            "name":"ts",
+            "type":"uint256"
+         }
+      ],
+      "name":"isRatioPass",
+      "outputs":[
+         {
+            "internalType":"bool",
+            "name":"ratioPass",
+            "type":"bool"
+         }
+      ],
+      "stateMutability":"view",
+      "type":"function"
+   },
+   {
+      "inputs":[
+         
+      ],
+      "name":"livenessRatio",
+      "outputs":[
+         {
+            "internalType":"uint256",
+            "name":"",
+            "type":"uint256"
+         }
+      ],
+      "stateMutability":"view",
+      "type":"function"
+   },
+   {
+      "inputs":[
+         
+      ],
+      "name":"mechMarketplace",
+      "outputs":[
+         {
+            "internalType":"address",
+            "name":"",
+            "type":"address"
+         }
+      ],
+      "stateMutability":"view",
+      "type":"function"
+   }
+]