diff --git a/deployment/params.py b/deployment/params.py index e91e85e5..0c1b9a21 100644 --- a/deployment/params.py +++ b/deployment/params.py @@ -480,15 +480,15 @@ class Transactor: Represents an ape account plus validated/annotated transaction execution. """ - def __init__(self, account: typing.Optional[AccountAPI] = None, non_interactive: bool = False): - if non_interactive and not account: - raise ValueError("'non_interactive' can only be used if an account is provided") - - self._non_interactive = non_interactive + def __init__(self, account: typing.Optional[AccountAPI] = None, autosign: bool = False): if account is None: self._account = select_account() else: self._account = account + if autosign: + print("WARNING: Autosign is enabled. Transactions will be signed automatically.") + self._autosign = autosign + self._account.set_autosign(autosign) def get_account(self) -> AccountAPI: """Returns the transactor account.""" @@ -506,8 +506,7 @@ def transact(self, method: ContractTransactionHandler, *args) -> ReceiptAPI: else: message = f"{base_message} with no arguments" print(message) - - if not self._non_interactive: + if not self._autosign: _continue() result = method( @@ -534,9 +533,9 @@ def __init__( path: Path, verify: bool, account: typing.Optional[AccountAPI] = None, - non_interactive: bool = False, + autosign: bool = False, ): - super().__init__(account, non_interactive) + super().__init__(account, autosign) check_plugins() self.path = path @@ -554,7 +553,7 @@ def __init__( self.verify = verify self._print_deployment_info() - if not self._non_interactive: + if not self._autosign: # Confirms the start of the deployment. _continue() @@ -597,7 +596,7 @@ def _deploy_contract( self, container: ContractContainer, resolved_params: OrderedDict ) -> ContractInstance: contract_name = container.contract_type.name - if not self._non_interactive: + if not self._autosign: _confirm_resolution(resolved_params, contract_name) deployment_params = [container, *resolved_params.values()] kwargs = self._get_kwargs() diff --git a/scripts/initiate_ritual.py b/scripts/initiate_ritual.py index a5c6b9b4..3e094835 100644 --- a/scripts/initiate_ritual.py +++ b/scripts/initiate_ritual.py @@ -72,6 +72,10 @@ help="The filepath of a file containing newline separated staking provider addresses.", type=click.File("r"), ) +@click.option( + "--autosign", + is_flag=True, +) def cli( domain, account, @@ -84,6 +88,7 @@ def cli( random_seed, handpicked, min_version, + autosign, ): """Initiate a ritual for a TACo domain.""" @@ -147,7 +152,7 @@ def cli( ) # Initiate the ritual - transactor = Transactor(account=account) + transactor = Transactor(account=account, autosign=autosign) transactor.transact( coordinator_contract.initiateRitual, fee_model_contract.address,