genlayer-test 0.5.0__tar.gz → 0.6.0__tar.gz

{genlayer_test-0.5.0/genlayer_test.egg-info → genlayer_test-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: genlayer-test
-Version: 0.5.0
+Version: 0.6.0
 Summary: GenLayer Testing Suite
 Author: GenLayer
 License-Expression: MIT
@@ -15,7 +15,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pytest
 Requires-Dist: setuptools>=77.0
-Requires-Dist: genlayer-py==0.7.2
+Requires-Dist: genlayer-py==0.8.1
 Requires-Dist: colorama>=0.4.6
 Requires-Dist: pyyaml
 Requires-Dist: python-dotenv
@@ -365,17 +365,24 @@ Key features demonstrated in this contract:
 
 ### Contract Deployment
 
+The GenLayer Testing Suite provides two methods for deploying contracts:
+
+1. **`deploy()`** - Returns the deployed contract instance (recommended for most use cases)
+2. **`deploy_contract_tx()`** - Returns only the transaction receipt
+
 Here's how to deploy the Storage contract:
 
 ```python
 from gltest import get_contract_factory, get_default_account
+from gltest.assertions import tx_execution_succeeded
+from gltest.utils import extract_contract_address
 
 def test_deployment():
     # Get the contract factory for your contract
     # it will search in the contracts directory
     factory = get_contract_factory("Storage")
     
-    # Deploy the contract with constructor arguments
+    # Method 1: Deploy the contract with constructor arguments (recommended)
     contract = factory.deploy(
         args=["initial_value"],  # Constructor arguments
         account=get_default_account(),  # Account to deploy from
@@ -384,6 +391,18 @@ def test_deployment():
     
     # Contract is now deployed and ready to use
     assert contract.address is not None
+    
+    # Method 2: Deploy and get only the receipt
+    receipt = factory.deploy_contract_tx(
+        args=["initial_value"],
+        account=get_default_account(),
+    )
+    
+    # Verify deployment succeeded
+    assert tx_execution_succeeded(receipt)
+
+    # Get the contract address
+    contract_address = extract_contract_address(receipt)
 ```
 
 ### Read Methods

genlayer_test-0.5.0/PKG-INFO → genlayer_test-0.6.0/README.md

@@ -1,26 +1,3 @@
-Metadata-Version: 2.4
-Name: genlayer-test
-Version: 0.5.0
-Summary: GenLayer Testing Suite
-Author: GenLayer
-License-Expression: MIT
-Classifier: Development Status :: 4 - Beta
-Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Topic :: Software Development :: Testing
-Requires-Python: >=3.12
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: pytest
-Requires-Dist: setuptools>=77.0
-Requires-Dist: genlayer-py==0.7.2
-Requires-Dist: colorama>=0.4.6
-Requires-Dist: pyyaml
-Requires-Dist: python-dotenv
-Dynamic: license-file
-
 # GenLayer Testing Suite
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/license/mit/)
@@ -365,17 +342,24 @@ Key features demonstrated in this contract:
 
 ### Contract Deployment
 
+The GenLayer Testing Suite provides two methods for deploying contracts:
+
+1. **`deploy()`** - Returns the deployed contract instance (recommended for most use cases)
+2. **`deploy_contract_tx()`** - Returns only the transaction receipt
+
 Here's how to deploy the Storage contract:
 
 ```python
 from gltest import get_contract_factory, get_default_account
+from gltest.assertions import tx_execution_succeeded
+from gltest.utils import extract_contract_address
 
 def test_deployment():
     # Get the contract factory for your contract
     # it will search in the contracts directory
     factory = get_contract_factory("Storage")
     
-    # Deploy the contract with constructor arguments
+    # Method 1: Deploy the contract with constructor arguments (recommended)
     contract = factory.deploy(
         args=["initial_value"],  # Constructor arguments
         account=get_default_account(),  # Account to deploy from
@@ -384,6 +368,18 @@ def test_deployment():
     
     # Contract is now deployed and ready to use
     assert contract.address is not None
+    
+    # Method 2: Deploy and get only the receipt
+    receipt = factory.deploy_contract_tx(
+        args=["initial_value"],
+        account=get_default_account(),
+    )
+    
+    # Verify deployment succeeded
+    assert tx_execution_succeeded(receipt)
+
+    # Get the contract address
+    contract_address = extract_contract_address(receipt)
 ```
 
 ### Read Methods

genlayer_test-0.5.0/README.md → genlayer_test-0.6.0/genlayer_test.egg-info/PKG-INFO

@@ -1,3 +1,26 @@
+Metadata-Version: 2.4
+Name: genlayer-test
+Version: 0.6.0
+Summary: GenLayer Testing Suite
+Author: GenLayer
+License-Expression: MIT
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Topic :: Software Development :: Testing
+Requires-Python: >=3.12
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: pytest
+Requires-Dist: setuptools>=77.0
+Requires-Dist: genlayer-py==0.8.1
+Requires-Dist: colorama>=0.4.6
+Requires-Dist: pyyaml
+Requires-Dist: python-dotenv
+Dynamic: license-file
+
 # GenLayer Testing Suite
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/license/mit/)
@@ -342,17 +365,24 @@ Key features demonstrated in this contract:
 
 ### Contract Deployment
 
+The GenLayer Testing Suite provides two methods for deploying contracts:
+
+1. **`deploy()`** - Returns the deployed contract instance (recommended for most use cases)
+2. **`deploy_contract_tx()`** - Returns only the transaction receipt
+
 Here's how to deploy the Storage contract:
 
 ```python
 from gltest import get_contract_factory, get_default_account
+from gltest.assertions import tx_execution_succeeded
+from gltest.utils import extract_contract_address
 
 def test_deployment():
     # Get the contract factory for your contract
     # it will search in the contracts directory
     factory = get_contract_factory("Storage")
     
-    # Deploy the contract with constructor arguments
+    # Method 1: Deploy the contract with constructor arguments (recommended)
     contract = factory.deploy(
         args=["initial_value"],  # Constructor arguments
         account=get_default_account(),  # Account to deploy from
@@ -361,6 +391,18 @@ def test_deployment():
     
     # Contract is now deployed and ready to use
     assert contract.address is not None
+    
+    # Method 2: Deploy and get only the receipt
+    receipt = factory.deploy_contract_tx(
+        args=["initial_value"],
+        account=get_default_account(),
+    )
+    
+    # Verify deployment succeeded
+    assert tx_execution_succeeded(receipt)
+
+    # Get the contract address
+    contract_address = extract_contract_address(receipt)
 ```
 
 ### Read Methods

{genlayer_test-0.5.0 → genlayer_test-0.6.0}/genlayer_test.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ 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
@@ -41,6 +42,7 @@ tests/conftest.py
 tests/examples/contracts/football_prediction_market.py
 tests/examples/contracts/intelligent_oracle.py
 tests/examples/contracts/intelligent_oracle_factory.py
+tests/examples/contracts/invalid_deploy.py
 tests/examples/contracts/llm_erc20.py
 tests/examples/contracts/log_indexer.py
 tests/examples/contracts/multi_read_erc20.py
@@ -53,16 +55,15 @@ tests/examples/contracts/multi_file_contract/__init__.py
 tests/examples/contracts/multi_file_contract/other.py
 tests/examples/tests/test_football_prediction_market.py
 tests/examples/tests/test_intelligent_oracle_factory.py
+tests/examples/tests/test_invalid_deploy.py
 tests/examples/tests/test_llm_erc20.py
 tests/examples/tests/test_llm_erc20_analyze.py
 tests/examples/tests/test_log_indexer.py
 tests/examples/tests/test_multi_file_contract.py
-tests/examples/tests/test_multi_file_contract_legacy.py
 tests/examples/tests/test_multi_read_erc20.py
 tests/examples/tests/test_multi_tenant_storage.py
 tests/examples/tests/test_read_erc20.py
 tests/examples/tests/test_storage.py
-tests/examples/tests/test_storage_legacy.py
 tests/examples/tests/test_user_storage.py
 tests/examples/tests/test_wizard_of_coin.py
 tests/gltest/__init__.py

{genlayer_test-0.5.0 → genlayer_test-0.6.0}/genlayer_test.egg-info/requires.txt

@@ -1,6 +1,6 @@
 pytest
 setuptools>=77.0
-genlayer-py==0.7.2
+genlayer-py==0.8.1
 colorama>=0.4.6
 pyyaml
 python-dotenv

{genlayer_test-0.5.0 → genlayer_test-0.6.0}/gltest/contracts/contract.py

@@ -96,7 +96,7 @@ def write_contract_wrapper(
             retries=actual_wait_retries,
         )
         if wait_triggered_transactions:
-            triggered_transactions = receipt["triggered_transactions"]
+            triggered_transactions = receipt.get("triggered_transactions", [])
             for triggered_transaction in triggered_transactions:
                 client.wait_for_transaction_receipt(
                     transaction_hash=triggered_transaction,

{genlayer_test-0.5.0 → genlayer_test-0.6.0}/gltest/contracts/contract_factory.py

@@ -17,10 +17,11 @@ from gltest.clients import (
 )
 from .contract import Contract
 from gltest.logging import logger
-from gltest.types import TransactionStatus
+from gltest.types import TransactionStatus, GenLayerTransaction, CalldataEncodable
 from gltest.assertions import tx_execution_failed
 from gltest.exceptions import DeploymentError
 from gltest_cli.config.general import get_general_config
+from gltest.utils import extract_contract_address
 
 
 @dataclass
@@ -104,7 +105,7 @@ class ContractFactory:
 
     def deploy(
         self,
-        args: List[Any] = [],
+        args: Optional[List[CalldataEncodable]] = None,
         account: Optional[LocalAccount] = None,
         consensus_max_rotations: Optional[int] = None,
         wait_interval: Optional[int] = None,
@@ -114,7 +115,41 @@ class ContractFactory:
         wait_triggered_transactions_status: TransactionStatus = TransactionStatus.ACCEPTED,
     ) -> Contract:
         """
-        Deploy the contract
+        Deploy the contract and return a Contract instance (convenience method).
+
+        This is a convenience method that handles receipt validation
+        and contract instantiation automatically.
+        """
+        receipt = self.deploy_contract_tx(
+            args=args,
+            account=account,
+            consensus_max_rotations=consensus_max_rotations,
+            wait_interval=wait_interval,
+            wait_retries=wait_retries,
+            wait_transaction_status=wait_transaction_status,
+            wait_triggered_transactions=wait_triggered_transactions,
+            wait_triggered_transactions_status=wait_triggered_transactions_status,
+        )
+
+        if tx_execution_failed(receipt):
+            raise DeploymentError(f"Deployment transaction failed: {receipt}")
+
+        contract_address = extract_contract_address(receipt)
+        return self.build_contract(contract_address=contract_address, account=account)
+
+    def deploy_contract_tx(
+        self,
+        args: Optional[List[CalldataEncodable]] = None,
+        account: Optional[LocalAccount] = None,
+        consensus_max_rotations: Optional[int] = None,
+        wait_interval: Optional[int] = None,
+        wait_retries: Optional[int] = None,
+        wait_transaction_status: TransactionStatus = TransactionStatus.ACCEPTED,
+        wait_triggered_transactions: bool = False,
+        wait_triggered_transactions_status: TransactionStatus = TransactionStatus.ACCEPTED,
+    ) -> GenLayerTransaction:
+        """
+        Deploy the contract and return the transaction receipt.
         """
         general_config = get_general_config()
         actual_wait_interval = (
@@ -148,13 +183,8 @@ class ContractFactory:
                 interval=actual_wait_interval,
                 retries=actual_wait_retries,
             )
-            if tx_execution_failed(tx_receipt):
-                raise ValueError(
-                    f"Deployment transaction finalized with error: {tx_receipt}"
-                )
-
             if wait_triggered_transactions:
-                triggered_transactions = tx_receipt["triggered_transactions"]
+                triggered_transactions = tx_receipt.get("triggered_transactions", [])
                 for triggered_transaction in triggered_transactions:
                     client.wait_for_transaction_receipt(
                         transaction_hash=triggered_transaction,
@@ -162,26 +192,7 @@ class ContractFactory:
                         interval=actual_wait_interval,
                         retries=actual_wait_retries,
                     )
-
-            if (
-                "tx_data_decoded" in tx_receipt
-                and "contract_address" in tx_receipt["tx_data_decoded"]
-            ):
-                contract_address = tx_receipt["tx_data_decoded"]["contract_address"]
-            elif "data" in tx_receipt and "contract_address" in tx_receipt["data"]:
-                contract_address = tx_receipt["data"]["contract_address"]
-            else:
-                raise ValueError("Transaction receipt missing contract address")
-
-            schema = self._get_schema_with_fallback()
-            if schema is None:
-                raise ValueError(
-                    "Failed to get schema from all clients (default, hosted studio, and local)"
-                )
-
-            return Contract.new(
-                address=contract_address, schema=schema, account=account
-            )
+            return tx_receipt
         except Exception as e:
             raise DeploymentError(
                 f"Failed to deploy contract {self.contract_name}: {str(e)}"

genlayer_test-0.6.0/gltest/utils.py

@@ -0,0 +1,14 @@
+from genlayer_py.types import GenLayerTransaction
+
+
+def extract_contract_address(receipt: GenLayerTransaction) -> str:
+    """Extract contract address from a deployment transaction receipt."""
+    if (
+        "tx_data_decoded" in receipt
+        and "contract_address" in receipt["tx_data_decoded"]
+    ):
+        return receipt["tx_data_decoded"]["contract_address"]
+    elif "data" in receipt and "contract_address" in receipt["data"]:
+        return receipt["data"]["contract_address"]
+    else:
+        raise ValueError("Transaction receipt missing contract address")

{genlayer_test-0.5.0 → genlayer_test-0.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "genlayer-test"
-version = "0.5.0"
+version = "0.6.0"
 description = "GenLayer Testing Suite"
 authors = [
     { name = "GenLayer" }
@@ -15,7 +15,7 @@ requires-python = ">=3.12"
 dependencies = [
     "pytest",
     "setuptools>=77.0",
-    "genlayer-py==0.7.2",
+    "genlayer-py==0.8.1",
     "colorama>=0.4.6",
     "pyyaml",
     "python-dotenv"

{genlayer_test-0.5.0 → genlayer_test-0.6.0}/tests/examples/contracts/intelligent_oracle_factory.py

@@ -38,6 +38,7 @@ class Registry(gl.Contract):
                 earliest_resolution_date,
             ],
             salt_nonce=registered_contracts + 1,
+            on="accepted",
         )
         print("contract_address", contract_address)
         print("contract_address type", type(contract_address))

genlayer_test-0.6.0/tests/examples/contracts/invalid_deploy.py

@@ -0,0 +1,10 @@
+# { "Depends": "py-genlayer:test" }
+
+import genlayer as gl
+
+
+class InvalidDeploy(gl.Contract):
+    """Contract that always fails during deployment"""
+
+    def __init__(self):
+        raise Exception("This is an invalid deploy")

{genlayer_test-0.5.0 → genlayer_test-0.6.0}/tests/examples/contracts/multi_file_contract/__init__.py

@@ -12,6 +12,7 @@ class MultiFileContract(gl.Contract):
             args=["123"],
             salt_nonce=u256(1),
             value=u256(0),
+            on="accepted",
         )
 
     @gl.public.write

{genlayer_test-0.5.0 → genlayer_test-0.6.0}/tests/examples/contracts/multi_tenant_storage.py

@@ -46,4 +46,6 @@ class MultiTentantStorage(gl.Contract):
             self.available_storage_contracts.pop()
 
         contract_to_use = self.mappings[gl.message.sender_address]
-        gl.get_contract_at(contract_to_use).emit().update_storage(new_storage)
+        gl.get_contract_at(contract_to_use).emit(on="accepted").update_storage(
+            new_storage
+        )

{genlayer_test-0.5.0 → genlayer_test-0.6.0}/tests/examples/tests/test_intelligent_oracle_factory.py

@@ -1,5 +1,4 @@
 import json
-from gltest.types import TransactionStatus
 
 from gltest import get_contract_factory
 from gltest.assertions import tx_execution_succeeded
@@ -112,7 +111,6 @@ def test_intelligent_oracle_factory_pattern(setup_validators):
             ],
         ).transact(
             wait_triggered_transactions=True,
-            wait_triggered_transactions_status=TransactionStatus.ACCEPTED,
         )
         assert tx_execution_succeeded(create_result)
 

genlayer_test-0.6.0/tests/examples/tests/test_invalid_deploy.py

@@ -0,0 +1,24 @@
+import pytest
+from gltest import get_contract_factory
+from gltest.assertions import tx_execution_failed
+from gltest.exceptions import DeploymentError
+
+
+def test_invalid_deploy_basic_exception(setup_validators):
+    """Test deployment failure with basic exception"""
+    setup_validators()
+    factory = get_contract_factory("InvalidDeploy")
+
+    # Deployment should fail with exception
+    with pytest.raises(DeploymentError):
+        factory.deploy()
+
+
+def test_invalid_deploy_receipt_only(setup_validators):
+    """Test deployment failure using deploy_contract_tx() method that returns receipt only"""
+    setup_validators()
+    factory = get_contract_factory("InvalidDeploy")
+
+    # Deploy and get receipt - should show failure
+    receipt = factory.deploy_contract_tx()
+    assert tx_execution_failed(receipt)

{genlayer_test-0.5.0 → genlayer_test-0.6.0}/tests/examples/tests/test_multi_file_contract.py

@@ -1,5 +1,4 @@
 from gltest import get_contract_factory
-from gltest.assertions import tx_execution_succeeded
 
 
 def test_multi_file_contract(setup_validators):
@@ -7,10 +6,10 @@ def test_multi_file_contract(setup_validators):
     # Deploy Contract, it will deploy other.py as well
     setup_validators()
     factory = get_contract_factory("MultiFileContract")
-    contract = factory.deploy(args=[])
-
-    wait_response = contract.wait(args=[]).transact()
-    assert tx_execution_succeeded(wait_response)
+    contract = factory.deploy(
+        args=[],
+        wait_triggered_transactions=True,
+    )
 
     res = contract.test(args=[]).call()
     assert res == "123"

{genlayer_test-0.5.0 → genlayer_test-0.6.0}/tests/examples/tests/test_multi_tenant_storage.py

@@ -51,7 +51,9 @@ def test_multi_tenant_storage(setup_validators):
     transaction_response_call = (
         multi_tenant_storage_contract.connect(account=user_account_a)
         .update_storage(args=["user_a_storage"])
-        .transact()
+        .transact(
+            wait_triggered_transactions=True,
+        )
     )
     assert tx_execution_succeeded(transaction_response_call)
 
@@ -59,7 +61,9 @@ def test_multi_tenant_storage(setup_validators):
     transaction_response_call = (
         multi_tenant_storage_contract.connect(account=user_account_b)
         .update_storage(args=["user_b_storage"])
-        .transact()
+        .transact(
+            wait_triggered_transactions=True,
+        )
     )
     assert tx_execution_succeeded(transaction_response_call)
 

{genlayer_test-0.5.0 → genlayer_test-0.6.0}/tests/gltest/artifact/test_contract_definition.py

@@ -47,42 +47,6 @@ def test_multiple_files():
     assert contract_definition.contract_code == contract_code
 
 
-def test_single_file_legacy():
-    general_config = get_general_config()
-    general_config.set_contracts_dir(Path("."))
-    contract_definition = find_contract_definition_from_name("StorageLegacy")
-
-    # Assert complete contract definition
-    assert contract_definition.contract_name == "StorageLegacy"
-    expected_main_file_path = CONTRACTS_DIR / "storage_legacy.gpy"
-    expected_runner_file_path = None
-    contract_code = compute_contract_code(
-        expected_main_file_path, expected_runner_file_path
-    )
-    assert contract_definition.contract_code == contract_code
-    assert str(contract_definition.main_file_path) == str(
-        CONTRACTS_DIR / "storage_legacy.gpy"
-    )
-    assert contract_definition.runner_file_path is None
-
-
-def test_multiple_files_legacy():
-    general_config = get_general_config()
-    general_config.set_contracts_dir(Path("."))
-    contract_definition = find_contract_definition_from_name("MultiFileContractLegacy")
-
-    # Assert complete contract definition
-    assert contract_definition.contract_name == "MultiFileContractLegacy"
-    expected_main_file_path = CONTRACTS_DIR / "multi_file_contract_legacy/__init__.gpy"
-    expected_runner_file_path = CONTRACTS_DIR / "multi_file_contract_legacy/runner.json"
-    assert contract_definition.main_file_path == expected_main_file_path
-    assert contract_definition.runner_file_path == expected_runner_file_path
-    contract_code = compute_contract_code(
-        expected_main_file_path, expected_runner_file_path
-    )
-    assert contract_definition.contract_code == contract_code
-
-
 def test_class_is_not_intelligent_contract():
     general_config = get_general_config()
     general_config.set_contracts_dir(Path("."))

genlayer_test-0.5.0/tests/examples/tests/test_multi_file_contract_legacy.py

@@ -1,16 +0,0 @@
-from gltest import get_contract_factory
-from gltest.assertions import tx_execution_succeeded
-
-
-def test_multi_file_contract_legacy(setup_validators):
-    # Multi file contracts are considered if they are defined in a __init__.gpy file
-    # Deploy Contract, it will deploy other.gpy as well
-    setup_validators()
-    factory = get_contract_factory("MultiFileContractLegacy")
-    contract = factory.deploy(args=[])
-
-    wait_response = contract.wait(args=[]).transact()
-    assert tx_execution_succeeded(wait_response)
-
-    res = contract.test(args=[]).call()
-    assert res == "123"

genlayer_test-0.5.0/tests/examples/tests/test_storage_legacy.py

@@ -1,26 +0,0 @@
-from gltest import get_contract_factory
-from gltest.assertions import tx_execution_succeeded
-
-
-INITIAL_STATE = "a"
-UPDATED_STATE = "b"
-
-
-def test_storage_legacy(setup_validators):
-    setup_validators()
-    factory = get_contract_factory("StorageLegacy")
-    contract = factory.deploy(args=[INITIAL_STATE])
-
-    # Get initial state
-    contract_state_1 = contract.get_storage(args=[]).call()
-    assert contract_state_1 == INITIAL_STATE
-
-    # Update State
-    transaction_response_call_1 = contract.update_storage(
-        args=[UPDATED_STATE]
-    ).transact()
-    assert tx_execution_succeeded(transaction_response_call_1)
-
-    # Get Updated State
-    contract_state_2 = contract.get_storage(args=[]).call()
-    assert contract_state_2 == UPDATED_STATE