Merge branch 'main' into 1yam-download_ipfs-rebased

1yam · web-flow · commit b3e9f1d83852 · 2023-07-12T15:32:29.000+02:00
diff --git a/docker/python-3.10.dockerfile b/docker/python-3.10.dockerfile
@@ -20,7 +20,7 @@ RUN pip install --upgrade pip wheel twine
 
 # Preinstall dependencies for faster steps
 RUN pip install --upgrade secp256k1 coincurve aiohttp eciespy python-magic typer
-RUN pip install --upgrade 'aleph-message~=0.3.1' eth_account pynacl base58
+RUN pip install --upgrade 'aleph-message~=0.4.0' eth_account pynacl base58
 RUN pip install --upgrade pytest pytest-cov pytest-asyncio mypy types-setuptools pytest-asyncio fastapi httpx requests
 
 WORKDIR /opt/aleph-sdk-python/
diff --git a/docker/python-3.11.dockerfile b/docker/python-3.11.dockerfile
@@ -20,7 +20,7 @@ RUN pip install --upgrade pip wheel twine
 
 # Preinstall dependencies for faster steps
 RUN pip install --upgrade secp256k1 coincurve aiohttp eciespy python-magic typer
-RUN pip install --upgrade 'aleph-message~=0.3.1' pynacl base58
+RUN pip install --upgrade 'aleph-message~=0.4.0' pynacl base58
 RUN pip install --upgrade pytest pytest-cov pytest-asyncio mypy types-setuptools pytest-asyncio fastapi httpx requests
 
 WORKDIR /opt/aleph-sdk-python/
diff --git a/docker/python-3.9.dockerfile b/docker/python-3.9.dockerfile
@@ -20,7 +20,7 @@ RUN pip install --upgrade pip wheel twine
 
 # Preinstall dependencies for faster steps
 RUN pip install --upgrade secp256k1 coincurve aiohttp eciespy python-magic typer
-RUN pip install --upgrade 'aleph-message~=0.3.1' eth_account pynacl base58
+RUN pip install --upgrade 'aleph-message~=0.4.0' eth_account pynacl base58
 RUN pip install --upgrade pytest pytest-cov pytest-asyncio mypy types-setuptools pytest-asyncio fastapi httpx requests
 
 WORKDIR /opt/aleph-sdk-python/
diff --git a/docker/ubuntu-20.04.dockerfile b/docker/ubuntu-20.04.dockerfile
@@ -25,7 +25,7 @@ RUN pip install --upgrade pip wheel twine
 
 # Preinstall dependencies for faster steps
 RUN pip install --upgrade secp256k1 coincurve aiohttp eciespy python-magic typer
-RUN pip install --upgrade 'aleph-message~=0.3.1' eth_account pynacl base58
+RUN pip install --upgrade 'aleph-message~=0.4.0' eth_account pynacl base58
 RUN pip install --upgrade pytest pytest-cov pytest-asyncio mypy types-setuptools pytest-asyncio fastapi httpx requests
 
 WORKDIR /opt/aleph-sdk-python/
diff --git a/docker/ubuntu-22.04.dockerfile b/docker/ubuntu-22.04.dockerfile
@@ -25,7 +25,7 @@ RUN pip install --upgrade pip wheel twine
 
 # Preinstall dependencies for faster steps
 RUN pip install --upgrade secp256k1 coincurve aiohttp eciespy python-magic typer
-RUN pip install --upgrade 'aleph-message~=0.3.1' eth_account pynacl base58
+RUN pip install --upgrade 'aleph-message~=0.4.0' eth_account pynacl base58
 RUN pip install --upgrade pytest pytest-cov pytest-asyncio mypy types-setuptools pytest-asyncio fastapi httpx requests
 
 WORKDIR /opt/aleph-sdk-python/
diff --git a/scripts/build-and-shell.sh b/scripts/build-and-shell.sh
@@ -10,5 +10,5 @@ else
   DOCKER_COMMAND=docker
 fi
 
-$DOCKER_COMMAND build -t aleph-sdk-python -f docker/Dockerfile .
+$DOCKER_COMMAND build -t aleph-sdk-python -f docker/python-3.9.dockerfile .
 $DOCKER_COMMAND run -ti --rm --entrypoint /bin/bash -v "$(pwd)":/opt/aleph-sdk-python aleph-sdk-python
diff --git a/scripts/build-and-test.sh b/scripts/build-and-test.sh
@@ -10,6 +10,6 @@ else
   DOCKER_COMMAND=docker
 fi
 
-$DOCKER_COMMAND build -t aleph-sdk-python -f docker/Dockerfile .
+$DOCKER_COMMAND build -t aleph-sdk-python -f docker/python-3.9.dockerfile .
 $DOCKER_COMMAND run -ti --rm --entrypoint /opt/venv/bin/pytest aleph-sdk-python /opt/aleph-sdk-python/ "$@"
 $DOCKER_COMMAND run -ti --rm --entrypoint /opt/venv/bin/mypy aleph-sdk-python /opt/aleph-sdk-python/src/ --ignore-missing-imports
diff --git a/scripts/build-to-publish.sh b/scripts/build-to-publish.sh
@@ -13,7 +13,7 @@ fi
 mkdir -p ./dist
 chmod 0777 ./dist
 
-$DOCKER_COMMAND build -t aleph-sdk-python -f docker/Dockerfile .
+$DOCKER_COMMAND build -t aleph-sdk-python -f docker/python-3.9.dockerfile .
 $DOCKER_COMMAND run -ti --rm \
   -w /opt/aleph-sdk-python \
   -v "$(pwd)/dist":/opt/aleph-sdk-python/dist \
diff --git a/setup.cfg b/setup.cfg
@@ -38,7 +38,7 @@ install_requires =
     eciespy>=0.3.13; python_version>="3.11"
     typing_extensions
     typer
-    aleph-message~=0.3.2
+    aleph-message==0.4.0
     eth_account>=0.4.0
     # Required to fix a dependency issue with parsimonious and Python3.11
     eth_abi==4.0.0b2; python_version>="3.11"
@@ -59,7 +59,7 @@ exclude =
 # PDF = ReportLab; RXP
 # Add here test requirements (semicolon/line-separated)
 testing =
-    aiomqtt
+    aiomqtt<=0.1.3
     psutil
     pytest
     pytest-cov
@@ -80,12 +80,11 @@ testing =
     isort
     flake8
 mqtt =
-    aiomqtt
+    aiomqtt<=0.1.3
     certifi
     Click
 nuls2 =
-    # use the branch with support for Python 3.11
-    nuls2-python@git+https://github.com/odesenfans/nuls2-python.git@fda2ba4a5f9397f4f84cfee738942c4a15f88840
+    aleph-nuls2
 ethereum =
     eth_account>=0.4.0
     # Required to fix a dependency issue with parsimonious and Python3.11
diff --git a/src/aleph/sdk/chains/common.py b/src/aleph/sdk/chains/common.py
@@ -1,3 +1,4 @@
+import logging
 from abc import ABC, abstractmethod
 from pathlib import Path
 from typing import Dict, Optional
@@ -6,11 +7,11 @@
 from ecies import decrypt, encrypt
 
 from aleph.sdk.conf import settings
-
-import logging
+from aleph.sdk.utils import enum_as_str
 
 logger = logging.getLogger(__name__)
 
+
 def get_verification_buffer(message: Dict) -> bytes:
     """
     Returns the verification buffer that Aleph nodes use to verify the signature of a message.
@@ -22,7 +23,16 @@ def get_verification_buffer(message: Dict) -> bytes:
     Returns:
         bytes: Verification buffer
     """
-    return "{chain}\n{sender}\n{type}\n{item_hash}".format(**message).encode("utf-8")
+
+    # Convert Enum values to strings
+    return "\n".join(
+        (
+            enum_as_str(message["chain"]),
+            message["sender"],
+            enum_as_str(message["type"]),
+            message["item_hash"],
+        )
+    ).encode()
 
 
 def get_public_key(private_key):
diff --git a/src/aleph/sdk/client.py b/src/aleph/sdk/client.py
@@ -34,15 +34,16 @@
     ForgetMessage,
     ItemHash,
     ItemType,
-    Message,
     MessageType,
     PostContent,
     PostMessage,
+    ProgramContent,
     ProgramMessage,
     StoreContent,
     StoreMessage,
+    parse_message,
 )
-from aleph_message.models.program import Encoding, ProgramContent
+from aleph_message.models.execution.base import Encoding
 from aleph_message.status import MessageStatus
 from pydantic import ValidationError, BaseModel
 
@@ -454,7 +455,7 @@ class AlephClient:
 
     def __init__(
         self,
-        api_server: Optional[str],
+        api_server: Optional[str] = None,
         api_unix_socket: Optional[str] = None,
         allow_unix_sockets: bool = True,
         timeout: Optional[aiohttp.ClientTimeout] = None,
@@ -784,7 +785,7 @@ async def get_messages(
             messages: List[AlephMessage] = []
             for message_raw in messages_raw:
                 try:
-                    message = Message(**message_raw)
+                    message = parse_message(message_raw)
                     messages.append(message)
                 except KeyError as e:
                     if not ignore_invalid_messages:
@@ -906,7 +907,7 @@ async def watch_messages(
                         break
                     else:
                         data = json.loads(msg.data)
-                        yield Message(**data)
+                        yield parse_message(data)
                 elif msg.type == aiohttp.WSMsgType.ERROR:
                     break
 
@@ -1458,7 +1459,7 @@ async def _prepare_aleph_message(
                 message_dict["item_type"] = ItemType.storage
 
         message_dict = await self.account.sign_message(message_dict)
-        return Message(**message_dict)
+        return parse_message(message_dict)
 
     async def submit(
         self,
diff --git a/src/aleph/sdk/utils.py b/src/aleph/sdk/utils.py
@@ -1,13 +1,14 @@
 import errno
 import logging
 import os
+from enum import Enum
 from pathlib import Path
 from shutil import make_archive
-from typing import Tuple, Type
+from typing import Tuple, Type, Union
 from zipfile import BadZipFile, ZipFile
 
 from aleph_message.models import MessageType
-from aleph_message.models.program import Encoding
+from aleph_message.models.execution.program import Encoding
 
 from aleph.sdk.conf import settings
 from aleph.sdk.types import GenericMessage
@@ -84,7 +85,6 @@ def check_unix_socket_valid(unix_socket_path: str) -> bool:
         )
     return True
 
-
 T = TypeVar("T", str, bytes, covariant=True)
 U = TypeVar("U", str, bytes, contravariant=True)
 
@@ -107,3 +107,18 @@ async def copy_async_readable_to_buffer(
         if not chunk:
             break
         buffer.write(chunk)
+
+
+def enum_as_str(obj: Union[str, Enum]) -> str:
+    """Returns the value of an Enum, or the string itself when passing a string.
+
+    Python 3.11 adds a new formatting of string enums.
+    `str(MyEnum.value)` becomes `MyEnum.value` instead of `value`.
+    """
+    if not isinstance(obj, str):
+        raise TypeError(f"Unsupported enum type: {type(obj)}")
+
+    if isinstance(obj, Enum):
+        return obj.value
+
+    return obj
diff --git a/tests/unit/test_chains.py b/tests/unit/test_chains.py
@@ -0,0 +1,18 @@
+from aleph_message.models import Chain, ItemType
+
+from aleph.sdk.chains.common import get_verification_buffer
+
+
+def test_get_verification_buffer():
+    message = {
+        "chain": Chain.ETH,
+        "sender": "0x101d8D16372dBf5f1614adaE95Ee5CCE61998Fc9",
+        "type": ItemType.inline,
+        "item_hash": "bd79839bf96e595a06da5ac0b6ba51dea6f7e2591bb913deccded04d831d29f4",
+    }
+    assert get_verification_buffer(message) == (
+        b"ETH\n"
+        b"0x101d8D16372dBf5f1614adaE95Ee5CCE61998Fc9\n"
+        b"inline\n"
+        b"bd79839bf96e595a06da5ac0b6ba51dea6f7e2591bb913deccded04d831d29f4"
+    )
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
@@ -1,13 +1,15 @@
 from aleph_message.models import (
     AggregateMessage,
+    Chain,
     ForgetMessage,
+    ItemType,
     MessageType,
     PostMessage,
     ProgramMessage,
     StoreMessage,
 )
 
-from aleph.sdk.utils import get_message_type_value
+from aleph.sdk.utils import enum_as_str, get_message_type_value
 
 
 def test_get_message_type_value():
@@ -16,3 +18,11 @@ def test_get_message_type_value():
     assert get_message_type_value(StoreMessage) == MessageType.store
     assert get_message_type_value(ProgramMessage) == MessageType.program
     assert get_message_type_value(ForgetMessage) == MessageType.forget
+
+
+def test_enum_as_str():
+    assert enum_as_str("simple string") == "simple string"
+    assert enum_as_str(Chain("ETH")) == "ETH"
+    assert enum_as_str(Chain.ETH) == "ETH"
+    assert enum_as_str(ItemType("inline")) == "inline"
+    assert enum_as_str(ItemType.inline) == "inline"
