Fix: replace voucher Manager from cli to use new client service 'vouchers'

Author: 1yam

src/aleph_client/commands/account.py

@@ -9,6 +9,7 @@
 
 import aiohttp
 import typer
+from aleph.sdk import AuthenticatedAlephHttpClient
 from aleph.sdk.account import _load_account
 from aleph.sdk.chains.common import generate_key
 from aleph.sdk.chains.solana import parse_private_key as parse_solana_private_key
@@ -42,7 +43,6 @@
     yes_no_input,
 )
 from aleph_client.utils import AsyncTyper, list_unlinked_keys
-from aleph_client.voucher import VoucherManager
 
 logger = logging.getLogger(__name__)
 app = AsyncTyper(no_args_is_help=True)
@@ -301,8 +301,6 @@ async def balance(
     if account and not address:
         address = account.get_address()
 
-    voucher_manager = VoucherManager(account=account, chain=chain)
-
     if address:
         try:
             balance_data = await get_balance(address)
@@ -335,7 +333,8 @@ async def balance(
             ]
 
             # Get vouchers and add them to Account Info panel
-            vouchers = await voucher_manager.get_all(address=address)
+            async with AuthenticatedAlephHttpClient(account=account) as client:
+                vouchers = await client.voucher.get_vouchers(address=address)
             if vouchers:
                 voucher_names = [voucher.name for voucher in vouchers]
                 infos += [
@@ -422,11 +421,10 @@ async def vouchers(
     if account and not address:
         address = account.get_address()
 
-    voucher_manager = VoucherManager(account=account, chain=chain)
-
     if address:
         try:
-            vouchers = await voucher_manager.get_all(address=address)
+            async with AuthenticatedAlephHttpClient(account=account) as client:
+                vouchers = await client.voucher.get_vouchers(address=address)
             if vouchers:
                 voucher_table = Table(title="", show_header=True, box=box.ROUNDED)
                 voucher_table.add_column("Name", style="bright_cyan")

src/aleph_client/commands/instance/__init__.py

@@ -85,7 +85,6 @@
     yes_no_input,
 )
 from aleph_client.utils import AsyncTyper, sanitize_url
-from aleph_client.voucher import VoucherManager
 
 logger = logging.getLogger(__name__)
 app = AsyncTyper(no_args_is_help=True)
@@ -193,9 +192,7 @@ async def create(
     # Force-switches if NFT payment-type
     nft_chains = [Chain.AVAX, Chain.BASE, Chain.SOL]
     if payment_type == "nft":
-        voucher_manager = VoucherManager(account=account, chain=Chain(account.CHAIN))
         payment_type = PaymentType.hold
-
         if payment_chain is None or payment_chain not in nft_chains:
             if payment_chain:
                 console.print(
@@ -210,11 +207,11 @@ async def create(
                     default=Chain.AVAX.value,
                 )
             )
-
-        vouchers = await voucher_manager.fetch_vouchers_by_chain(payment_chain)
-        if len(vouchers) == 0:
-            console.print("No NFT vouchers find on this account")
-            raise typer.Exit(code=1)
+        async with AuthenticatedAlephHttpClient(account=account) as client:
+            vouchers = await client.voucher.fetch_vouchers_by_chain(chain=Chain(account.CHAIN))
+            if len(vouchers) == 0:
+                console.print("No NFT vouchers find on this account")
+                raise typer.Exit(code=1)
 
     elif payment_type in [ptype.value for ptype in PaymentType]:
         payment_type = PaymentType(payment_type)