genlayer-test 2.1.0__tar.gz → 2.2.0__tar.gz

{genlayer_test-2.1.0 → genlayer_test-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: genlayer-test
-Version: 2.1.0
+Version: 2.2.0
 Summary: GenLayer Testing Suite
 Author: GenLayer
 License-Expression: MIT
@@ -112,17 +112,29 @@ The GenLayer Testing Suite can be configured using an optional but recommended `
 networks:
   default: localnet  # Default network to use
 
-  localnet:  # Local development network configuration
+  localnet:  # Local development network configuration (pre-configured)
     url: "http://127.0.0.1:4000/api"
     leader_only: false  # Set to true to run all contracts in leader-only mode by default
 
-  testnet_asimov:  # Test network configuration
-    id: 4221
-    url: "http://34.32.169.58:9151"
+  studionet:  # Studio network configuration (pre-configured)
+    # Pre-configured network - accounts are automatically generated
+    # You can override any settings if needed
+
+  testnet_asimov:  # Test network configuration (pre-configured)
+    # Pre-configured network - requires accounts to be specified
     accounts:
       - "${ACCOUNT_PRIVATE_KEY_1}"
       - "${ACCOUNT_PRIVATE_KEY_2}"
       - "${ACCOUNT_PRIVATE_KEY_3}"
+    from: "${ACCOUNT_PRIVATE_KEY_2}"  # Optional: specify default account
+
+  custom_network:  # Custom network configuration
+    id: 1234
+    url: "http://custom.network:8545"
+    accounts:
+      - "${CUSTOM_ACCOUNT_1}"
+      - "${CUSTOM_ACCOUNT_2}"
+    from: "${CUSTOM_ACCOUNT_1}"  # Optional: specify default account
 
 paths:
   contracts: "contracts"  # Path to your contracts directory
@@ -135,14 +147,31 @@ Key configuration sections:
 
 1. **Networks**: Define different network environments
    - `default`: Specifies which network to use by default
+   - **Pre-configured Networks**:
+     - `localnet`: Local development network with auto-generated test accounts
+     - `studionet`: GenLayer Studio network with auto-generated test accounts
+     - `testnet_asimov`: Public testnet (requires account configuration)
    - Network configurations can include:
-     - `url`: The RPC endpoint for the network
-     - `id`: Chain ID
+     - `url`: The RPC endpoint for the network (optional for pre-configured networks)
+     - `id`: Chain ID (optional for pre-configured networks)
      - `accounts`: List of account private keys (using environment variables)
+     - `from`: Specify which account to use as the default for transactions (optional, defaults to first account)
      - `leader_only`: Leader only mode
-   - Special case for `localnet`:
-     - If a network is named `localnet`, missing fields will be filled with default values
-     - For all other network names, `id`, `url`, and `accounts` are required fields
+   - For custom networks (non-pre-configured), `id`, `url`, and `accounts` are required fields
+
+**Note on Environment Variables**: When using environment variables in your configuration (e.g., `${ACCOUNT_PRIVATE_KEY_1}`), ensure they are properly set in your `environment` file. If an environment variable is not found, the system will raise a clear error message indicating which variable is missing.
+
+**Default Account Selection**: The `from` field allows you to specify which account from the `accounts` list should be used as the default for deployments and transactions. If not specified, the first account in the list is used by default. This is useful when you want a specific account to be the primary account for your tests without having to specify it in every transaction.
+
+Example:
+```yaml
+testnet_asimov:
+  accounts:
+    - "${DEPLOYER_KEY}"      # accounts[0]
+    - "${USER_KEY}"          # accounts[1] 
+    - "${ADMIN_KEY}"         # accounts[2]
+  from: "${ADMIN_KEY}"       # Use ADMIN_KEY as default instead of DEPLOYER_KEY
+```
 
 2. **Paths**: Define important directory paths
    - `contracts`: Location of your contract files
@@ -191,11 +220,23 @@ $ gltest --contracts-dir <path_to_contracts>
 # Run tests on localnet (default)
 $ gltest --network localnet
 
-# Run tests on testnet
+# Run tests on studionet
+$ gltest --network studionet
+
+# Run tests on testnet (requires account configuration)
 $ gltest --network testnet_asimov
+
+# Run tests on a custom network
+$ gltest --network custom_network
 ```
 The `--network` flag allows you to specify which network configuration to use from your `gltest.config.yaml`. If not specified, it will use the `default` network defined in your config file.
 
+**Pre-configured Networks**:
+- `localnet` and `studionet`: Work out of the box with auto-generated test accounts
+- `testnet_asimov`: Requires account configuration in `gltest.config.yaml`
+
+When using `testnet_asimov` without proper account configuration, you'll receive a clear error message directing you to configure accounts in your config file.
+
 7. Run tests with a custom RPC url
 ```bash
 $ gltest --rpc-url <custom_rpc_url>

{genlayer_test-2.1.0 → genlayer_test-2.2.0}/README.md

@@ -89,17 +89,29 @@ The GenLayer Testing Suite can be configured using an optional but recommended `
 networks:
   default: localnet  # Default network to use
 
-  localnet:  # Local development network configuration
+  localnet:  # Local development network configuration (pre-configured)
     url: "http://127.0.0.1:4000/api"
     leader_only: false  # Set to true to run all contracts in leader-only mode by default
 
-  testnet_asimov:  # Test network configuration
-    id: 4221
-    url: "http://34.32.169.58:9151"
+  studionet:  # Studio network configuration (pre-configured)
+    # Pre-configured network - accounts are automatically generated
+    # You can override any settings if needed
+
+  testnet_asimov:  # Test network configuration (pre-configured)
+    # Pre-configured network - requires accounts to be specified
     accounts:
       - "${ACCOUNT_PRIVATE_KEY_1}"
       - "${ACCOUNT_PRIVATE_KEY_2}"
       - "${ACCOUNT_PRIVATE_KEY_3}"
+    from: "${ACCOUNT_PRIVATE_KEY_2}"  # Optional: specify default account
+
+  custom_network:  # Custom network configuration
+    id: 1234
+    url: "http://custom.network:8545"
+    accounts:
+      - "${CUSTOM_ACCOUNT_1}"
+      - "${CUSTOM_ACCOUNT_2}"
+    from: "${CUSTOM_ACCOUNT_1}"  # Optional: specify default account
 
 paths:
   contracts: "contracts"  # Path to your contracts directory
@@ -112,14 +124,31 @@ Key configuration sections:
 
 1. **Networks**: Define different network environments
    - `default`: Specifies which network to use by default
+   - **Pre-configured Networks**:
+     - `localnet`: Local development network with auto-generated test accounts
+     - `studionet`: GenLayer Studio network with auto-generated test accounts
+     - `testnet_asimov`: Public testnet (requires account configuration)
    - Network configurations can include:
-     - `url`: The RPC endpoint for the network
-     - `id`: Chain ID
+     - `url`: The RPC endpoint for the network (optional for pre-configured networks)
+     - `id`: Chain ID (optional for pre-configured networks)
      - `accounts`: List of account private keys (using environment variables)
+     - `from`: Specify which account to use as the default for transactions (optional, defaults to first account)
      - `leader_only`: Leader only mode
-   - Special case for `localnet`:
-     - If a network is named `localnet`, missing fields will be filled with default values
-     - For all other network names, `id`, `url`, and `accounts` are required fields
+   - For custom networks (non-pre-configured), `id`, `url`, and `accounts` are required fields
+
+**Note on Environment Variables**: When using environment variables in your configuration (e.g., `${ACCOUNT_PRIVATE_KEY_1}`), ensure they are properly set in your `environment` file. If an environment variable is not found, the system will raise a clear error message indicating which variable is missing.
+
+**Default Account Selection**: The `from` field allows you to specify which account from the `accounts` list should be used as the default for deployments and transactions. If not specified, the first account in the list is used by default. This is useful when you want a specific account to be the primary account for your tests without having to specify it in every transaction.
+
+Example:
+```yaml
+testnet_asimov:
+  accounts:
+    - "${DEPLOYER_KEY}"      # accounts[0]
+    - "${USER_KEY}"          # accounts[1] 
+    - "${ADMIN_KEY}"         # accounts[2]
+  from: "${ADMIN_KEY}"       # Use ADMIN_KEY as default instead of DEPLOYER_KEY
+```
 
 2. **Paths**: Define important directory paths
    - `contracts`: Location of your contract files
@@ -168,11 +197,23 @@ $ gltest --contracts-dir <path_to_contracts>
 # Run tests on localnet (default)
 $ gltest --network localnet
 
-# Run tests on testnet
+# Run tests on studionet
+$ gltest --network studionet
+
+# Run tests on testnet (requires account configuration)
 $ gltest --network testnet_asimov
+
+# Run tests on a custom network
+$ gltest --network custom_network
 ```
 The `--network` flag allows you to specify which network configuration to use from your `gltest.config.yaml`. If not specified, it will use the `default` network defined in your config file.
 
+**Pre-configured Networks**:
+- `localnet` and `studionet`: Work out of the box with auto-generated test accounts
+- `testnet_asimov`: Requires account configuration in `gltest.config.yaml`
+
+When using `testnet_asimov` without proper account configuration, you'll receive a clear error message directing you to configure accounts in your config file.
+
 7. Run tests with a custom RPC url
 ```bash
 $ gltest --rpc-url <custom_rpc_url>

{genlayer_test-2.1.0 → genlayer_test-2.2.0}/genlayer_test.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: genlayer-test
-Version: 2.1.0
+Version: 2.2.0
 Summary: GenLayer Testing Suite
 Author: GenLayer
 License-Expression: MIT
@@ -112,17 +112,29 @@ The GenLayer Testing Suite can be configured using an optional but recommended `
 networks:
   default: localnet  # Default network to use
 
-  localnet:  # Local development network configuration
+  localnet:  # Local development network configuration (pre-configured)
     url: "http://127.0.0.1:4000/api"
     leader_only: false  # Set to true to run all contracts in leader-only mode by default
 
-  testnet_asimov:  # Test network configuration
-    id: 4221
-    url: "http://34.32.169.58:9151"
+  studionet:  # Studio network configuration (pre-configured)
+    # Pre-configured network - accounts are automatically generated
+    # You can override any settings if needed
+
+  testnet_asimov:  # Test network configuration (pre-configured)
+    # Pre-configured network - requires accounts to be specified
     accounts:
       - "${ACCOUNT_PRIVATE_KEY_1}"
       - "${ACCOUNT_PRIVATE_KEY_2}"
       - "${ACCOUNT_PRIVATE_KEY_3}"
+    from: "${ACCOUNT_PRIVATE_KEY_2}"  # Optional: specify default account
+
+  custom_network:  # Custom network configuration
+    id: 1234
+    url: "http://custom.network:8545"
+    accounts:
+      - "${CUSTOM_ACCOUNT_1}"
+      - "${CUSTOM_ACCOUNT_2}"
+    from: "${CUSTOM_ACCOUNT_1}"  # Optional: specify default account
 
 paths:
   contracts: "contracts"  # Path to your contracts directory
@@ -135,14 +147,31 @@ Key configuration sections:
 
 1. **Networks**: Define different network environments
    - `default`: Specifies which network to use by default
+   - **Pre-configured Networks**:
+     - `localnet`: Local development network with auto-generated test accounts
+     - `studionet`: GenLayer Studio network with auto-generated test accounts
+     - `testnet_asimov`: Public testnet (requires account configuration)
    - Network configurations can include:
-     - `url`: The RPC endpoint for the network
-     - `id`: Chain ID
+     - `url`: The RPC endpoint for the network (optional for pre-configured networks)
+     - `id`: Chain ID (optional for pre-configured networks)
      - `accounts`: List of account private keys (using environment variables)
+     - `from`: Specify which account to use as the default for transactions (optional, defaults to first account)
      - `leader_only`: Leader only mode
-   - Special case for `localnet`:
-     - If a network is named `localnet`, missing fields will be filled with default values
-     - For all other network names, `id`, `url`, and `accounts` are required fields
+   - For custom networks (non-pre-configured), `id`, `url`, and `accounts` are required fields
+
+**Note on Environment Variables**: When using environment variables in your configuration (e.g., `${ACCOUNT_PRIVATE_KEY_1}`), ensure they are properly set in your `environment` file. If an environment variable is not found, the system will raise a clear error message indicating which variable is missing.
+
+**Default Account Selection**: The `from` field allows you to specify which account from the `accounts` list should be used as the default for deployments and transactions. If not specified, the first account in the list is used by default. This is useful when you want a specific account to be the primary account for your tests without having to specify it in every transaction.
+
+Example:
+```yaml
+testnet_asimov:
+  accounts:
+    - "${DEPLOYER_KEY}"      # accounts[0]
+    - "${USER_KEY}"          # accounts[1] 
+    - "${ADMIN_KEY}"         # accounts[2]
+  from: "${ADMIN_KEY}"       # Use ADMIN_KEY as default instead of DEPLOYER_KEY
+```
 
 2. **Paths**: Define important directory paths
    - `contracts`: Location of your contract files
@@ -191,11 +220,23 @@ $ gltest --contracts-dir <path_to_contracts>
 # Run tests on localnet (default)
 $ gltest --network localnet
 
-# Run tests on testnet
+# Run tests on studionet
+$ gltest --network studionet
+
+# Run tests on testnet (requires account configuration)
 $ gltest --network testnet_asimov
+
+# Run tests on a custom network
+$ gltest --network custom_network
 ```
 The `--network` flag allows you to specify which network configuration to use from your `gltest.config.yaml`. If not specified, it will use the `default` network defined in your config file.
 
+**Pre-configured Networks**:
+- `localnet` and `studionet`: Work out of the box with auto-generated test accounts
+- `testnet_asimov`: Requires account configuration in `gltest.config.yaml`
+
+When using `testnet_asimov` without proper account configuration, you'll receive a clear error message directing you to configure accounts in your config file.
+
 7. Run tests with a custom RPC url
 ```bash
 $ gltest --rpc-url <custom_rpc_url>

{genlayer_test-2.1.0 → genlayer_test-2.2.0}/gltest_cli/config/constants.py

@@ -4,6 +4,7 @@ from pathlib import Path
 
 GLTEST_CONFIG_FILE = "gltest.config.yaml"
 DEFAULT_NETWORK = "localnet"
+PRECONFIGURED_NETWORKS = ["localnet", "studionet", "testnet_asimov"]
 DEFAULT_RPC_URL = SIMULATOR_JSON_RPC_URL
 DEFAULT_ENVIRONMENT = ".env"
 DEFAULT_CONTRACTS_DIR = Path("contracts")

genlayer_test-2.2.0/gltest_cli/config/plugin.py

@@ -0,0 +1,187 @@
+import pytest
+from pathlib import Path
+import shutil
+from gltest_cli.logging import logger
+from gltest_cli.config.user import (
+    user_config_exists,
+    load_user_config,
+    get_default_user_config,
+)
+from gltest_cli.config.general import (
+    get_general_config,
+)
+from gltest_cli.config.types import PluginConfig
+from gltest_cli.config.pytest_context import _pytest_context
+
+
+def pytest_addoption(parser):
+    group = parser.getgroup("gltest")
+    group.addoption(
+        "--contracts-dir",
+        action="store",
+        default=None,
+        help="Path to directory containing contract files",
+    )
+
+    group.addoption(
+        "--artifacts-dir",
+        action="store",
+        default=None,
+        help="Path to directory for storing contract artifacts",
+    )
+
+    group.addoption(
+        "--default-wait-interval",
+        action="store",
+        default=3000,
+        help="Default interval (ms) between transaction receipt checks",
+    )
+
+    group.addoption(
+        "--default-wait-retries",
+        action="store",
+        default=50,
+        help="Default number of retries for transaction receipt checks",
+    )
+
+    group.addoption(
+        "--rpc-url",
+        action="store",
+        default=None,
+        help="RPC endpoint URL for the GenLayer network",
+    )
+
+    group.addoption(
+        "--network",
+        action="store",
+        default=None,
+        help="Target network (defaults to 'localnet' if no config file)",
+    )
+
+    group.addoption(
+        "--test-with-mocks",
+        action="store_true",
+        default=False,
+        help="Test with mocks",
+    )
+
+    group.addoption(
+        "--leader-only",
+        action="store_true",
+        default=False,
+        help="Run contracts in leader-only mode",
+    )
+
+
+def pytest_configure(config):
+    try:
+        general_config = get_general_config()
+
+        network_name = config.getoption("--network")
+
+        if not user_config_exists():
+            logger.warning(
+                "File `gltest.config.yaml` not found in the current directory, using default config, create a `gltest.config.yaml` file to manage multiple networks"
+            )
+            user_config = get_default_user_config()
+
+            # Special handling for testnet_asimov - check if accounts are configured
+            if network_name == "testnet_asimov":
+                logger.error(
+                    "For testnet_asimov, you need to configure accounts in gltest.config.yaml, see https://docs.genlayer.com/api-references/genlayer-test"
+                )
+                pytest.exit("gltest configuration error")
+        else:
+            logger.info(
+                "File `gltest.config.yaml` found in the current directory, using it"
+            )
+            user_config = load_user_config("gltest.config.yaml")
+
+        general_config.user_config = user_config
+
+        # Handle plugin config from command line
+        contracts_dir = config.getoption("--contracts-dir")
+        artifacts_dir = config.getoption("--artifacts-dir")
+        default_wait_interval = config.getoption("--default-wait-interval")
+        default_wait_retries = config.getoption("--default-wait-retries")
+        rpc_url = config.getoption("--rpc-url")
+        network = config.getoption("--network")
+        test_with_mocks = config.getoption("--test-with-mocks")
+        leader_only = config.getoption("--leader-only")
+
+        plugin_config = PluginConfig()
+        plugin_config.contracts_dir = (
+            Path(contracts_dir) if contracts_dir is not None else None
+        )
+        plugin_config.artifacts_dir = (
+            Path(artifacts_dir) if artifacts_dir is not None else None
+        )
+        plugin_config.default_wait_interval = int(default_wait_interval)
+        plugin_config.default_wait_retries = int(default_wait_retries)
+        plugin_config.rpc_url = rpc_url
+        plugin_config.network_name = network
+        plugin_config.test_with_mocks = test_with_mocks
+        plugin_config.leader_only = leader_only
+
+        general_config.plugin_config = plugin_config
+    except Exception as e:
+        logger.error(f"Gltest configure error: {e}")
+        pytest.exit("gltest configuration error")
+
+
+def pytest_sessionstart(session):
+    try:
+        general_config = get_general_config()
+        artifacts_dir = general_config.get_artifacts_dir()
+        if artifacts_dir and artifacts_dir.exists():
+            logger.info(f"Clearing artifacts directory: {artifacts_dir}")
+            try:
+                shutil.rmtree(artifacts_dir)
+                artifacts_dir.mkdir(parents=True, exist_ok=True)
+            except Exception as e:
+                logger.warning(f"Failed to clear artifacts directory: {e}")
+        elif artifacts_dir:
+            artifacts_dir.mkdir(parents=True, exist_ok=True)
+        logger.info("Using the following configuration:")
+        logger.info(f"  RPC URL: {general_config.get_rpc_url()}")
+        logger.info(f"  Selected Network: {general_config.get_network_name()}")
+        # Show available networks including preconfigured ones
+        all_networks = general_config.get_networks_keys()
+        logger.info(f"  Available networks: {all_networks}")
+        logger.info(f"  Contracts directory: {general_config.get_contracts_dir()}")
+        logger.info(f"  Artifacts directory: {general_config.get_artifacts_dir()}")
+        logger.info(f"  Environment: {general_config.user_config.environment}")
+        logger.info(
+            f"  Default wait interval: {general_config.get_default_wait_interval()} ms"
+        )
+        logger.info(
+            f"  Default wait retries: {general_config.get_default_wait_retries()}"
+        )
+        logger.info(f"  Test with mocks: {general_config.get_test_with_mocks()}")
+
+        if (
+            general_config.get_leader_only()
+            and not general_config.check_studio_based_rpc()
+        ):
+            logger.warning(
+                "Leader only mode: True (enabled on non-studio network - will have no effect)"
+            )
+        else:
+            logger.info(f"  Leader only mode: {general_config.get_leader_only()}")
+    except Exception as e:
+        logger.error(f"Gltest session start error: {e}")
+        pytest.exit("gltest session start error")
+
+
+def pytest_runtest_setup(item):
+    _pytest_context.current_item = item
+
+
+def pytest_runtest_teardown(item):
+    try:
+        del _pytest_context.current_item
+    except AttributeError:
+        pass
+
+
+pytest_plugins = ["gltest.fixtures"]

{genlayer_test-2.1.0 → genlayer_test-2.2.0}/gltest_cli/config/types.py

@@ -2,14 +2,10 @@ from enum import Enum
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Dict, List, Optional
-from genlayer_py.chains import localnet, testnet_asimov
+from genlayer_py.chains import localnet, studionet, testnet_asimov
 from genlayer_py.types import GenLayerChain
 from urllib.parse import urlparse
-
-
-class NetworkConfig(str, Enum):
-    LOCALNET = "localnet"
-    TESTNET_ASIMOV = "testnet_asimov"
+from gltest_cli.config.constants import PRECONFIGURED_NETWORKS
 
 
 @dataclass
@@ -111,10 +107,17 @@ class GeneralConfig:
         artifacts_dir = self.get_artifacts_dir()
         return artifacts_dir / "analysis"
 
+    def get_networks_keys(self) -> List[str]:
+        return list(self.user_config.networks.keys())
+
     def get_rpc_url(self) -> str:
         if self.plugin_config.rpc_url is not None:
             return self.plugin_config.rpc_url
         network_name = self.get_network_name()
+        if network_name not in self.user_config.networks:
+            raise ValueError(
+                f"Unknown network: {network_name}, possible values: {self.get_networks_keys()}"
+            )
         return self.user_config.networks[network_name].url
 
     def get_default_account_key(self, network_name: Optional[str] = None) -> str:
@@ -128,16 +131,37 @@ class GeneralConfig:
         return self.user_config.networks[self.user_config.default_network].accounts
 
     def get_chain(self) -> GenLayerChain:
+        network_name = self.get_network_name()
+        if network_name not in self.user_config.networks:
+            raise ValueError(
+                f"Unknown network: {network_name}, possible values: {self.get_networks_keys()}"
+            )
+
+        # Reserved network names
+        chain_map_by_name = {
+            "localnet": localnet,
+            "studionet": studionet,
+            "testnet_asimov": testnet_asimov,
+        }
+
+        if network_name in chain_map_by_name:
+            return chain_map_by_name[network_name]
+
+        if network_name in PRECONFIGURED_NETWORKS:
+            raise ValueError(
+                f"Network {network_name} should be handled by reserved mapping"
+            )
+
+        # Custom networks
         chain_map_by_id = {
             61999: localnet,
             4221: testnet_asimov,
         }
-        network_name = self.get_network_name()
         network_id = self.user_config.networks[network_name].id
         if network_id not in chain_map_by_id:
             known = ", ".join(map(str, chain_map_by_id.keys()))
             raise ValueError(
-                f"Unknown network: {network_name}, possible values: {known}"
+                f"Unknown network id: {network_id}, possible values: {known}"
             )
         return chain_map_by_id[network_id]
 

{genlayer_test-2.1.0 → genlayer_test-2.2.0}/gltest_cli/config/user.py

@@ -8,12 +8,12 @@ from gltest.accounts import create_accounts
 from gltest_cli.config.constants import (
     GLTEST_CONFIG_FILE,
     DEFAULT_NETWORK,
-    DEFAULT_RPC_URL,
     DEFAULT_ENVIRONMENT,
     DEFAULT_CONTRACTS_DIR,
     DEFAULT_ARTIFACTS_DIR,
-    DEFAULT_NETWORK_ID,
+    PRECONFIGURED_NETWORKS,
 )
+from genlayer_py.chains import localnet, studionet, testnet_asimov
 from gltest_cli.config.types import UserConfig, NetworkConfigData, PathConfig
 
 VALID_ROOT_KEYS = ["networks", "paths", "environment"]
@@ -26,16 +26,32 @@ def get_default_user_config() -> UserConfig:
     accounts = create_accounts(n_accounts=10)
     accounts_private_keys = [account.key.hex() for account in accounts]
 
+    networks = {
+        "localnet": NetworkConfigData(
+            id=localnet.id,
+            url=localnet.rpc_urls["default"]["http"][0],
+            accounts=accounts_private_keys,
+            from_account=accounts_private_keys[0],
+            leader_only=False,
+        ),
+        "studionet": NetworkConfigData(
+            id=studionet.id,
+            url=studionet.rpc_urls["default"]["http"][0],
+            accounts=accounts_private_keys,
+            from_account=accounts_private_keys[0],
+            leader_only=False,
+        ),
+        "testnet_asimov": NetworkConfigData(
+            id=testnet_asimov.id,
+            url=testnet_asimov.rpc_urls["default"]["http"][0],
+            accounts=None,
+            from_account=None,
+            leader_only=False,
+        ),
+    }
+
     return UserConfig(
-        networks={
-            DEFAULT_NETWORK: NetworkConfigData(
-                id=DEFAULT_NETWORK_ID,
-                url=DEFAULT_RPC_URL,
-                accounts=accounts_private_keys,
-                from_account=accounts_private_keys[0],
-                leader_only=False,
-            ),
-        },
+        networks=networks,
         paths=PathConfig(
             contracts=DEFAULT_CONTRACTS_DIR, artifacts=DEFAULT_ARTIFACTS_DIR
         ),
@@ -46,11 +62,26 @@ def get_default_user_config() -> UserConfig:
 
 def resolve_env_vars(obj):
     if isinstance(obj, str):
-        return re.sub(
-            r"\${(\w+)}",
-            lambda m: os.getenv(m.group(1), f"<UNSET:{m.group(1)}>"),
-            obj,
-        )
+
+        def replace_env_var(m):
+            try:
+                var_name = m.group(1)
+                if var_name is None:
+                    raise ValueError(
+                        f"Invalid environment variable pattern: {m.group(0)}"
+                    )
+                var_value = os.getenv(var_name)
+                if var_value is None:
+                    raise ValueError(
+                        f"Environment variable {var_name} is not set, please check your environment file"
+                    )
+                return var_value
+            except IndexError as e:
+                raise ValueError(
+                    f"Invalid environment variable pattern: {m.group(0)}"
+                ) from e
+
+        return re.sub(r"\${(\w+)}", replace_env_var, obj)
     elif isinstance(obj, dict):
         return {k: resolve_env_vars(v) for k, v in obj.items()}
     elif isinstance(obj, list):
@@ -90,8 +121,8 @@ def validate_network_config(network_name: str, network_config: dict):
     ):
         raise ValueError(f"network {network_name} leader_only must be a boolean")
 
-    # For non-default networks, url and accounts are required
-    if network_name != DEFAULT_NETWORK:
+    # For non-preconfigured networks, url and accounts are required
+    if network_name not in PRECONFIGURED_NETWORKS:
         if "id" not in network_config:
             raise ValueError(f"network {network_name} must have an id")
         if "url" not in network_config:
@@ -139,7 +170,6 @@ def validate_raw_user_config(config: dict):
 def load_user_config(path: str) -> UserConfig:
     with open(path, "r") as f:
         raw_config = yaml.safe_load(f) or {}
-
     validate_raw_user_config(raw_config)
     load_dotenv(
         dotenv_path=raw_config.get("environment", DEFAULT_ENVIRONMENT), override=True
@@ -176,8 +206,8 @@ def _get_overridden_networks(raw_config: dict) -> tuple[dict, str]:
 
     networks_config = {}
     for network_name, network_config in networks.items():
-        if network_name == DEFAULT_NETWORK:
-            networks_config[network_name] = default_config.networks[DEFAULT_NETWORK]
+        if network_name in PRECONFIGURED_NETWORKS:
+            networks_config[network_name] = default_config.networks[network_name]
             if network_config is None:
                 continue
 

{genlayer_test-2.1.0 → genlayer_test-2.2.0}/gltest_cli/logging.py

@@ -31,13 +31,14 @@ class ColoredFormatter(logging.Formatter):
 
 def setup_logger():
     logger = logging.getLogger("gltest_cli")
-    logger.setLevel(logging.DEBUG)
+    log_level = logging.INFO
+    logger.setLevel(log_level)
 
     if logger.handlers:
         return logger
 
     console_handler = logging.StreamHandler()
-    console_handler.setLevel(logging.DEBUG)
+    console_handler.setLevel(log_level)
 
     formatter = ColoredFormatter("%(levelname)s: %(message)s")
     console_handler.setFormatter(formatter)

{genlayer_test-2.1.0 → genlayer_test-2.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "genlayer-test"
-version = "2.1.0"
+version = "2.2.0"
 description = "GenLayer Testing Suite"
 authors = [
     { name = "GenLayer" }

{genlayer_test-2.1.0 → genlayer_test-2.2.0}/tests/gltest_cli/config/test_plugin.py

@@ -123,12 +123,8 @@ def test_network_testnet(pytester):
         "--network=testnet_asimov", "--rpc-url=http://test.example.com:9151", "-v"
     )
 
-    result.stdout.fnmatch_lines(
-        [
-            "*::test_network PASSED*",
-        ]
-    )
-    assert result.ret == 0
+    # The test should exit with an error code when testnet_asimov is used without accounts
+    assert result.ret != 0
 
 
 def test_artifacts_dir(pytester):

genlayer_test-2.1.0/gltest_cli/config/plugin.py

@@ -1,168 +0,0 @@
-from pathlib import Path
-import shutil
-from gltest_cli.logging import logger
-from gltest_cli.config.user import (
-    user_config_exists,
-    load_user_config,
-    get_default_user_config,
-)
-from gltest_cli.config.general import (
-    get_general_config,
-)
-from gltest_cli.config.types import PluginConfig
-from gltest_cli.config.pytest_context import _pytest_context
-
-
-def pytest_addoption(parser):
-    group = parser.getgroup("gltest")
-    group.addoption(
-        "--contracts-dir",
-        action="store",
-        default=None,
-        help="Path to directory containing contract files",
-    )
-
-    group.addoption(
-        "--artifacts-dir",
-        action="store",
-        default=None,
-        help="Path to directory for storing contract artifacts",
-    )
-
-    group.addoption(
-        "--default-wait-interval",
-        action="store",
-        default=3000,
-        help="Default interval (ms) between transaction receipt checks",
-    )
-
-    group.addoption(
-        "--default-wait-retries",
-        action="store",
-        default=50,
-        help="Default number of retries for transaction receipt checks",
-    )
-
-    group.addoption(
-        "--rpc-url",
-        action="store",
-        default=None,
-        help="RPC endpoint URL for the GenLayer network",
-    )
-
-    group.addoption(
-        "--network",
-        action="store",
-        default=None,
-        help="Target network (defaults to 'localnet' if no config file)",
-    )
-
-    group.addoption(
-        "--test-with-mocks",
-        action="store_true",
-        default=False,
-        help="Test with mocks",
-    )
-
-    group.addoption(
-        "--leader-only",
-        action="store_true",
-        default=False,
-        help="Run contracts in leader-only mode",
-    )
-
-
-def pytest_configure(config):
-    general_config = get_general_config()
-
-    # Handle user config from gltest.config.yaml
-    if not user_config_exists():
-        logger.warning(
-            "File `gltest.config.yaml` not found in the current directory, using default config"
-        )
-        logger.info("Create a `gltest.config.yaml` file to manage multiple networks")
-        user_config = get_default_user_config()
-    else:
-        logger.info(
-            "File `gltest.config.yaml` found in the current directory, using it"
-        )
-        user_config = load_user_config("gltest.config.yaml")
-
-    general_config.user_config = user_config
-
-    # Handle plugin config from command line
-    contracts_dir = config.getoption("--contracts-dir")
-    artifacts_dir = config.getoption("--artifacts-dir")
-    default_wait_interval = config.getoption("--default-wait-interval")
-    default_wait_retries = config.getoption("--default-wait-retries")
-    rpc_url = config.getoption("--rpc-url")
-    network = config.getoption("--network")
-    test_with_mocks = config.getoption("--test-with-mocks")
-    leader_only = config.getoption("--leader-only")
-
-    plugin_config = PluginConfig()
-    plugin_config.contracts_dir = (
-        Path(contracts_dir) if contracts_dir is not None else None
-    )
-    plugin_config.artifacts_dir = (
-        Path(artifacts_dir) if artifacts_dir is not None else None
-    )
-    plugin_config.default_wait_interval = int(default_wait_interval)
-    plugin_config.default_wait_retries = int(default_wait_retries)
-    plugin_config.rpc_url = rpc_url
-    plugin_config.network_name = network
-    plugin_config.test_with_mocks = test_with_mocks
-    plugin_config.leader_only = leader_only
-
-    general_config.plugin_config = plugin_config
-
-
-def pytest_sessionstart(session):
-    general_config = get_general_config()
-
-    artifacts_dir = general_config.get_artifacts_dir()
-    if artifacts_dir and artifacts_dir.exists():
-        logger.info(f"Clearing artifacts directory: {artifacts_dir}")
-        try:
-            shutil.rmtree(artifacts_dir)
-            artifacts_dir.mkdir(parents=True, exist_ok=True)
-        except Exception as e:
-            logger.warning(f"Failed to clear artifacts directory: {e}")
-    elif artifacts_dir:
-        artifacts_dir.mkdir(parents=True, exist_ok=True)
-
-    logger.info("Using the following configuration:")
-    logger.info(f"  RPC URL: {general_config.get_rpc_url()}")
-    logger.info(f"  Selected Network: {general_config.get_network_name()}")
-    logger.info(
-        f"  Available networks: {list(general_config.user_config.networks.keys())}"
-    )
-    logger.info(f"  Contracts directory: {general_config.get_contracts_dir()}")
-    logger.info(f"  Artifacts directory: {general_config.get_artifacts_dir()}")
-    logger.info(f"  Environment: {general_config.user_config.environment}")
-    logger.info(
-        f"  Default wait interval: {general_config.get_default_wait_interval()} ms"
-    )
-    logger.info(f"  Default wait retries: {general_config.get_default_wait_retries()}")
-    logger.info(f"  Test with mocks: {general_config.get_test_with_mocks()}")
-
-    if general_config.get_leader_only() and not general_config.check_studio_based_rpc():
-        logger.warning(
-            "Leader only mode: True (enabled on non-studio network - will have no effect)"
-        )
-    else:
-        logger.info(f"  Leader only mode: {general_config.get_leader_only()}")
-
-
-def pytest_runtest_setup(item):
-    _pytest_context.current_item = item
-
-
-def pytest_runtest_teardown(item):
-    try:
-        del _pytest_context.current_item
-    except AttributeError:
-        pass
-
-
-pytest_plugins = ["gltest.fixtures"]