diff --git a/nucypher/config/characters.py b/nucypher/config/characters.py index 9f87e8c8e..efda59a9f 100644 --- a/nucypher/config/characters.py +++ b/nucypher/config/characters.py @@ -101,19 +101,17 @@ class UrsulaConfiguration(NodeConfiguration): password: str, encrypting: bool = True, wallet: bool = True, + **generation_kwargs, ) -> NucypherKeyring: - host = self.rest_host - tls_curve = self.tls_curve + generation_kwargs["rest"] = True + generation_kwargs["host"] = self.rest_host + generation_kwargs["curve"] = self.tls_curve - self.keyring = NucypherKeyring.generate(password=password, - encrypting=encrypting, - wallet=wallet, - rest=True, - host=host, - # checksum_address=checksum_address, # TODO: Do we actually want to allow passing this? Or force the use of the new address that comes from the wallet being created? - curve=tls_curve, - keyring_root=self.keyring_dir) + return super().write_keyring(password=password, + encrypting=True, + wallet=True, + **generation_kwargs) class AliceConfiguration(NodeConfiguration): diff --git a/nucypher/config/node.py b/nucypher/config/node.py index e95f1c25f..b9fa4b5a4 100644 --- a/nucypher/config/node.py +++ b/nucypher/config/node.py @@ -559,12 +559,14 @@ class NodeConfiguration(ABC): password: str, encrypting: bool = True, wallet: bool = False, + **generation_kwargs, ) -> NucypherKeyring: self.keyring = NucypherKeyring.generate(password=password, encrypting=encrypting, wallet=wallet, - keyring_root=self.keyring_dir) + keyring_root=self.keyring_dir, + **generation_kwargs) # TODO: Operating mode switch #466 if self.federated_only or not wallet: