Merge branch 'main' into aliel-fix-cosmos

Author: nesitor

.github/workflows/build-wheels.yml

@@ -41,8 +41,7 @@ jobs:
         if: startsWith(matrix.os, 'macos-')
         run: |
           brew update
-          brew tap cuber/homebrew-libsecp256k1
-          brew install libsecp256k1
+          brew install secp256k1
 
       - name: Install required system packages only for Ubuntu Linux
         if: startsWith(matrix.os, 'ubuntu-')

.github/workflows/pytest.yml

@@ -6,18 +6,15 @@ on:
     branches:
       - main
   schedule:
-    # Run every night at 04:00 (GitHub Actions timezone)
-    # in order to catch when unfrozen dependency updates
-    # break the use of the library.
     - cron: '4 0 * * *'
 
 jobs:
   tests:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ "3.9", "3.10", "3.11", "3.12" ]
-        os: [ubuntu-22.04, ubuntu-24.04]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        os: [ubuntu-22.04, ubuntu-24.04, macos-14, macos-15]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -26,15 +23,24 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - run: |
+      - name: "apt-get install"
+        run: |
           sudo apt-get update
-          sudo apt-get install -y python3-pip libsodium-dev
+          sudo apt-get install -y python3-pip libsodium-dev libgmp-dev
+        if: runner.os == 'Linux'
 
       - run: |
+          brew install libsodium
+          echo "DYLD_LIBRARY_PATH=$(brew --prefix libsodium)/lib" >> $GITHUB_ENV
+        if: runner.os == 'macOS'
+
+      - name: "Install Hatch"
+        run: |
           python3 -m venv /tmp/venv
           /tmp/venv/bin/python -m pip install --upgrade pip hatch coverage
 
-      - run: |
+      - name: "Run Tests"
+        run: |
           /tmp/venv/bin/pip freeze
           /tmp/venv/bin/hatch run testing:pip freeze
           /tmp/venv/bin/hatch run testing:test

README.md

@@ -21,8 +21,7 @@ Using some chains may also require installing `libgmp3-dev`.
 ### macOs
 This project does not support Python 3.12 on macOS. Please use Python 3.11 instead.
 ```shell
-$ brew tap cuber/homebrew-libsecp256k1
-$ brew install libsecp256k1
+$ brew install secp256k1
 ```
 
 ## Installation

pyproject.toml

@@ -30,18 +30,20 @@ dynamic = [ "version" ]
 dependencies = [
   "aiohttp>=3.8.3",
   "aioresponses>=0.7.6",
-  "aleph-message>=0.6",
-  "aleph-superfluid>=0.2.1",
+  "aleph-message>=1.0.4",
+  "aleph-superfluid>=0.3",
   "base58==2.1.1",                         # Needed now as default with _load_account changement
-  "coincurve; python_version<'3.11'",
-  "coincurve>=19; python_version>='3.11'",
-  "eth-abi>=4; python_version>='3.11'",
-  "eth-typing==4.3.1",
+  "coincurve; python_version>='3.9'",
+  "coincurve>=19; python_version>='3.9'",
+  "eth-abi>=5.0.1; python_version>='3.9'",
+  "eth-typing>=5.0.1",
   "jwcrypto==1.5.6",
+  "pydantic>=2,<3",
+  "pydantic-settings>=2",
   "pynacl==1.5",                           # Needed now as default with _load_account changement
   "python-magic",
   "typing-extensions",
-  "web3==6.3",
+  "web3>=7.10",
 ]
 
 optional-dependencies.all = [
@@ -80,8 +82,7 @@ optional-dependencies.substrate = [
   "substrate-interface",
 ]
 optional-dependencies.tezos = [
-  "aleph-pytezos==3.13.4",
-  "pynacl",
+  "pytezos-crypto==3.13.4.1",
 ]
 urls.Documentation = "https://aleph.im/"
 urls.Homepage = "https://github.com/aleph-im/aleph-sdk-python"

src/aleph/sdk/account.py

@@ -12,6 +12,7 @@
 from aleph.sdk.chains.remote import RemoteAccount
 from aleph.sdk.chains.solana import SOLAccount
 from aleph.sdk.chains.substrate import DOTAccount
+from aleph.sdk.chains.svm import SVMAccount
 from aleph.sdk.conf import load_main_configuration, settings
 from aleph.sdk.evm_utils import get_chains_with_super_token
 from aleph.sdk.types import AccountFromPrivateKey
@@ -22,21 +23,29 @@
 
 chain_account_map: Dict[Chain, Type[T]] = {  # type: ignore
     Chain.ARBITRUM: EVMAccount,
+    Chain.AURORA: EVMAccount,
     Chain.AVAX: ETHAccount,
     Chain.BASE: ETHAccount,
     Chain.BLAST: EVMAccount,
     Chain.BOB: EVMAccount,
+    Chain.BSC: EVMAccount,
     Chain.CYBER: EVMAccount,
     Chain.DOT: DOTAccount,
+    Chain.ECLIPSE: SVMAccount,
     Chain.ETH: ETHAccount,
     Chain.FRAXTAL: EVMAccount,
+    Chain.INK: EVMAccount,
     Chain.LINEA: EVMAccount,
     Chain.LISK: EVMAccount,
     Chain.METIS: EVMAccount,
     Chain.MODE: EVMAccount,
+    Chain.NEO: EVMAccount,
     Chain.OPTIMISM: EVMAccount,
     Chain.POL: EVMAccount,
     Chain.SOL: SOLAccount,
+    Chain.SOMNIA: EVMAccount,
+    Chain.SONIC: EVMAccount,
+    Chain.UNICHAIN: EVMAccount,
     Chain.WORLDCHAIN: EVMAccount,
     Chain.ZORA: EVMAccount,
     Chain.CSDK: CSDKAccount,

src/aleph/sdk/chains/common.py

@@ -73,6 +73,7 @@ async def sign_message(self, message: Dict) -> Dict:
         message = self._setup_sender(message)
         signature = await self.sign_raw(get_verification_buffer(message))
         message["signature"] = signature.hex()
+
         return message
 
     @abstractmethod

src/aleph/sdk/chains/ethereum.py

@@ -2,7 +2,7 @@
 import base64
 from decimal import Decimal
 from pathlib import Path
-from typing import Awaitable, Optional, Union
+from typing import Awaitable, Dict, Optional, Union
 
 from aleph_message.models import Chain
 from eth_account import Account  # type: ignore
@@ -11,7 +11,8 @@
 from eth_keys.exceptions import BadSignature as EthBadSignatureError
 from superfluid import Web3FlowInfo
 from web3 import Web3
-from web3.middleware import geth_poa_middleware
+from web3.exceptions import ContractCustomError
+from web3.middleware import ExtraDataToPOAMiddleware
 from web3.types import TxParams, TxReceipt
 
 from aleph.sdk.exceptions import InsufficientFundsError
@@ -21,7 +22,6 @@
 from ..connectors.superfluid import Superfluid
 from ..evm_utils import (
     BALANCEOF_ABI,
-    MIN_ETH_BALANCE,
     MIN_ETH_BALANCE_WEI,
     FlowUpdate,
     from_wei_token,
@@ -80,6 +80,22 @@ async def sign_raw(self, buffer: bytes) -> bytes:
         sig = self._account.sign_message(msghash)
         return sig["signature"]
 
+    async def sign_message(self, message: Dict) -> Dict:
+        """
+        Returns a signed message from an aleph.im message.
+        Args:
+            message: Message to sign
+        Returns:
+            Dict: Signed message
+        """
+        signed_message = await super().sign_message(message)
+
+        # Apply that fix as seems that sometimes the .hex() method doesn't add the 0x str at the beginning
+        if not str(signed_message["signature"]).startswith("0x"):
+            signed_message["signature"] = "0x" + signed_message["signature"]
+
+        return signed_message
+
     def connect_chain(self, chain: Optional[Chain] = None):
         self.chain = chain
         if self.chain:
@@ -88,7 +104,7 @@ def connect_chain(self, chain: Optional[Chain] = None):
             self._provider = Web3(Web3.HTTPProvider(self.rpc))
             if chain == Chain.BSC:
                 self._provider.middleware_onion.inject(
-                    geth_poa_middleware, "geth_poa", layer=0
+                    ExtraDataToPOAMiddleware, "geth_poa", layer=0
                 )
         else:
             self.chain_id = None
@@ -103,14 +119,34 @@ def connect_chain(self, chain: Optional[Chain] = None):
     def switch_chain(self, chain: Optional[Chain] = None):
         self.connect_chain(chain=chain)
 
-    def can_transact(self, block=True) -> bool:
-        balance = self.get_eth_balance()
-        valid = balance > MIN_ETH_BALANCE_WEI if self.chain else False
+    def can_transact(self, tx: TxParams, block=True) -> bool:
+        balance_wei = self.get_eth_balance()
+        try:
+            assert self._provider is not None
+
+            estimated_gas = self._provider.eth.estimate_gas(tx)
+
+            gas_price = tx.get("gasPrice", self._provider.eth.gas_price)
+
+            if "maxFeePerGas" in tx:
+                max_fee = tx["maxFeePerGas"]
+                total_fee_wei = estimated_gas * max_fee
+            else:
+                total_fee_wei = estimated_gas * gas_price
+
+            total_fee_wei = int(total_fee_wei * 1.2)
+
+        except ContractCustomError:
+            total_fee_wei = MIN_ETH_BALANCE_WEI  # Fallback if estimation fails
+
+        required_fee_wei = total_fee_wei + (tx.get("value", 0))
+
+        valid = balance_wei > required_fee_wei if self.chain else False
         if not valid and block:
             raise InsufficientFundsError(
                 token_type=TokenType.GAS,
-                required_funds=MIN_ETH_BALANCE,
-                available_funds=float(from_wei_token(balance)),
+                required_funds=float(from_wei_token(required_fee_wei)),
+                available_funds=float(from_wei_token(balance_wei)),
             )
         return valid
 
@@ -120,15 +156,15 @@ async def _sign_and_send_transaction(self, tx_params: TxParams) -> str:
         @param tx_params - Transaction parameters
         @returns - str - Transaction hash
         """
-        self.can_transact()
 
         def sign_and_send() -> TxReceipt:
             if self._provider is None:
                 raise ValueError("Provider not connected")
             signed_tx = self._provider.eth.account.sign_transaction(
                 tx_params, self._account.key
             )
-            tx_hash = self._provider.eth.send_raw_transaction(signed_tx.rawTransaction)
+
+            tx_hash = self._provider.eth.send_raw_transaction(signed_tx.raw_transaction)
             tx_receipt = self._provider.eth.wait_for_transaction_receipt(
                 tx_hash, settings.TX_TIMEOUT
             )

src/aleph/sdk/chains/svm.py

@@ -0,0 +1,13 @@
+from typing import Optional
+
+from aleph_message.models import Chain
+
+from .solana import SOLAccount
+
+
+class SVMAccount(SOLAccount):
+    def __init__(self, private_key: bytes, chain: Optional[Chain] = None):
+        super().__init__(private_key=private_key)
+        # Same as EVM ACCOUNT need to decided if we want to send the specified chain or always use SOL
+        if chain:
+            self.CHAIN = chain

src/aleph/sdk/chains/tezos.py

@@ -2,9 +2,9 @@
 from pathlib import Path
 from typing import Dict, Optional, Union
 
-from aleph_pytezos.crypto.key import Key
 from nacl.public import SealedBox
 from nacl.signing import SigningKey
+from pytezos_crypto.key import Key
 
 from .common import BaseAccount, get_fallback_private_key, get_verification_buffer