Exposing gas limit to chain config and using the parameter for create…

… checkpoint in advance time (#1498)

scripts/local_fuzz_bots.py

@@ -53,6 +53,7 @@ def main(argv: Sequence[str] | None = None) -> None:
         rng=rng,
         crash_log_level=logging.CRITICAL,
         crash_report_additional_info={"rng_seed": rng_seed},
+        gas_limit=int(1e6),  # Plenty of gas limit for transactions
     )
 
     while True:

scripts/run_unit_fuzz.py

@@ -4,6 +4,7 @@
 
 import argparse
 import sys
+import traceback
 from typing import NamedTuple, Sequence
 
 from agent0.core.hyperdrive.interactive import LocalChain
@@ -52,7 +53,7 @@ def main(argv: Sequence[str] | None = None):
         # We catch other exceptions here, for some reason rollbar needs to be continuously running in order
         # to log.
         except Exception:  # pylint: disable=broad-except
-            print("Unexpected error:", sys.exc_info()[0])
+            print("Unexpected error:\n", traceback.print_exc())
 
         try:
             print("Running path independence test")
@@ -89,7 +90,7 @@ def main(argv: Sequence[str] | None = None):
         except FuzzAssertionException:
             pass
         except Exception:  # pylint: disable=broad-except
-            print("Unexpected error:", sys.exc_info()[0])
+            print("Unexpected error:\n", traceback.print_exc())
 
         try:
             print("Running fuzz present value test")
@@ -104,7 +105,7 @@ def main(argv: Sequence[str] | None = None):
         except FuzzAssertionException:
             pass
         except Exception:  # pylint: disable=broad-except
-            print("Unexpected error:", sys.exc_info()[0])
+            print("Unexpected error:\n", traceback.print_exc())
 
         num_checks += 1
         if parsed_args.number_of_runs > 0 and num_checks >= parsed_args.number_of_runs:

src/agent0/core/base/policies/base.py

@@ -40,6 +40,8 @@ class Config(Freezable):
         """The base fee multiple for transactions. Defaults to None."""
         priority_fee_multiple: float | None = None
         """The priority fee multiple for transactions. Defaults to None."""
+        gas_limit: int | None = None
+        """Maximum gas to spend per trade."""
 
     def __init__(self, policy_config: Config):
         """Initialize the policy.

src/agent0/core/hyperdrive/interactive/chain.py

@@ -5,7 +5,7 @@
 import atexit
 import logging
 import os
-from dataclasses import dataclass
+from dataclasses import asdict, dataclass
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Type
 
@@ -106,6 +106,14 @@ class Config:
         The experiment's stateful random number generator. Defaults to creating a generator from
         the provided random seed if not set.
         """
+        gas_limit: int | None = None
+        """
+        The maximum gas to use when executing transactions. This gas limit controls
+        any transactions that are executed on the chain.
+        NOTE: the policies `gas_limit` overwrites this value if it is set.
+        """
+        # TODO we only use gas_limit currently for policy trades and `create_checkpoint` in advance time,
+        # need to propagate this to other trades
 
         def __post_init__(self):
             """Create the random number generator if not set."""
@@ -297,6 +305,28 @@ def block_time(self) -> Timestamp:
     # Agent functions
     ################
 
+    def _handle_policy_config(
+        self,
+        policy: Type[HyperdriveBasePolicy] | None = None,
+        policy_config: HyperdriveBasePolicy.Config | None = None,
+    ) -> HyperdriveBasePolicy.Config | None:
+        if policy is None:
+            return None
+        return_policy_config = None
+        # Policy config might be frozen, we create a new one while setting these variables
+        if policy_config is not None:
+            policy_dict = asdict(policy_config)
+            # If the underlying policy's rng isn't set, we use the one from the chain object
+            if policy_config.rng is None and policy_config.rng_seed is None:
+                policy_dict["rng"] = self.config.rng
+            # If the underlying policy's `gas_limit` isn't set, we use the one from the chain object
+            if policy_config.gas_limit is None:
+                policy_dict["gas_limit"] = self.config.gas_limit
+            return_policy_config = policy.Config(**policy_dict)
+        else:
+            return_policy_config = policy.Config(rng=self.config.rng, gas_limit=self.config.gas_limit)
+        return return_policy_config
+
     def init_agent(
         self,
         private_key: str,
@@ -330,9 +360,8 @@ def init_agent(
         """
         # pylint: disable=too-many-arguments
 
-        # If the underlying policy's rng isn't set, we use the one from interactive hyperdrive
-        if policy_config is not None and policy_config.rng is None and policy_config.rng_seed is None:
-            policy_config.rng = self.config.rng
+        policy_config = self._handle_policy_config(policy, policy_config)
+
         out_agent = HyperdriveAgent(
             name=name,
             chain=self,

src/agent0/core/hyperdrive/interactive/hyperdrive_agent.py

@@ -107,8 +107,8 @@ def __init__(
         self._active_policy: HyperdriveBasePolicy | None = None
 
         if policy is not None:
-            if policy_config is None:
-                policy_config = policy.Config(rng=self.chain.config.rng)
+            # Policy config gets set in `init_agent` and `set_active_policy` if passed in
+            assert policy_config is not None
             self._active_policy = policy(policy_config)
 
         self.account: LocalAccount = Account().from_key(private_key)
@@ -234,8 +234,8 @@ def set_active(
             self._active_pool = pool
 
         if policy is not None:
-            if policy_config is None:
-                policy_config = policy.Config(rng=self.chain.config.rng)
+            policy_config = self.chain._handle_policy_config(policy, policy_config)
+            assert policy_config is not None
             self._active_policy = policy(policy_config)
 
     ################

src/agent0/core/hyperdrive/interactive/local_chain.py

@@ -285,7 +285,7 @@ def advance_time(
             for pool in self._deployed_hyperdrive_pools:
                 # Create checkpoint handles making a checkpoint at the right time
                 checkpoint_event = pool._create_checkpoint(  # pylint: disable=protected-access
-                    check_if_exists=True,
+                    check_if_exists=True, gas_limit=self.config.gas_limit
                 )
                 if checkpoint_event is not None:
                     out_dict[pool].append(checkpoint_event)
@@ -307,7 +307,9 @@ def advance_time(
                 time_before_checkpoints = self._web3.eth.get_block("latest").get("timestamp")
                 assert time_before_checkpoints is not None
                 for pool in self._deployed_hyperdrive_pools:
-                    checkpoint_event = pool._create_checkpoint()  # pylint: disable=protected-access
+                    checkpoint_event = pool._create_checkpoint(
+                        gas_limit=self.config.gas_limit
+                    )  # pylint: disable=protected-access
                     # These checkpoints should never fail
                     assert checkpoint_event is not None
                     # Add checkpoint event to the output
@@ -611,9 +613,7 @@ def init_agent(
         if eth is None:
             eth = FixedPoint(0)
 
-        # If the underlying policy's rng isn't set, we use the one from the chain object
-        if policy_config is not None and policy_config.rng is None and policy_config.rng_seed is None:
-            policy_config.rng = self.config.rng
+        policy_config = self._handle_policy_config(policy, policy_config)
 
         out_agent = LocalHyperdriveAgent(
             base=base,
@@ -749,3 +749,4 @@ def run_dashboard(self, blocking: bool = False) -> None:
             input("Press any key to kill dashboard server.")
             self.dashboard_subprocess.kill()
             self.dashboard_subprocess = None
+            self.dashboard_subprocess = None

src/agent0/core/hyperdrive/interactive/local_hyperdrive.py

@@ -329,7 +329,7 @@ def set_variable_rate(self, variable_rate: FixedPoint) -> None:
         self._run_blocking_data_pipeline()
 
     def _create_checkpoint(
-        self, checkpoint_time: int | None = None, check_if_exists: bool = True
+        self, checkpoint_time: int | None = None, check_if_exists: bool = True, gas_limit: int | None = None
     ) -> CreateCheckpoint | None:
         """Internal function without safeguard checks for creating a checkpoint.
         Creating checkpoints is called by the chain's `advance_time`.
@@ -348,7 +348,7 @@ def _create_checkpoint(
 
         try:
             tx_receipt = self.interface.create_checkpoint(
-                self.chain.get_deployer_account(), checkpoint_time=checkpoint_time
+                self.chain.get_deployer_account(), checkpoint_time=checkpoint_time, gas_limit=gas_limit
             )
         except AssertionError as exc:
             # Adding additional context to the "Transaction receipt has no logs" error

src/agent0/core/hyperdrive/policies/random.py

@@ -63,8 +63,6 @@ class Config(HyperdriveBasePolicy.Config):
         """The probability of this bot to make a trade on an action call."""
         randomly_ignore_slippage_tolerance: bool = False
         """If we randomly ignore slippage tolerance."""
-        gas_limit: int | None = None
-        """Maximum gas to spend per trade."""
         allowable_actions: list[HyperdriveActionType] = field(
             default_factory=lambda: [
                 HyperdriveActionType.OPEN_LONG,

src/agent0/ethpy/hyperdrive/interface/_contract_calls.py

@@ -117,6 +117,7 @@ def _create_checkpoint(
     sender: LocalAccount,
     block_number: BlockNumber | None = None,
     checkpoint_time: int | None = None,
+    gas_limit: int | None = None,
 ) -> ReceiptBreakdown:
     """See API for documentation."""
     if checkpoint_time is None:
@@ -138,6 +139,7 @@ def _create_checkpoint(
         read_retry_count=interface.read_retry_count,
         write_retry_count=interface.write_retry_count,
         timeout=interface.txn_receipt_timeout,
+        txn_options_gas=gas_limit,
     )
     trade_result = parse_logs(tx_receipt, interface.hyperdrive_contract, "createCheckpoint")
     return trade_result

src/agent0/ethpy/hyperdrive/interface/read_write_interface.py

@@ -89,7 +89,11 @@ def get_read_interface(self) -> HyperdriveReadInterface:
         )
 
     def create_checkpoint(
-        self, sender: LocalAccount, block_number: BlockNumber | None = None, checkpoint_time: int | None = None
+        self,
+        sender: LocalAccount,
+        block_number: BlockNumber | None = None,
+        checkpoint_time: int | None = None,
+        gas_limit: int | None = None,
     ) -> ReceiptBreakdown:
         """Create a Hyperdrive checkpoint.
 
@@ -102,6 +106,8 @@ def create_checkpoint(
             Defaults to the current block number.
         checkpoint_time: int, optional
             The checkpoint time to use. Defaults to the corresponding checkpoint for the provided block_number
+        gas_limit: int | None, optional
+            The maximum amount of gas used by the transaction.
 
         Returns
         -------
@@ -113,6 +119,7 @@ def create_checkpoint(
             sender=sender,
             block_number=block_number,
             checkpoint_time=checkpoint_time,
+            gas_limit=gas_limit,
         )
 
     def set_variable_rate(self, sender: LocalAccount, new_rate: FixedPoint) -> None:

src/agent0/hyperfuzz/system_fuzz/run_local_fuzz_bots.py

@@ -278,7 +278,6 @@ def run_local_fuzz_bots(
                 slippage_tolerance=slippage_tolerance,
                 trade_chance=FixedPoint("0.8"),
                 randomly_ignore_slippage_tolerance=True,
-                gas_limit=int(1e6),  # Plenty of gas limit for transactions
             ),
         )
         agents.append(agent)
@@ -295,7 +294,6 @@ def run_local_fuzz_bots(
                 trade_chance=FixedPoint("0.8"),
                 randomly_ignore_slippage_tolerance=True,
                 max_open_positions=2_000,
-                gas_limit=int(1e6),  # Plenty of gas limit for transactions
             ),
         )
         agents.append(agent)