Add poll_interval parameter to ContractManager

Author: bigspider

matt/__init__.py

@@ -305,10 +305,11 @@ def __repr__(self):
 
 
 class ContractManager:
-    def __init__(self, contract_instances: list[ContractInstance], rpc: AuthServiceProxy, *, mine_automatically=False):
+    def __init__(self, contract_instances: list[ContractInstance], rpc: AuthServiceProxy, *, poll_interval: float = 1, mine_automatically: bool = False):
         self.instances = contract_instances
         self.mine_automatically = mine_automatically
         self.rpc = rpc
+        self.poll_interval = poll_interval
 
     def _check_instance(self, instance: ContractInstance, exp_statuses: None | ContractInstanceStatus | list[ContractInstanceStatus] = None):
         if exp_statuses is not None:
@@ -337,7 +338,7 @@ def wait_for_outpoint(self, instance: ContractInstance, txid: str | None = None)
         if self.mine_automatically:
             self._mine_blocks(1)
 
-        instance.outpoint, instance.last_height = wait_for_output(self.rpc, scriptPubKey, txid=txid)
+        instance.outpoint, instance.last_height = wait_for_output(self.rpc, scriptPubKey, txid=txid, poll_interval=self.poll_interval)
 
         funding_tx_raw = self.rpc.getrawtransaction(instance.outpoint.hash.to_bytes(32, byteorder="big").hex())
         funding_tx = CTransaction()
@@ -486,7 +487,8 @@ def wait_for_spend(self, instances: ContractInstance | list[ContractInstance]) -
             tx, vin, instance.last_height = wait_for_spending_tx(
                 self.rpc,
                 instance.outpoint,
-                starting_height=instance.last_height
+                starting_height=instance.last_height,
+                poll_interval = self.poll_interval
             )
             tx.rehash()
 

matt/utils.py

@@ -34,7 +34,7 @@ def encode_wit_element(x: bytes | int) -> bytes:
 def wait_for_output(
     rpc_connection: AuthServiceProxy,
     script_pub_key: bytes,
-    poll_interval=1,
+    poll_interval: float = 1,
     starting_height: Optional[int] = None,
     txid: Optional[str] = None,
     min_amount: Optional[int] = None
@@ -78,7 +78,7 @@ def wait_for_output(
         time.sleep(poll_interval)
 
 
-def wait_for_spending_tx(rpc_connection: AuthServiceProxy, outpoint: COutPoint, poll_interval=1, starting_height: Optional[int] = None) -> Tuple[CTransaction, int, int]:
+def wait_for_spending_tx(rpc_connection: AuthServiceProxy, outpoint: COutPoint, poll_interval: float = 1, starting_height: Optional[int] = None) -> Tuple[CTransaction, int, int]:
     # Initialize the last block height using the provided starting_height or the current block height
     last_block_height = max(starting_height - 1, 0) if starting_height is not None else rpc_connection.getblockcount()