Update deploy and precompute options

Note the renamed options:

| old                    | new             |
| ---------------------- | --------------- |
| --custom-singleton     | --singleton     |
| --custom-proxy-factory | --proxy-factory |

Also, expand/reword help text for clarity and consistency.

Author: aiman

src/simple_safe/params.py

@@ -287,17 +287,17 @@ def decorator(f: FC) -> FC:
                     "--without-events",
                     is_flag=True,
                     default=False,
-                    help="use implementation that does not emit events",
+                    help="deploy an implementation that does not emit events",
                 ),
                 optgroup.option(
-                    "--custom-singleton",
+                    "--singleton",
                     metavar="ADDRESS",
-                    help=f"use a non-canonical Singleton {DEPLOY_SAFE_VERSION}",
+                    help=f"configure a non-canonical Singleton {DEPLOY_SAFE_VERSION}",
                 ),
                 optgroup.option(
-                    "--custom-proxy-factory",
+                    "--proxy-factory",
                     metavar="ADDRESS",
-                    help=f"use a non-canonical SafeProxyFactory {DEPLOY_SAFE_VERSION}",
+                    help=f"deploy with a non-canonical SafeProxyFactory {DEPLOY_SAFE_VERSION}",
                 ),
                 optgroup.group(
                     "Initialization settings",
@@ -320,7 +320,7 @@ def decorator(f: FC) -> FC:
                 optgroup.option(
                     "--fallback",
                     metavar="ADDRESS",
-                    help="custom Fallback Handler address",
+                    help="set a custom Fallback Handler [default: CompatibilityFallbackHandler]",
                 ),
             ]
         ):

src/simple_safe/safe.py

@@ -881,8 +881,8 @@ def build_safe_call(
 def deploy(
     chain_id: Optional[int],
     chain_specific: bool,
-    custom_proxy_factory: Optional[str],
-    custom_singleton: Optional[str],
+    proxy_factory: Optional[str],
+    singleton: Optional[str],
     fallback: Optional[str],
     force: bool,
     gas_limit: Optional[int],
@@ -929,8 +929,8 @@ def deploy(
         data = validate_deploy_options(
             chain_id=chain_id if chain_specific else None,
             chain_specific=chain_specific,
-            custom_proxy_factory=custom_proxy_factory,
-            custom_singleton=custom_singleton,
+            proxy_factory=proxy_factory,
+            singleton=singleton,
             fallback=fallback,
             owners=owners,
             salt_nonce=salt_nonce,
@@ -1263,8 +1263,8 @@ def inspect(address: str, rpc: str):
 def precompute(
     chain_id: Optional[int],
     chain_specific: bool,
-    custom_proxy_factory: Optional[str],
-    custom_singleton: Optional[str],
+    proxy_factory: Optional[str],
+    singleton: Optional[str],
     fallback: Optional[str],
     output: Optional[typing.TextIO],
     owners: list[str],
@@ -1279,8 +1279,8 @@ def precompute(
     data = validate_deploy_options(
         chain_id=chain_id,
         chain_specific=chain_specific,
-        custom_proxy_factory=custom_proxy_factory,
-        custom_singleton=custom_singleton,
+        proxy_factory=proxy_factory,
+        singleton=singleton,
         fallback=fallback,
         owners=owners,
         salt_nonce=salt_nonce,

src/simple_safe/validation.py

@@ -100,20 +100,20 @@ def validate_deploy_options(
     *,
     chain_id: Optional[int],
     chain_specific: bool,
-    custom_proxy_factory: Optional[str],
-    custom_singleton: Optional[str],
+    proxy_factory: Optional[str],
+    singleton: Optional[str],
     fallback: Optional[str],
     owners: list[str],
     salt_nonce: str,
     threshold: int,
     without_events: bool,
 ) -> DeployParams:
-    if custom_singleton is not None:
+    if singleton is not None:
         if without_events:
             raise click.ClickException(
-                "Option --without-events incompatible with --custom-singleton. "
+                "Option --without-events incompatible with custom --singleton. "
             )
-        singleton_address = custom_singleton
+        singleton_address = singleton
         variant = SafeVariant.UNKNOWN
     elif without_events:
         singleton_address = DEFAULT_SAFE_SINGLETON_ADDRESS
@@ -136,9 +136,7 @@ def validate_deploy_options(
         chain_id = None
     return DeployParams(
         proxy_factory=to_checksum_address(
-            DEFAULT_PROXYFACTORY_ADDRESS
-            if custom_proxy_factory is None
-            else custom_proxy_factory
+            DEFAULT_PROXYFACTORY_ADDRESS if proxy_factory is None else proxy_factory
         ),
         singleton=to_checksum_address(singleton_address),
         chain_id=chain_id,