genlayer-test 0.1.0b1__py3-none-any.whl → 0.1.0b3__py3-none-any.whl

{genlayer_test-0.1.0b1.dist-info → genlayer_test-0.1.0b3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: genlayer-test
-Version: 0.1.0b1
+Version: 0.1.0b3
 Summary: GenLayer Testing Suite
 Author: GenLayer
 License-Expression: MIT

genlayer_test-0.1.0b3.dist-info/RECORD

@@ -0,0 +1,18 @@
+gltest/__init__.py,sha256=AK_YfRvwlhrOheOelUG8qIRG17on0-nFCF747dopg2w,332
+gltest/assertions.py,sha256=wrT5R8yLAxm0B1EzmdZjOK5gBriugIrdtOIt9Qi0G-k,591
+gltest/exceptions.py,sha256=g7IF0qA8L0PdonXHTsbFnWx05U3jEYWOL3EFTW21IL4,95
+gltest/plugin_config.py,sha256=O9Dx9IejbBJe-CJ9h8iMVtLzjWlzLGcTGOIgJM6gLWc,204
+gltest/plugin_hooks.py,sha256=cy4-LPm3Q-ZaO94t5vgjbPjQB8MRxYGGRXeDBeJ7buU,399
+gltest/types.py,sha256=BODmwTr2gAUEiO9FjiuTiWwuKvXgo4xZWstQWNUfnlw,156
+gltest/artifacts/__init__.py,sha256=QCsQI8BSOHQwGWFxZVDRL-HA0Dyae3Re24E-yAZrflA,86
+gltest/artifacts/contract.py,sha256=2wmfQF6FAiNuMlr9pePK7ZJjQj5Tl7-3SefeH3OnSRQ,3089
+gltest/glchain/__init__.py,sha256=wD2Hzdz_wKpu-mCAX5iBINZDCNdKezLVI2lywkSkjvw,400
+gltest/glchain/account.py,sha256=vOXxcR09NkT6iFw_m49DW1nVC7kP8wf23555iPPXRkw,402
+gltest/glchain/client.py,sha256=U_JJJQ0V8oLPLeIbGpFcHOtnCVPJIoN9DMlvHSD1C0I,355
+gltest/glchain/contract.py,sha256=46QFDjwwg6n0qmjMTPXR1wueV2ZdFOc1g2nas0U9C_c,7837
+gltest_cli/main.py,sha256=Ti2-0Ev1x5_cM0D1UKqdgaDt80CDHEQGtdRne2qLm4M,53
+genlayer_test-0.1.0b3.dist-info/METADATA,sha256=zzWsz5KgLuoQO7urlzrLz9BYQMmpP-QOiyZZB3zbeiw,3409
+genlayer_test-0.1.0b3.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+genlayer_test-0.1.0b3.dist-info/entry_points.txt,sha256=rXhrPVq2IhVsd4uWzxzwCTx7jA1KcQIVNxDCUuxq4f8,89
+genlayer_test-0.1.0b3.dist-info/top_level.txt,sha256=GSdrnQbiLcZssmtCpbDgBTygsc8Bt_TPeYjwm0FmpdA,18
+genlayer_test-0.1.0b3.dist-info/RECORD,,

{genlayer_test-0.1.0b1.dist-info → genlayer_test-0.1.0b3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

genlayer_test-0.1.0b3.dist-info/entry_points.txt

@@ -0,0 +1,5 @@
+[console_scripts]
+gltest = gltest_cli.main:main
+
+[pytest11]
+gltest = gltest.plugin_hooks

genlayer_test-0.1.0b3.dist-info/top_level.txt

@@ -0,0 +1,2 @@
+gltest
+gltest_cli

gltest/artifacts/contract.py

@@ -1,7 +1,11 @@
 import ast
-from pathlib import Path
 from typing import Optional
 from dataclasses import dataclass
+from pathlib import Path
+from gltest.plugin_config import get_contracts_dir
+import io
+import zipfile
+from typing import Union
 
 
 @dataclass
@@ -9,44 +13,74 @@ class ContractDefinition:
     """Class that represents a contract definition from a .gpy file."""
 
     contract_name: str
-    contract_code: str
-    source_file: str
-    ast_node: ast.ClassDef
-
+    contract_code: Union[str, bytes]
+    main_file_path: Path
+    runner_file_path: Optional[Path]
 
-def find_contract_definition(
-    contract_name: str, relative_contracts_dir: str = "contracts"
-) -> Optional[ContractDefinition]:
-    """
-    Search in the contracts directory for a contract definition.
-    TODO: Make this more robust to handle imports and other files.
-    """
-    # Use provided directory or default to 'contracts' in current working directory
-    contracts_dir = Path.cwd() / relative_contracts_dir
 
-    if not contracts_dir.exists():
-        raise FileNotFoundError(f"Contracts directory not found at: {contracts_dir}")
-
-    # Search through all .gpy files in the contracts directory
-    for file_path in contracts_dir.glob("*.gpy"):
+def search_path_by_class_name(contracts_dir: Path, contract_name: str) -> Path:
+    """Search for a file by class name in the contracts directory."""
+    for file_path in contracts_dir.rglob("*.gpy"):
         try:
             # Read the file content
             with open(file_path, "r") as f:
                 content = f.read()
-
             # Parse the content into an AST
             tree = ast.parse(content)
-
             # Search for class definitions
             for node in ast.walk(tree):
                 if isinstance(node, ast.ClassDef) and node.name == contract_name:
                     # Found the contract class
-                    return ContractDefinition(
-                        contract_name=contract_name,
-                        source_file=str(file_path),
-                        contract_code=content,
-                        ast_node=node,
-                    )
+                    return file_path
         except Exception as e:
             raise ValueError(f"Error reading file {file_path}: {e}")
-    return None
+    raise FileNotFoundError(f"Contract {contract_name} not found at: {contracts_dir}")
+
+
+def compute_contract_code(
+    main_file_path: Path,
+    runner_file_path: Optional[Path] = None,
+) -> str:
+    """Compute the contract code."""
+    # Single file contract
+    if runner_file_path is None:
+        return main_file_path.read_text()
+
+    # Multifile contract
+    main_file_dir = main_file_path.parent
+    buffer = io.BytesIO()
+
+    with zipfile.ZipFile(buffer, mode="w") as zip:
+        zip.write(main_file_path, "contract/__init__.py")
+        for file_path in main_file_dir.rglob("*"):
+            if file_path.name in ["runner.json", "__init__.gpy"]:
+                continue
+            rel_path = file_path.relative_to(main_file_dir)
+            zip.write(file_path, f"contract/{rel_path}")
+        zip.write(runner_file_path, "runner.json")
+    buffer.flush()
+    return buffer.getvalue()
+
+
+def find_contract_definition(contract_name: str) -> Optional[ContractDefinition]:
+    """
+    Search in the contracts directory for a contract definition.
+    """
+    contracts_dir = get_contracts_dir()
+    if not contracts_dir.exists():
+        raise FileNotFoundError(f"Contracts directory not found at: {contracts_dir}")
+    main_file_path = search_path_by_class_name(contracts_dir, contract_name)
+    main_file_dir = main_file_path.parent
+    runner_file_path = None
+    if main_file_path.name == "__init__.gpy":
+        # Likely a multifile contract
+        runner_file_path = main_file_dir.joinpath("runner.json")
+        if not runner_file_path.exists():
+            # No runner file, so it's a single file contract
+            runner_file_path = None
+    return ContractDefinition(
+        contract_name=contract_name,
+        contract_code=compute_contract_code(main_file_path, runner_file_path),
+        main_file_path=main_file_path,
+        runner_file_path=runner_file_path,
+    )

gltest/glchain/contract.py

@@ -3,7 +3,7 @@ from gltest.artifacts import find_contract_definition
 from gltest.assertions import tx_execution_failed
 from gltest.exceptions import DeploymentError
 from .client import get_gl_client
-from genlayer_py.types import CalldataEncodable, GenLayerTransaction
+from gltest.types import CalldataEncodable, GenLayerTransaction, TransactionStatus
 from eth_account.signers.local import LocalAccount
 from typing import List, Any, Type, Optional, Dict, Callable
 import types
@@ -18,36 +18,47 @@ class Contract:
 
     address: str
     account: Optional[LocalAccount] = None
+    _schema: Optional[Dict[str, Any]] = None
 
     @classmethod
-    def from_address_and_schema(
-        cls, address: str, schema: Dict[str, Any]
+    def new(
+        cls,
+        address: str,
+        schema: Dict[str, Any],
+        account: Optional[LocalAccount] = None,
     ) -> "Contract":
         """
         Build the methods from the schema.
         """
         if not isinstance(schema, dict) or "methods" not in schema:
             raise ValueError("Invalid schema: must contain 'methods' field")
+        instance = cls(address=address, _schema=schema, account=account)
+        instance._build_methods_from_schema()
+        return instance
 
-        instance = cls(address=address)
-        for method_name, method_info in schema["methods"].items():
+    def _build_methods_from_schema(self):
+        if self._schema is None:
+            raise ValueError("No schema provided")
+        for method_name, method_info in self._schema["methods"].items():
             if not isinstance(method_info, dict) or "readonly" not in method_info:
                 raise ValueError(
-                    f"Invalid method info for {method_name}: must contain 'readonly' field"
+                    f"Invalid method info for '{method_name}': must contain 'readonly' field"
                 )
-            setattr(
-                instance,
-                method_name,
-                types.MethodType(
-                    cls.contract_method_factory(method_name, method_info["readonly"]),
-                    instance,
-                ),
+            method_func = self.contract_method_factory(
+                method_name, method_info["readonly"]
             )
-        return instance
+            bound_method = types.MethodType(method_func, self)
+            setattr(self, method_name, bound_method)
 
     def connect(self, account: LocalAccount) -> "Contract":
-        self.account = account
-        return self
+        """
+        Create a new instance of the contract with the same methods and a different account.
+        """
+        new_contract = self.__class__(
+            address=self.address, account=account, _schema=self._schema
+        )
+        new_contract._build_methods_from_schema()
+        return new_contract
 
     @staticmethod
     def contract_method_factory(method_name: str, read_only: bool) -> Callable:
@@ -78,6 +89,9 @@ class Contract:
             leader_only: bool = False,
             wait_interval: Optional[int] = None,
             wait_retries: Optional[int] = None,
+            wait_transaction_status: TransactionStatus = TransactionStatus.FINALIZED,
+            wait_triggered_transactions: bool = True,
+            wait_triggered_transactions_status: TransactionStatus = TransactionStatus.ACCEPTED,
         ) -> GenLayerTransaction:
             """
             Wrapper to the contract write method.
@@ -98,8 +112,18 @@ class Contract:
             if wait_retries is not None:
                 extra_args["retries"] = wait_retries
             receipt = client.wait_for_transaction_receipt(
-                transaction_hash=tx_hash, status="FINALIZED", **extra_args
+                transaction_hash=tx_hash,
+                status=wait_transaction_status,
+                **extra_args,
             )
+            if wait_triggered_transactions:
+                triggered_transactions = receipt["triggered_transactions"]
+                for triggered_transaction in triggered_transactions:
+                    client.wait_for_transaction_receipt(
+                        transaction_hash=triggered_transaction,
+                        status=wait_triggered_transactions_status,
+                        **extra_args,
+                    )
             return receipt
 
         return read_contract_wrapper if read_only else write_contract_wrapper
@@ -138,6 +162,7 @@ class ContractFactory:
         leader_only: bool = False,
         wait_interval: Optional[int] = None,
         wait_retries: Optional[int] = None,
+        wait_transaction_status: TransactionStatus = TransactionStatus.FINALIZED,
     ) -> Contract:
         """
         Deploy the contract
@@ -157,9 +182,8 @@ class ContractFactory:
             if wait_retries is not None:
                 extra_args["retries"] = wait_retries
             tx_receipt = client.wait_for_transaction_receipt(
-                transaction_hash=tx_hash, status="FINALIZED", **extra_args
+                transaction_hash=tx_hash, status=wait_transaction_status, **extra_args
             )
-
             if (
                 not tx_receipt
                 or "data" not in tx_receipt
@@ -176,8 +200,8 @@ class ContractFactory:
 
             contract_address = tx_receipt["data"]["contract_address"]
             schema = client.get_contract_schema(address=contract_address)
-            return Contract.from_address_and_schema(
-                address=contract_address, schema=schema
+            return Contract.new(
+                address=contract_address, schema=schema, account=account
             )
         except Exception as e:
             raise DeploymentError(

gltest/plugin_config.py

@@ -0,0 +1,12 @@
+from pathlib import Path
+
+_contracts_dir = None
+
+
+def set_contracts_dir(path: Path):
+    global _contracts_dir
+    _contracts_dir = path
+
+
+def get_contracts_dir() -> Path:
+    return Path(_contracts_dir)

gltest/plugin_hooks.py

@@ -0,0 +1,16 @@
+from gltest.plugin_config import set_contracts_dir
+from pathlib import Path
+
+
+def pytest_addoption(parser):
+    parser.addoption(
+        "--contracts-dir",
+        action="store",
+        default="contracts",
+        help="Directory containing contract files",
+    )
+
+
+def pytest_configure(config):
+    contracts_dir = config.getoption("--contracts-dir")
+    set_contracts_dir(Path(contracts_dir))

gltest/types.py

@@ -0,0 +1,7 @@
+# Re-export genlayer-py types
+from genlayer_py.types import (
+    CalldataAddress,
+    GenLayerTransaction,
+    TransactionStatus,
+    CalldataEncodable,
+)

genlayer_test-0.1.0b1.dist-info/RECORD

@@ -1,15 +0,0 @@
-gltest/__init__.py,sha256=AK_YfRvwlhrOheOelUG8qIRG17on0-nFCF747dopg2w,332
-gltest/assertions.py,sha256=wrT5R8yLAxm0B1EzmdZjOK5gBriugIrdtOIt9Qi0G-k,591
-gltest/cli.py,sha256=Ti2-0Ev1x5_cM0D1UKqdgaDt80CDHEQGtdRne2qLm4M,53
-gltest/exceptions.py,sha256=g7IF0qA8L0PdonXHTsbFnWx05U3jEYWOL3EFTW21IL4,95
-gltest/artifacts/__init__.py,sha256=QCsQI8BSOHQwGWFxZVDRL-HA0Dyae3Re24E-yAZrflA,86
-gltest/artifacts/contract.py,sha256=tOXv5rOGkoEeBndEp2wB9YnaTNvBRqACkGMkzC_tt4E,1761
-gltest/glchain/__init__.py,sha256=wD2Hzdz_wKpu-mCAX5iBINZDCNdKezLVI2lywkSkjvw,400
-gltest/glchain/account.py,sha256=vOXxcR09NkT6iFw_m49DW1nVC7kP8wf23555iPPXRkw,402
-gltest/glchain/client.py,sha256=U_JJJQ0V8oLPLeIbGpFcHOtnCVPJIoN9DMlvHSD1C0I,355
-gltest/glchain/contract.py,sha256=pt-LdF8k8jWCmWhU2-LI72w-vdVyi2g9Ux59MR8W3Es,6469
-genlayer_test-0.1.0b1.dist-info/METADATA,sha256=2nkEPJTInKomnfv-DnvCJoDTkyWrImvUsWyctCqu8mo,3409
-genlayer_test-0.1.0b1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-genlayer_test-0.1.0b1.dist-info/entry_points.txt,sha256=JfU-i_s5OciWVqtb0Ye5Pu_A1jJkDkitwLn4esJPZz4,43
-genlayer_test-0.1.0b1.dist-info/top_level.txt,sha256=xTaZGUzUZ0S1U6_lp5SwNMQWZJKFaXI1Yg8gGKFKFJg,7
-genlayer_test-0.1.0b1.dist-info/RECORD,,

genlayer_test-0.1.0b1.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-gltest = gltest.cli:main

genlayer_test-0.1.0b1.dist-info/top_level.txt

@@ -1 +0,0 @@
-gltest