Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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.0a3
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"
Expand Down
4 changes: 2 additions & 2 deletions src/aleph/sdk/chains/common.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import logging
from abc import ABC, abstractmethod
from pathlib import Path
from typing import Dict, Optional
Expand All @@ -7,10 +8,9 @@

from aleph.sdk.conf import settings

import logging

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.
Expand Down
11 changes: 6 additions & 5 deletions src/aleph/sdk/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,16 @@
ForgetContent,
ForgetMessage,
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

Expand Down Expand Up @@ -713,7 +714,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:
Expand Down Expand Up @@ -835,7 +836,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

Expand Down Expand Up @@ -1387,7 +1388,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,
Expand Down
2 changes: 1 addition & 1 deletion src/aleph/sdk/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
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
Expand Down