genlayer-test 0.5.1__py3-none-any.whl → 0.6.0__py3-none-any.whl

{genlayer_test-0.5.1.dist-info → genlayer_test-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: genlayer-test
-Version: 0.5.1
+Version: 0.6.0
 Summary: GenLayer Testing Suite
 Author: GenLayer
 License-Expression: MIT
@@ -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.1.dist-info → genlayer_test-0.6.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-genlayer_test-0.5.1.dist-info/licenses/LICENSE,sha256=che_H4vE0QUx3HvWrAa1_jDEVInift0U6VO15-QqEls,1064
+genlayer_test-0.6.0.dist-info/licenses/LICENSE,sha256=che_H4vE0QUx3HvWrAa1_jDEVInift0U6VO15-QqEls,1064
 gltest/__init__.py,sha256=qoBV3IgDJr8uh9262XsWNMhi-ilkSgMqKVC9FVMk7cw,372
 gltest/accounts.py,sha256=HUmWguJMolggQaZNRPw-LGlRlQCjLLdUanKRowMv6pI,812
 gltest/assertions.py,sha256=0dEk0VxcHK4I7GZPHxJmz-2jaA60V499gOSR74rZbfM,1748
@@ -7,11 +7,12 @@ gltest/exceptions.py,sha256=deJPmrTe5gF33qkkKF2IVJY7lc_knI7Ql3N7jZ8aLZs,510
 gltest/fixtures.py,sha256=EJXmqcC3LD03v07mepacFl58lAdhbLj6bP5rtALYISk,2507
 gltest/logging.py,sha256=jAkHsuMm-AEx1Xu1srU6W-0YzTwXJB48mCK-OVzAiN4,342
 gltest/types.py,sha256=Kj6UuTpRXkA4c5ystKfwgXuCiRJ1VMkbgvP7Auvznhw,184
+gltest/utils.py,sha256=-gHhjrS7i_GhDG3sKOq2qsTtYBt4HHgXHEXh-3RB_rI,573
 gltest/artifacts/__init__.py,sha256=qTt3TE19gVNWnQLUlt5aDe4nNvJ2YJ1jzDkMmYIsCG0,194
 gltest/artifacts/contract.py,sha256=KChpmfjZod_0dVB8y-dvWz6IVm7QlIJsgG2ArtvVDaU,6457
 gltest/contracts/__init__.py,sha256=A9bvEtYOoqoHS8TLlFBfmNOnfwdsJPEf-AZuikagCHM,166
 gltest/contracts/contract.py,sha256=hYuugaV_gNFk58mGyLRPKkKVKIjsCDlVpKLvwRBf7sM,6743
-gltest/contracts/contract_factory.py,sha256=8MhiTD3ZBcFY6tbe1Xn26JryVWFfVZhXKN4AYXnHmdY,7615
+gltest/contracts/contract_factory.py,sha256=SCmhp2DRfD8FRejOqa6-_UF-yJaJr0ShB9lDkLLBzU0,8264
 gltest/contracts/contract_functions.py,sha256=5gNQYzN47rCJtmcMtUkl4ZK-yDifdZup2YhtlFlrx7E,2203
 gltest/contracts/method_stats.py,sha256=zWWjvf7K5VC4yrHpDIR717VF7LYp1RaZ1Hr_RZvWxJA,5150
 gltest/contracts/stats_collector.py,sha256=fuCc8L8hd0tsVGzH4adtZWwPa7ORf0A0zR5Dt1w92Qk,9033
@@ -33,6 +34,7 @@ tests/conftest.py,sha256=RKdoE5_zcMimeojAoA_GSFI9du4pMzMi1vZ1njtfoAs,28
 tests/examples/contracts/football_prediction_market.py,sha256=9xwU8f3q73Hae-ByHy_wauhMPLRnLZd4XKNrClnjOJM,3248
 tests/examples/contracts/intelligent_oracle.py,sha256=cZNGbjKMXY-pimVmPIKIlS963Gd3L1JAipq0VBR1J5Q,12360
 tests/examples/contracts/intelligent_oracle_factory.py,sha256=6UApEdPzcUXR18wMpaQXtWpEKeQjU0zDkI5ezghuJUo,1526
+tests/examples/contracts/invalid_deploy.py,sha256=cHXV0aq8gfbWdvjchnjSeoZDCCC-5iNdLGUkJi-tQfo,228
 tests/examples/contracts/llm_erc20.py,sha256=pOvSUszCtC_f5yDX0tZnj494Ce10uESZ09JLLE8V67o,2534
 tests/examples/contracts/log_indexer.py,sha256=Nlf8XUt13ujam3k6hbbVrPHK-KJ366Csz1TBjc4P07g,1901
 tests/examples/contracts/multi_read_erc20.py,sha256=28qYqn191Ro3rP7YJtZwL6Sc7JDXTeh8_QoqvdVPdqM,864
@@ -45,6 +47,7 @@ tests/examples/contracts/multi_file_contract/__init__.py,sha256=xDn_wS62GhCmnYoI
 tests/examples/contracts/multi_file_contract/other.py,sha256=jHDtjUL3eAUgE6yOYKFw_RfAH7kIwk8CvxUjbWHNruk,236
 tests/examples/tests/test_football_prediction_market.py,sha256=f2hfDK76WrNJZtFkTPKoPRR6bkmFLEssnlwwltSnU9A,1111
 tests/examples/tests/test_intelligent_oracle_factory.py,sha256=sL26aeb84XpJPCSUSIX3yrbwQE8GZtvNcsaKTpngFmY,7611
+tests/examples/tests/test_invalid_deploy.py,sha256=pppM8_Vn4DXcWq9iyJXb0SpZnKXkIyJxoIDW5ApCS94,814
 tests/examples/tests/test_llm_erc20.py,sha256=zb5F_7NgvZXhvqL2nULwzuTT6LGDprSy0WgrdjY7pZc,2096
 tests/examples/tests/test_llm_erc20_analyze.py,sha256=ccWQenEOG-U4TJdu-0i-3qNM4xRRCHSr3Iwz7pxknws,1729
 tests/examples/tests/test_log_indexer.py,sha256=46AqL7qquNc9GX2wxFxVcQXLqruMnPmxXl1yeB0-KZ4,2869
@@ -67,8 +70,8 @@ tests/gltest_cli/config/test_config_integration.py,sha256=vPTzr3_h9UMw7m72HogBJE
 tests/gltest_cli/config/test_general_config.py,sha256=UHtSwVnso-ZwNtYM0Z4v2sCLKwyrVbHlk6b1leVfV84,14703
 tests/gltest_cli/config/test_plugin.py,sha256=COrEK5tHP1BSzanWbZHmN3EQgE9VuTcPvB95pgOvKS4,7974
 tests/gltest_cli/config/test_user.py,sha256=JxR655oUFoM9quWQO68CVPKRpT0TMpzS3bF6j6NWyT4,14401
-genlayer_test-0.5.1.dist-info/METADATA,sha256=2-fwx4rsyi66GTBON5dv1tcZwZFOLUOKDJE9Yf5DqRQ,31760
-genlayer_test-0.5.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-genlayer_test-0.5.1.dist-info/entry_points.txt,sha256=RWPcSArBpz_G4BYioh5L8Q8hyClRbSgzLimjcWMp-BQ,94
-genlayer_test-0.5.1.dist-info/top_level.txt,sha256=-qiGZxTRBytujzgVcKpxjvQ-WNeUDjXa59ceGMwMpko,24
-genlayer_test-0.5.1.dist-info/RECORD,,
+genlayer_test-0.6.0.dist-info/METADATA,sha256=uHgafSUvII1G16UbdZ-26QwmtaV86EX1Pk-VwXsZAxs,32466
+genlayer_test-0.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+genlayer_test-0.6.0.dist-info/entry_points.txt,sha256=RWPcSArBpz_G4BYioh5L8Q8hyClRbSgzLimjcWMp-BQ,94
+genlayer_test-0.6.0.dist-info/top_level.txt,sha256=-qiGZxTRBytujzgVcKpxjvQ-WNeUDjXa59ceGMwMpko,24
+genlayer_test-0.6.0.dist-info/RECORD,,

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,11 +183,6 @@ 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.get("triggered_transactions", [])
                 for triggered_transaction in triggered_transactions:
@@ -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)}"

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")

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")

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)