Fix: add missing 'address' param on program and file commands (#432)

Author: aliel

src/aleph_client/commands/files.py

@@ -48,18 +48,21 @@ async def pin(
     ] = settings.PRIVATE_KEY_FILE,
     chain: Annotated[Optional[Chain], typer.Option(help=help_strings.ADDRESS_CHAIN)] = None,
     ref: Annotated[Optional[str], typer.Option(help=help_strings.REF)] = None,
+    address: Annotated[Optional[str], typer.Option(help="Address")] = None,
     debug: Annotated[bool, typer.Option()] = False,
 ):
     """Persist a file from IPFS on Aleph Cloud."""
 
     setup_logging(debug)
 
     account: AccountTypes = load_account(private_key_str=private_key, private_key_file=private_key_file, chain=chain)
+    address = address or settings.ADDRESS_TO_USE or account.get_address()
 
     async with AuthenticatedAlephHttpClient(account=account, api_server=settings.API_HOST) as client:
         result: StoreMessage
         status: MessageStatus
         result, status = await client.create_store(
+            address=address,
             file_hash=item_hash,
             storage_engine=StorageEnum.ipfs,
             channel=channel,
@@ -80,20 +83,22 @@ async def upload(
     ] = settings.PRIVATE_KEY_FILE,
     chain: Annotated[Optional[Chain], typer.Option(help=help_strings.ADDRESS_CHAIN)] = None,
     ref: Annotated[Optional[str], typer.Option(help=help_strings.REF)] = None,
+    address: Annotated[Optional[str], typer.Option(help="Address")] = None,
     debug: Annotated[bool, typer.Option()] = False,
 ):
     """Upload and store a file or directory on Aleph Cloud."""
 
     setup_logging(debug)
 
     account: AccountTypes = load_account(private_key_str=private_key, private_key_file=private_key_file, chain=chain)
+    address = address or settings.ADDRESS_TO_USE or account.get_address()
 
     async with AuthenticatedAlephHttpClient(account=account, api_server=settings.API_HOST) as client:
 
-        async def check_spending_capacity_for_account(storage_size_mib: float, account: AccountTypes):
+        async def check_spending_capacity_for_account(storage_size_mib: float, address):
             # estimate and check before uploading
             content = {
-                "address": account.get_address(),
+                "address": address,
                 "time": time.time(),
                 "item_type": ItemType.storage,
                 "estimated_size_mib": int(storage_size_mib),
@@ -111,7 +116,7 @@ async def check_spending_capacity_for_account(storage_size_mib: float, account:
                 price = await response.json()
                 required_tokens = price["required_tokens"] if price["cost"] is None else Decimal(price["cost"])
 
-                balance_response = await client.get_balances(account.get_address())
+                balance_response = await client.get_balances(address)
                 available_funds = balance_response.balance - balance_response.locked_amount
 
                 try:
@@ -129,7 +134,7 @@ async def check_spending_capacity_for_account(storage_size_mib: float, account:
                 file_size = len(file_content)
 
                 # check spending limit
-                await check_spending_capacity_for_account(file_size / 1_024 / 1_024, account)
+                await check_spending_capacity_for_account(file_size / 1_024 / 1_024, address)
 
                 storage_limit = 4 * 1024 * 1024  # 4MB
                 if storage_engine is None:
@@ -143,6 +148,7 @@ async def check_spending_capacity_for_account(storage_size_mib: float, account:
                 status: MessageStatus
                 try:
                     result, status = await client.create_store(
+                        address=address,
                         file_content=file_content,
                         storage_engine=storage_engine,
                         channel=channel,
@@ -193,12 +199,12 @@ async def upload_directory(directory: Path):
                 if fp.is_file():
                     total_size += fp.stat().st_size
 
-            await check_spending_capacity_for_account(total_size / 1_024 / 1_024, account)
+            await check_spending_capacity_for_account(total_size / 1_024 / 1_024, address)
             cid = await upload_directory(path)
             if not cid:
                 typer.echo("CID not found in response.")
                 typer.Exit(code=1)
-            await pin(cid, channel, private_key, private_key_file, chain, ref, debug)
+            await pin(cid, channel, private_key, private_key_file, chain, ref, address, debug)
         else:
             typer.echo(f"Error: File not found: '{path}'")
             raise typer.Exit(code=1)

src/aleph_client/commands/program.py

@@ -162,6 +162,7 @@ async def upload(
             user_code: StoreMessage
             status: MessageStatus
             user_code, status = await client.create_store(
+                address=address,
                 file_content=file_content,
                 storage_engine=storage_engine,
                 channel=channel,
@@ -330,6 +331,7 @@ async def update(
     ] = settings.PRIVATE_KEY_FILE,
     print_message: Annotated[bool, typer.Option(help="Print the message after creation")] = False,
     verbose: Annotated[bool, typer.Option(help="Display additional information")] = True,
+    address: Annotated[Optional[str], typer.Option(help=help_strings.ADDRESS_PAYER)] = None,
     debug: Annotated[bool, typer.Option(help="Enable debug logging")] = False,
 ):
     """Update the code of an existing program (item hash will not change)"""
@@ -348,6 +350,7 @@ async def update(
         raise typer.Exit(code=4) from error
 
     account = _load_account(private_key, private_key_file, chain=chain)
+    address = address or settings.ADDRESS_TO_USE or account.get_address()
 
     async with AuthenticatedAlephHttpClient(account=account, api_server=settings.API_HOST) as client:
         try:
@@ -386,6 +389,7 @@ async def update(
             logger.debug("Uploading file")
             message: StoreMessage
             message, status = await client.create_store(
+                address=address,
                 file_content=file_content,
                 storage_engine=StorageEnum(code_message.content.item_type),
                 channel=code_message.channel,