genlayer-test 0.8.0__tar.gz → 0.9.0__tar.gz

{genlayer_test-0.8.0 → genlayer_test-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: genlayer-test
-Version: 0.8.0
+Version: 0.9.0
 Summary: GenLayer Testing Suite
 Author: GenLayer
 License-Expression: MIT
@@ -140,6 +140,7 @@ networks:
   custom_network:  # Custom network configuration
     id: 1234
     url: "http://custom.network:8545"
+    chain_type: "localnet"  # Required for custom networks: localnet, studionet, or testnet_asimov
     accounts:
       - "${CUSTOM_ACCOUNT_1}"
       - "${CUSTOM_ACCOUNT_2}"
@@ -163,10 +164,11 @@ Key configuration sections:
    - Network configurations can include:
      - `url`: The RPC endpoint for the network (optional for pre-configured networks)
      - `id`: Chain ID (optional for pre-configured networks)
+     - `chain_type`: Chain type - one of: `localnet`, `studionet`, or `testnet_asimov` (required for custom 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
-   - For custom networks (non-pre-configured), `id`, `url`, and `accounts` are required fields
+   - For custom networks (non-pre-configured), `id`, `url`, `chain_type`, 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.
 
@@ -182,6 +184,13 @@ testnet_asimov:
   from: "${ADMIN_KEY}"       # Use ADMIN_KEY as default instead of DEPLOYER_KEY
 ```
 
+**Chain vs Network**: 
+- **Network**: Defines the connection details (URL, accounts, etc.) for a specific environment
+- **Chain**: Defines the genlayer chain type and its associated behaviors (localnet, studionet, or testnet_asimov)
+- Pre-configured networks automatically have the correct chain type set
+- Custom networks must specify the chain type explicitly
+- The `--chain-type` CLI flag can override the chain type for any network, allowing you to test different chain behaviors with the same network configuration
+
 2. **Paths**: Define important directory paths
    - `contracts`: Location of your contract files
    - `artifacts`: Location of your artifacts files (analysis results will be stored here)
@@ -299,6 +308,24 @@ When this flag is enabled, all contracts deployed and all write transactions wil
 
 **Note:** Leader-only mode is only available for studio-based networks (localhost, 127.0.0.1, *.genlayer.com, *.genlayerlabs.com). When enabled on other networks, it will have no effect and a warning will be logged.
 
+12. Override the chain type
+```bash
+$ gltest --chain-type localnet
+$ gltest --chain-type studionet
+$ gltest --chain-type testnet_asimov
+```
+The `--chain-type` flag allows you to override the chain type configured for the network. This is useful when:
+- Testing different chain behaviors without changing network configuration
+- Switching between chain types for testing purposes
+- Using a custom network URL with a specific chain type
+
+Available chain types:
+- `localnet`: Local development chain
+- `studionet`: Studio-based chain
+- `testnet_asimov`: Testnet Asimov chain
+
+The chain type determines various behaviors including RPC endpoints, consensus mechanisms, and available features. When specified, this flag overrides the chain type configured in your network settings.
+
 ## 🚀 Key Features
 
 - **Pytest Integration** – Extends pytest to support intelligent contract testing, making it familiar and easy to adopt.

{genlayer_test-0.8.0 → genlayer_test-0.9.0}/README.md

@@ -117,6 +117,7 @@ networks:
   custom_network:  # Custom network configuration
     id: 1234
     url: "http://custom.network:8545"
+    chain_type: "localnet"  # Required for custom networks: localnet, studionet, or testnet_asimov
     accounts:
       - "${CUSTOM_ACCOUNT_1}"
       - "${CUSTOM_ACCOUNT_2}"
@@ -140,10 +141,11 @@ Key configuration sections:
    - Network configurations can include:
      - `url`: The RPC endpoint for the network (optional for pre-configured networks)
      - `id`: Chain ID (optional for pre-configured networks)
+     - `chain_type`: Chain type - one of: `localnet`, `studionet`, or `testnet_asimov` (required for custom 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
-   - For custom networks (non-pre-configured), `id`, `url`, and `accounts` are required fields
+   - For custom networks (non-pre-configured), `id`, `url`, `chain_type`, 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.
 
@@ -159,6 +161,13 @@ testnet_asimov:
   from: "${ADMIN_KEY}"       # Use ADMIN_KEY as default instead of DEPLOYER_KEY
 ```
 
+**Chain vs Network**: 
+- **Network**: Defines the connection details (URL, accounts, etc.) for a specific environment
+- **Chain**: Defines the genlayer chain type and its associated behaviors (localnet, studionet, or testnet_asimov)
+- Pre-configured networks automatically have the correct chain type set
+- Custom networks must specify the chain type explicitly
+- The `--chain-type` CLI flag can override the chain type for any network, allowing you to test different chain behaviors with the same network configuration
+
 2. **Paths**: Define important directory paths
    - `contracts`: Location of your contract files
    - `artifacts`: Location of your artifacts files (analysis results will be stored here)
@@ -276,6 +285,24 @@ When this flag is enabled, all contracts deployed and all write transactions wil
 
 **Note:** Leader-only mode is only available for studio-based networks (localhost, 127.0.0.1, *.genlayer.com, *.genlayerlabs.com). When enabled on other networks, it will have no effect and a warning will be logged.
 
+12. Override the chain type
+```bash
+$ gltest --chain-type localnet
+$ gltest --chain-type studionet
+$ gltest --chain-type testnet_asimov
+```
+The `--chain-type` flag allows you to override the chain type configured for the network. This is useful when:
+- Testing different chain behaviors without changing network configuration
+- Switching between chain types for testing purposes
+- Using a custom network URL with a specific chain type
+
+Available chain types:
+- `localnet`: Local development chain
+- `studionet`: Studio-based chain
+- `testnet_asimov`: Testnet Asimov chain
+
+The chain type determines various behaviors including RPC endpoints, consensus mechanisms, and available features. When specified, this flag overrides the chain type configured in your network settings.
+
 ## 🚀 Key Features
 
 - **Pytest Integration** – Extends pytest to support intelligent contract testing, making it familiar and easy to adopt.

{genlayer_test-0.8.0 → genlayer_test-0.9.0}/genlayer_test.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: genlayer-test
-Version: 0.8.0
+Version: 0.9.0
 Summary: GenLayer Testing Suite
 Author: GenLayer
 License-Expression: MIT
@@ -140,6 +140,7 @@ networks:
   custom_network:  # Custom network configuration
     id: 1234
     url: "http://custom.network:8545"
+    chain_type: "localnet"  # Required for custom networks: localnet, studionet, or testnet_asimov
     accounts:
       - "${CUSTOM_ACCOUNT_1}"
       - "${CUSTOM_ACCOUNT_2}"
@@ -163,10 +164,11 @@ Key configuration sections:
    - Network configurations can include:
      - `url`: The RPC endpoint for the network (optional for pre-configured networks)
      - `id`: Chain ID (optional for pre-configured networks)
+     - `chain_type`: Chain type - one of: `localnet`, `studionet`, or `testnet_asimov` (required for custom 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
-   - For custom networks (non-pre-configured), `id`, `url`, and `accounts` are required fields
+   - For custom networks (non-pre-configured), `id`, `url`, `chain_type`, 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.
 
@@ -182,6 +184,13 @@ testnet_asimov:
   from: "${ADMIN_KEY}"       # Use ADMIN_KEY as default instead of DEPLOYER_KEY
 ```
 
+**Chain vs Network**: 
+- **Network**: Defines the connection details (URL, accounts, etc.) for a specific environment
+- **Chain**: Defines the genlayer chain type and its associated behaviors (localnet, studionet, or testnet_asimov)
+- Pre-configured networks automatically have the correct chain type set
+- Custom networks must specify the chain type explicitly
+- The `--chain-type` CLI flag can override the chain type for any network, allowing you to test different chain behaviors with the same network configuration
+
 2. **Paths**: Define important directory paths
    - `contracts`: Location of your contract files
    - `artifacts`: Location of your artifacts files (analysis results will be stored here)
@@ -299,6 +308,24 @@ When this flag is enabled, all contracts deployed and all write transactions wil
 
 **Note:** Leader-only mode is only available for studio-based networks (localhost, 127.0.0.1, *.genlayer.com, *.genlayerlabs.com). When enabled on other networks, it will have no effect and a warning will be logged.
 
+12. Override the chain type
+```bash
+$ gltest --chain-type localnet
+$ gltest --chain-type studionet
+$ gltest --chain-type testnet_asimov
+```
+The `--chain-type` flag allows you to override the chain type configured for the network. This is useful when:
+- Testing different chain behaviors without changing network configuration
+- Switching between chain types for testing purposes
+- Using a custom network URL with a specific chain type
+
+Available chain types:
+- `localnet`: Local development chain
+- `studionet`: Studio-based chain
+- `testnet_asimov`: Testnet Asimov chain
+
+The chain type determines various behaviors including RPC endpoints, consensus mechanisms, and available features. When specified, this flag overrides the chain type configured in your network settings.
+
 ## 🚀 Key Features
 
 - **Pytest Integration** – Extends pytest to support intelligent contract testing, making it familiar and easy to adopt.

genlayer_test-0.9.0/genlayer_test.egg-info/SOURCES.txt

@@ -0,0 +1,41 @@
+LICENSE
+README.md
+pyproject.toml
+genlayer_test.egg-info/PKG-INFO
+genlayer_test.egg-info/SOURCES.txt
+genlayer_test.egg-info/dependency_links.txt
+genlayer_test.egg-info/entry_points.txt
+genlayer_test.egg-info/requires.txt
+genlayer_test.egg-info/top_level.txt
+gltest/__init__.py
+gltest/accounts.py
+gltest/assertions.py
+gltest/clients.py
+gltest/exceptions.py
+gltest/fixtures.py
+gltest/logging.py
+gltest/types.py
+gltest/utils.py
+gltest/artifacts/__init__.py
+gltest/artifacts/contract.py
+gltest/contracts/__init__.py
+gltest/contracts/contract.py
+gltest/contracts/contract_factory.py
+gltest/contracts/contract_functions.py
+gltest/contracts/method_stats.py
+gltest/contracts/stats_collector.py
+gltest/contracts/utils.py
+gltest/helpers/__init__.py
+gltest/helpers/fixture_snapshot.py
+gltest/helpers/take_snapshot.py
+gltest/validators/__init__.py
+gltest/validators/validator_factory.py
+gltest_cli/logging.py
+gltest_cli/main.py
+gltest_cli/config/__init__.py
+gltest_cli/config/constants.py
+gltest_cli/config/general.py
+gltest_cli/config/plugin.py
+gltest_cli/config/pytest_context.py
+gltest_cli/config/types.py
+gltest_cli/config/user.py

{genlayer_test-0.8.0 → genlayer_test-0.9.0}/genlayer_test.egg-info/top_level.txt

@@ -1,5 +1,3 @@
 dist
 gltest
 gltest_cli
-scripts
-tests

{genlayer_test-0.8.0 → genlayer_test-0.9.0}/gltest_cli/config/constants.py

@@ -5,8 +5,15 @@ from pathlib import Path
 GLTEST_CONFIG_FILE = "gltest.config.yaml"
 DEFAULT_NETWORK = "localnet"
 PRECONFIGURED_NETWORKS = ["localnet", "studionet", "testnet_asimov"]
+CHAINS = ["localnet", "studionet", "testnet_asimov"]
 DEFAULT_RPC_URL = SIMULATOR_JSON_RPC_URL
 DEFAULT_ENVIRONMENT = ".env"
 DEFAULT_CONTRACTS_DIR = Path("contracts")
 DEFAULT_ARTIFACTS_DIR = Path("artifacts")
 DEFAULT_NETWORK_ID = 61999
+
+# Defaults per network
+DEFAULT_WAIT_INTERVAL = 3000
+DEFAULT_WAIT_RETRIES = 50
+DEFAULT_TEST_WITH_MOCKS = False
+DEFAULT_LEADER_ONLY = False

{genlayer_test-0.8.0 → genlayer_test-0.9.0}/gltest_cli/config/plugin.py

@@ -12,6 +12,13 @@ from gltest_cli.config.general import (
 )
 from gltest_cli.config.types import PluginConfig
 from gltest_cli.config.pytest_context import _pytest_context
+from gltest_cli.config.constants import (
+    DEFAULT_WAIT_INTERVAL,
+    DEFAULT_WAIT_RETRIES,
+    DEFAULT_TEST_WITH_MOCKS,
+    DEFAULT_LEADER_ONLY,
+    CHAINS,
+)
 
 
 def pytest_addoption(parser):
@@ -33,14 +40,14 @@ def pytest_addoption(parser):
     group.addoption(
         "--default-wait-interval",
         action="store",
-        default=3000,
+        default=DEFAULT_WAIT_INTERVAL,
         help="Default interval (ms) between transaction receipt checks",
     )
 
     group.addoption(
         "--default-wait-retries",
         action="store",
-        default=50,
+        default=DEFAULT_WAIT_RETRIES,
         help="Default number of retries for transaction receipt checks",
     )
 
@@ -61,17 +68,24 @@ def pytest_addoption(parser):
     group.addoption(
         "--test-with-mocks",
         action="store_true",
-        default=False,
+        default=DEFAULT_TEST_WITH_MOCKS,
         help="Test with mocks",
     )
 
     group.addoption(
         "--leader-only",
         action="store_true",
-        default=False,
+        default=DEFAULT_LEADER_ONLY,
         help="Run contracts in leader-only mode",
     )
 
+    group.addoption(
+        "--chain-type",
+        action="store",
+        default=None,
+        help=f"Chain type (possible values: {', '.join(CHAINS)})",
+    )
+
 
 def pytest_configure(config):
     try:
@@ -108,6 +122,7 @@ def pytest_configure(config):
         network = config.getoption("--network")
         test_with_mocks = config.getoption("--test-with-mocks")
         leader_only = config.getoption("--leader-only")
+        chain_type = config.getoption("--chain-type")
 
         plugin_config = PluginConfig()
         plugin_config.contracts_dir = (
@@ -122,6 +137,7 @@ def pytest_configure(config):
         plugin_config.network_name = network
         plugin_config.test_with_mocks = test_with_mocks
         plugin_config.leader_only = leader_only
+        plugin_config.chain_type = chain_type
 
         general_config.plugin_config = plugin_config
     except Exception as e:
@@ -148,6 +164,8 @@ def pytest_sessionstart(session):
         # Show available networks including preconfigured ones
         all_networks = general_config.get_networks_keys()
         logger.info(f"  Available networks: {all_networks}")
+        logger.info(f"  Selected chain type: {general_config.get_chain_type()}")
+        logger.info(f"  Available chains: {', '.join(CHAINS)}")
         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}")

{genlayer_test-0.8.0 → genlayer_test-0.9.0}/gltest_cli/config/types.py

@@ -1,11 +1,16 @@
-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, studionet, testnet_asimov
 from genlayer_py.types import GenLayerChain
-from urllib.parse import urlparse
 from gltest_cli.config.constants import PRECONFIGURED_NETWORKS
+from gltest_cli.config.constants import (
+    DEFAULT_WAIT_INTERVAL,
+    DEFAULT_WAIT_RETRIES,
+    DEFAULT_TEST_WITH_MOCKS,
+    DEFAULT_LEADER_ONLY,
+    CHAINS,
+)
 
 
 @dataclass
@@ -18,6 +23,7 @@ class PluginConfig:
     network_name: Optional[str] = None
     test_with_mocks: bool = False
     leader_only: bool = False
+    chain_type: Optional[str] = None
 
 
 @dataclass
@@ -27,6 +33,10 @@ class NetworkConfigData:
     accounts: Optional[List[str]] = None
     from_account: Optional[str] = None
     leader_only: bool = False
+    default_wait_interval: Optional[int] = None
+    default_wait_retries: Optional[int] = None
+    test_with_mocks: bool = False
+    chain_type: Optional[str] = None
 
     def __post_init__(self):
         if self.id is not None and not isinstance(self.id, int):
@@ -40,6 +50,20 @@ class NetworkConfigData:
                 raise ValueError("accounts must be strings")
         if self.from_account is not None and not isinstance(self.from_account, str):
             raise ValueError("from_account must be a string")
+        if not isinstance(self.leader_only, bool):
+            raise TypeError("leader_only must be a boolean")
+        if self.default_wait_interval is not None and not isinstance(
+            self.default_wait_interval, int
+        ):
+            raise ValueError("default_wait_interval must be an integer")
+        if self.default_wait_retries is not None and not isinstance(
+            self.default_wait_retries, int
+        ):
+            raise ValueError("default_wait_retries must be an integer")
+        if not isinstance(self.test_with_mocks, bool):
+            raise TypeError("test_with_mocks must be a boolean")
+        if self.chain_type is not None and not isinstance(self.chain_type, str):
+            raise ValueError("chain_type must be a string")
 
 
 @dataclass
@@ -130,50 +154,69 @@ class GeneralConfig:
             return self.user_config.networks[network_name].accounts
         return self.user_config.networks[self.user_config.default_network].accounts
 
-    def get_chain(self) -> GenLayerChain:
+    def get_chain_type(self) -> str:
+        # If chain_type is explicitly set via CLI, use it
+        if self.plugin_config.chain_type is not None:
+            if self.plugin_config.chain_type not in CHAINS:
+                raise ValueError(
+                    f"Unknown chain type: {self.plugin_config.chain_type}. "
+                    f"Valid values: {', '.join(CHAINS)}"
+                )
+            return self.plugin_config.chain_type
+
         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()}"
             )
+        network_config = self.user_config.networks[network_name]
+        # For preconfigured networks, use its chain type
+        if network_name in PRECONFIGURED_NETWORKS:
+            chain_type = network_config.chain_type
+        else:
+            # For custom networks, chain_type field is required
+            chain_type = network_config.chain_type
+            if not chain_type:
+                raise ValueError(
+                    f"Custom network {network_name} must specify a 'chain_type' field. "
+                    f"Valid values: {', '.join(CHAINS)}"
+                )
+
+        if chain_type not in CHAINS:
+            raise ValueError(
+                f"Unknown chain type: {chain_type}. "
+                f"Valid values: {', '.join(CHAINS)}"
+            )
+        return chain_type
 
-        # Reserved network names
-        chain_map_by_name = {
+    def get_chain(self) -> GenLayerChain:
+        chain_map = {
             "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_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 id: {network_id}, possible values: {known}"
-            )
-        return chain_map_by_id[network_id]
+        chain_type = self.get_chain_type()
+        return chain_map[chain_type]
 
     def get_default_wait_interval(self) -> int:
         if self.plugin_config.default_wait_interval is not None:
             return self.plugin_config.default_wait_interval
-        raise ValueError("default_wait_interval is not set")
+        network_name = self.get_network_name()
+        if network_name in self.user_config.networks:
+            network_config = self.user_config.networks[network_name]
+            if network_config.default_wait_interval is not None:
+                return network_config.default_wait_interval
+        return DEFAULT_WAIT_INTERVAL
 
     def get_default_wait_retries(self) -> int:
         if self.plugin_config.default_wait_retries is not None:
             return self.plugin_config.default_wait_retries
-        raise ValueError("default_wait_retries is not set")
+        network_name = self.get_network_name()
+        if network_name in self.user_config.networks:
+            network_config = self.user_config.networks[network_name]
+            if network_config.default_wait_retries is not None:
+                return network_config.default_wait_retries
+        return DEFAULT_WAIT_RETRIES
 
     def get_network_name(self) -> str:
         if self.plugin_config.network_name is not None:
@@ -181,7 +224,13 @@ class GeneralConfig:
         return self.user_config.default_network
 
     def get_test_with_mocks(self) -> bool:
-        return self.plugin_config.test_with_mocks
+        if self.plugin_config.test_with_mocks:
+            return True
+        network_name = self.get_network_name()
+        if network_name in self.user_config.networks:
+            network_config = self.user_config.networks[network_name]
+            return network_config.test_with_mocks
+        return DEFAULT_TEST_WITH_MOCKS
 
     def get_leader_only(self) -> bool:
         if self.plugin_config.leader_only:
@@ -190,24 +239,10 @@ class GeneralConfig:
         if network_name in self.user_config.networks:
             network_config = self.user_config.networks[network_name]
             return network_config.leader_only
-        return False
+        return DEFAULT_LEADER_ONLY
 
     def check_local_rpc(self) -> bool:
-        SUPPORTED_RPC_DOMAINS = ["localhost", "127.0.0.1"]
-        rpc_url = self.get_rpc_url()
-        domain = urlparse(rpc_url).netloc.split(":")[0]  # Extract domain without port
-        return domain in SUPPORTED_RPC_DOMAINS
+        return self.get_chain_type() == "localnet"
 
     def check_studio_based_rpc(self) -> bool:
-        SUPPORTED_RPC_DOMAINS = ["localhost", "127.0.0.1"]
-        rpc_url = self.get_rpc_url()
-        domain = urlparse(rpc_url).netloc.split(":")[0]  # Extract domain without port
-
-        if domain in SUPPORTED_RPC_DOMAINS:
-            return True
-
-        # Check .genlayer.com or .genlayerlabs.com subdomains
-        if domain.endswith(".genlayer.com") or domain.endswith(".genlayerlabs.com"):
-            return True
-
-        return False
+        return self.get_chain_type() == "studionet"