diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index f572e100..073cb46c 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12, macos-13, macos-14, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04] + os: [macos-13, macos-14, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04] runs-on: ${{matrix.os}} steps: diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index 8373e64c..0439f16e 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12, macos-13, macos-14, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04] + os: [macos-13, macos-14, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04] runs-on: ${{matrix.os}} steps: diff --git a/pyproject.toml b/pyproject.toml index c5b79000..60db63d8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,14 +33,16 @@ dynamic = [ "version" ] dependencies = [ "aiodns==3.2", "aiohttp==3.10.6", - "aleph-message>=0.4.9", - "aleph-sdk-python>=1.1,<2", - "base58==2.1.1", # Needed now as default with _load_account changement + "aleph-message>=0.5", + "aleph-sdk-python>=1.2,<2", + "base58==2.1.1", # Needed now as default with _load_account changement + "py-sr25519-bindings==0.2", # Needed for DOT signatures "pygments==2.18", - "pynacl==1.5", # Needed now as default with _load_account changement + "pynacl==1.5", # Needed now as default with _load_account changement "python-magic==0.4.27", "rich==13.8.1", "setuptools>=65.5", + "substrate-interface==1.7.11", # Needed for DOT signatures "textual==0.73", "typer==0.12.5", ] diff --git a/src/aleph_client/commands/account.py b/src/aleph_client/commands/account.py index 0e2d8db1..da7f890d 100644 --- a/src/aleph_client/commands/account.py +++ b/src/aleph_client/commands/account.py @@ -16,7 +16,11 @@ save_main_configuration, settings, ) -from aleph.sdk.evm_utils import get_chains_with_holding, get_chains_with_super_token +from aleph.sdk.evm_utils import ( + get_chains_with_holding, + get_chains_with_super_token, + get_compatible_chains, +) from aleph.sdk.utils import bytes_from_hex from aleph_message.models import Chain from rich.console import Console @@ -149,11 +153,14 @@ def display_active_chain(): if config and config.chain: active_chain = config.chain - hold_chains = get_chains_with_holding() + ["SOL"] + compatible_chains = get_compatible_chains() + hold_chains = get_chains_with_holding() + [Chain.SOL.value] payg_chains = get_chains_with_super_token() chain = f"[bold green]{active_chain}[/bold green]" if active_chain else "[red]Not Selected[/red]" active_chain_compatibility, compatibility = [], "" + if active_chain in compatible_chains: + active_chain_compatibility.append("SIGN") if active_chain in hold_chains: active_chain_compatibility.append("HOLD") if active_chain in payg_chains: @@ -295,7 +302,7 @@ async def list_accounts(): if key_file.stem != "default": table.add_row(key_file.stem, str(key_file), "[bold red]-[/bold red]") - hold_chains = get_chains_with_holding() + ["SOL"] + hold_chains = get_chains_with_holding() + [Chain.SOL.value] payg_chains = get_chains_with_super_token() active_address = None diff --git a/src/aleph_client/commands/instance/__init__.py b/src/aleph_client/commands/instance/__init__.py index 4189698e..9ba71870 100644 --- a/src/aleph_client/commands/instance/__init__.py +++ b/src/aleph_client/commands/instance/__init__.py @@ -164,7 +164,7 @@ async def create( raise ValueError(f"Invalid payment-type: {payment_type}") is_stream = payment_type != PaymentType.hold - hold_chains = get_chains_with_holding() + [Chain.SOL] + hold_chains = get_chains_with_holding() + [Chain.SOL.value] super_token_chains = get_chains_with_super_token() # Checks if payment-chain is compatible with PAYG