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

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

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

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

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

{genlayer_test-2.0.0 → genlayer_test-2.1.0}/gltest/contracts/contract.py

@@ -2,7 +2,12 @@ import types
 from eth_account.signers.local import LocalAccount
 from dataclasses import dataclass
 from gltest.clients import get_gl_client
-from gltest.types import CalldataEncodable, GenLayerTransaction, TransactionStatus
+from gltest.types import (
+    CalldataEncodable,
+    GenLayerTransaction,
+    TransactionStatus,
+    TransactionHashVariant,
+)
 from typing import List, Any, Optional, Dict, Callable
 from gltest_cli.config.general import get_general_config
 from .contract_functions import ContractFunction
@@ -18,13 +23,16 @@ def read_contract_wrapper(
     Wrapper to the contract read method.
     """
 
-    def call_method():
+    def call_method(
+        transaction_hash_variant: TransactionHashVariant = TransactionHashVariant.LATEST_NONFINAL,
+    ):
         client = get_gl_client()
         return client.read_contract(
             address=self.address,
             function_name=method_name,
             account=self.account,
             args=args,
+            transaction_hash_variant=transaction_hash_variant,
         )
 
     return ContractFunction(
@@ -46,11 +54,11 @@ def write_contract_wrapper(
     def transact_method(
         value: int = 0,
         consensus_max_rotations: Optional[int] = None,
-        wait_transaction_status: TransactionStatus = TransactionStatus.FINALIZED,
+        wait_transaction_status: TransactionStatus = TransactionStatus.ACCEPTED,
         wait_interval: Optional[int] = None,
         wait_retries: Optional[int] = None,
-        wait_triggered_transactions: bool = True,
-        wait_triggered_transactions_status: TransactionStatus = TransactionStatus.FINALIZED,
+        wait_triggered_transactions: bool = False,
+        wait_triggered_transactions_status: TransactionStatus = TransactionStatus.ACCEPTED,
     ):
         """
         Transact the contract method.

{genlayer_test-2.0.0 → genlayer_test-2.1.0}/gltest/contracts/contract_factory.py

@@ -109,16 +109,24 @@ class ContractFactory:
         consensus_max_rotations: Optional[int] = None,
         wait_interval: Optional[int] = None,
         wait_retries: Optional[int] = None,
-        wait_transaction_status: TransactionStatus = TransactionStatus.FINALIZED,
+        wait_transaction_status: TransactionStatus = TransactionStatus.ACCEPTED,
+        wait_triggered_transactions: bool = False,
+        wait_triggered_transactions_status: TransactionStatus = TransactionStatus.ACCEPTED,
     ) -> Contract:
         """
         Deploy the contract
         """
         general_config = get_general_config()
-        if wait_interval is None:
-            wait_interval = general_config.get_default_wait_interval()
-        if wait_retries is None:
-            wait_retries = general_config.get_default_wait_retries()
+        actual_wait_interval = (
+            wait_interval
+            if wait_interval is not None
+            else general_config.get_default_wait_interval()
+        )
+        actual_wait_retries = (
+            wait_retries
+            if wait_retries is not None
+            else general_config.get_default_wait_retries()
+        )
         leader_only = (
             general_config.get_leader_only()
             if general_config.check_studio_based_rpc()
@@ -137,14 +145,24 @@ class ContractFactory:
             tx_receipt = client.wait_for_transaction_receipt(
                 transaction_hash=tx_hash,
                 status=wait_transaction_status,
-                interval=wait_interval,
-                retries=wait_retries,
+                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"]
+                for triggered_transaction in triggered_transactions:
+                    client.wait_for_transaction_receipt(
+                        transaction_hash=triggered_transaction,
+                        status=wait_triggered_transactions_status,
+                        interval=actual_wait_interval,
+                        retries=actual_wait_retries,
+                    )
+
             if (
                 "tx_data_decoded" in tx_receipt
                 and "contract_address" in tx_receipt["tx_data_decoded"]

{genlayer_test-2.0.0 → genlayer_test-2.1.0}/gltest/contracts/contract_functions.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 from typing import Callable, Optional, Dict, Any
-from gltest.types import TransactionStatus
+from gltest.types import TransactionStatus, TransactionHashVariant
 
 
 @dataclass
@@ -11,20 +11,23 @@ class ContractFunction:
     analyze_method: Optional[Callable] = None
     transact_method: Optional[Callable] = None
 
-    def call(self):
+    def call(
+        self,
+        transaction_hash_variant: TransactionHashVariant = TransactionHashVariant.LATEST_NONFINAL,
+    ):
         if not self.read_only:
             raise ValueError("call() not implemented for non-readonly method")
-        return self.call_method()
+        return self.call_method(transaction_hash_variant=transaction_hash_variant)
 
     def transact(
         self,
         value: int = 0,
         consensus_max_rotations: Optional[int] = None,
-        wait_transaction_status: TransactionStatus = TransactionStatus.FINALIZED,
+        wait_transaction_status: TransactionStatus = TransactionStatus.ACCEPTED,
         wait_interval: Optional[int] = None,
         wait_retries: Optional[int] = None,
-        wait_triggered_transactions: bool = True,
-        wait_triggered_transactions_status: TransactionStatus = TransactionStatus.FINALIZED,
+        wait_triggered_transactions: bool = False,
+        wait_triggered_transactions_status: TransactionStatus = TransactionStatus.ACCEPTED,
     ):
         if self.read_only:
             raise ValueError("Cannot transact read-only method")

{genlayer_test-2.0.0 → genlayer_test-2.1.0}/gltest/types.py

@@ -4,4 +4,5 @@ from genlayer_py.types import (
     GenLayerTransaction,
     TransactionStatus,
     CalldataEncodable,
+    TransactionHashVariant,
 )

{genlayer_test-2.0.0 → genlayer_test-2.1.0}/gltest_cli/config/plugin.py

@@ -32,14 +32,14 @@ def pytest_addoption(parser):
     group.addoption(
         "--default-wait-interval",
         action="store",
-        default=10000,
+        default=3000,
         help="Default interval (ms) between transaction receipt checks",
     )
 
     group.addoption(
         "--default-wait-retries",
         action="store",
-        default=15,
+        default=50,
         help="Default number of retries for transaction receipt checks",
     )
 

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

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

{genlayer_test-2.0.0 → genlayer_test-2.1.0}/tests/examples/tests/test_intelligent_oracle_factory.py

@@ -1,24 +1,10 @@
-import time
 import json
+from gltest.types import TransactionStatus
 
 from gltest import get_contract_factory
 from gltest.assertions import tx_execution_succeeded
 
 
-def wait_for_contract_deployment(intelligent_oracle_contract, max_retries=10, delay=5):
-    """
-    Wait for intelligent oracle contract to be fully deployed by attempting to call a method.
-    This is used to check if the triggered deployment did deploy the contract.
-    """
-    for _ in range(max_retries):
-        try:
-            intelligent_oracle_contract.get_dict(args=[]).call()
-            return True  # If successful, contract is deployed
-        except Exception:
-            time.sleep(delay)
-    return False
-
-
 def create_mock_response(markets_data):
     reasoning_single_source_marathon = "The HTML content contains the results of the Madrid Marathon 2024, which occurred on April 28, 2024. Mitku Tafa won and matches the name 'Tafa Mitku' in the list of potential outcomes."
     reasoning_all_sources_marathon = "The URL indicates that the Madrid Marathon 2024 has occurred on April 28, 2024, and Mitku Tafa was the winner. The name matches one of the potential outcomes. There are no conflicting sources."
@@ -124,7 +110,10 @@ def test_intelligent_oracle_factory_pattern(setup_validators):
                 market_data["resolution_urls"],
                 market_data["earliest_resolution_date"],
             ],
-        ).transact()
+        ).transact(
+            wait_triggered_transactions=True,
+            wait_triggered_transactions_status=TransactionStatus.ACCEPTED,
+        )
         assert tx_execution_succeeded(create_result)
 
         # Get the latest contract address from factory
@@ -135,11 +124,6 @@ def test_intelligent_oracle_factory_pattern(setup_validators):
         market_contract = intelligent_oracle_factory.build_contract(new_market_address)
         created_market_contracts.append(market_contract)
 
-        # Wait for the new market contract to be deployed
-        assert wait_for_contract_deployment(
-            market_contract
-        ), f"Market contract deployment timeout for {market_data['prediction_market_id']}"
-
     # Verify all markets were registered
     assert len(registered_addresses) == len(markets_data)