Skip to content

Commit 681291d

Browse files
authored
Upgrade aleph_message version to 1.0.5 (#240)
* Fix: Upgrade `aleph_message` version to `1.0.5`. * Fix: Solve model_validator signature with the proper one
1 parent dbc40a0 commit 681291d

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dynamic = [ "version" ]
3030
dependencies = [
3131
"aiohttp>=3.8.3",
3232
"aioresponses>=0.7.6",
33-
"aleph-message>=1.0.4",
33+
"aleph-message>=1.0.5",
3434
"aleph-superfluid>=0.3",
3535
"base58==2.1.1", # Needed now as default with _load_account changement
3636
"coincurve; python_version>='3.9'",

tests/unit/aleph_vm_authentication.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
from jwcrypto import jwk
1717
from jwcrypto.jwa import JWA
1818
from pydantic import BaseModel, ValidationError, field_validator, model_validator
19+
from typing_extensions import Self
1920

2021
from aleph.sdk.utils import bytes_from_hex
2122

@@ -76,28 +77,28 @@ def payload_must_be_hex(cls, value: bytes) -> bytes:
7677
return bytes_from_hex(value.decode())
7778

7879
@model_validator(mode="after") # type: ignore
79-
def check_expiry(cls, values: SignedPubKeyHeader) -> SignedPubKeyHeader:
80+
def check_expiry(self) -> Self:
8081
"""Check that the token has not expired"""
81-
payload: bytes = values.payload
82+
payload: bytes = self.payload
8283
content = SignedPubKeyPayload.model_validate_json(payload)
8384

8485
if not is_token_still_valid(content.expires):
8586
msg = "Token expired"
8687
raise ValueError(msg)
8788

88-
return values
89+
return self
8990

9091
@model_validator(mode="after") # type: ignore
91-
def check_signature(cls, values: SignedPubKeyHeader) -> SignedPubKeyHeader:
92-
signature: bytes = values.signature
93-
payload: bytes = values.payload
92+
def check_signature(self) -> Self:
93+
signature: bytes = self.signature
94+
payload: bytes = self.payload
9495
content = SignedPubKeyPayload.model_validate_json(payload)
9596

9697
if not verify_wallet_signature(signature, payload.hex(), content.address):
9798
msg = "Invalid signature"
9899
raise ValueError(msg)
99100

100-
return values
101+
return self
101102

102103
@property
103104
def content(self) -> SignedPubKeyPayload:

0 commit comments

Comments
 (0)