Skip to content

Commit 56c60c1

Browse files
Add Dict suffix to typed dict names (#1365)
1 parent 32d86f3 commit 56c60c1

File tree

7 files changed

+17
-18
lines changed

7 files changed

+17
-18
lines changed

docs/api/typed_data.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ Parameter
2020
StarkNetDomain
2121
--------------
2222

23-
.. autoclass:: starknet_py.net.models.typed_data.StarkNetDomain
23+
.. autoclass:: starknet_py.net.models.typed_data.StarkNetDomainDict
2424
:members:
2525
:undoc-members:

starknet_py/net/account/account.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
InvokeV3,
3737
TypeAccountTransaction,
3838
)
39-
from starknet_py.net.models.typed_data import TypedData as TypedDataDict
39+
from starknet_py.net.models.typed_data import TypedDataDict
4040
from starknet_py.net.signer import BaseSigner
4141
from starknet_py.net.signer.stark_curve_signer import KeyPair, StarkCurveSigner
4242
from starknet_py.serialization.data_serializers.array_serializer import ArraySerializer

starknet_py/net/account/base_account.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
InvokeV3,
2323
TypeAccountTransaction,
2424
)
25-
from starknet_py.net.models.typed_data import TypedData
25+
from starknet_py.net.models.typed_data import TypedDataDict
2626

2727

2828
class BaseAccount(ABC):
@@ -314,7 +314,7 @@ async def execute_v3(
314314
"""
315315

316316
@abstractmethod
317-
def sign_message(self, typed_data: TypedData) -> List[int]:
317+
def sign_message(self, typed_data: TypedDataDict) -> List[int]:
318318
"""
319319
Sign an TypedData TypedDict for off-chain usage with the Starknet private key and return the signature.
320320
This adds a message prefix, so it can't be interchanged with transactions.
@@ -324,7 +324,7 @@ def sign_message(self, typed_data: TypedData) -> List[int]:
324324
"""
325325

326326
@abstractmethod
327-
def verify_message(self, typed_data: TypedData, signature: List[int]) -> bool:
327+
def verify_message(self, typed_data: TypedDataDict, signature: List[int]) -> bool:
328328
"""
329329
Verify a signature of a TypedData dict on Starknet.
330330

starknet_py/net/models/typed_data.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from typing import Any, Dict, List, TypedDict, Union
66

77

8-
class Parameter(TypedDict):
8+
class ParameterDict(TypedDict):
99
"""
1010
TypedDict representing a Parameter object
1111
"""
@@ -14,7 +14,7 @@ class Parameter(TypedDict):
1414
type: str
1515

1616

17-
class StarkNetDomain(TypedDict):
17+
class StarkNetDomainDict(TypedDict):
1818
"""
1919
TypedDict representing a StarkNetDomain object
2020
"""
@@ -24,12 +24,12 @@ class StarkNetDomain(TypedDict):
2424
chainId: Union[str, int]
2525

2626

27-
class TypedData(TypedDict):
27+
class TypedDataDict(TypedDict):
2828
"""
2929
TypedDict representing a TypedData object
3030
"""
3131

32-
types: Dict[str, List[Parameter]]
32+
types: Dict[str, List[ParameterDict]]
3333
primaryType: str
34-
domain: StarkNetDomain
34+
domain: StarkNetDomainDict
3535
message: Dict[str, Any]

starknet_py/tests/e2e/docs/code_examples/test_account.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from starknet_py.net.client_models import Call
1010
from starknet_py.net.full_node_client import FullNodeClient
1111
from starknet_py.net.models import StarknetChainId
12-
from starknet_py.net.models.typed_data import TypedData
12+
from starknet_py.net.models.typed_data import TypedDataDict
1313
from starknet_py.net.signer.stark_curve_signer import KeyPair
1414

1515

@@ -66,7 +66,7 @@ async def test_get_balance(account):
6666
def test_sign_message(account):
6767
# docs-start: sign_message
6868
signature = account.sign_message(
69-
typed_data=TypedData(
69+
typed_data=TypedDataDict(
7070
types={
7171
"StarkNetDomain": [
7272
{"name": "name", "type": "felt"},
@@ -88,7 +88,7 @@ def test_sign_message(account):
8888
def test_verify_message(account):
8989
# docs-start: verify_message
9090
is_correct = account.verify_message(
91-
typed_data=TypedData(
91+
typed_data=TypedDataDict(
9292
types={
9393
"StarkNetDomain": [
9494
{"name": "name", "type": "felt"},

starknet_py/tests/e2e/fixtures/misc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import pytest
1010

1111
from starknet_py.net.full_node_client import FullNodeClient
12-
from starknet_py.net.models.typed_data import TypedData
12+
from starknet_py.net.models.typed_data import TypedDataDict
1313
from starknet_py.tests.e2e.fixtures.constants import (
1414
CONTRACTS_V1_ARTIFACTS_MAP,
1515
CONTRACTS_V1_COMPILED,
@@ -36,7 +36,7 @@ def pytest_addoption(parser):
3636
"typed_data_struct_array_example.json",
3737
],
3838
)
39-
def typed_data(request) -> TypedData:
39+
def typed_data(request) -> TypedDataDict:
4040
"""
4141
Returns TypedData dictionary example.
4242
"""

starknet_py/utils/typed_data.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
from starknet_py.cairo.felt import encode_shortstring
77
from starknet_py.hash.selector import get_selector_from_name
88
from starknet_py.hash.utils import compute_hash_on_elements
9-
from starknet_py.net.models.typed_data import StarkNetDomain
10-
from starknet_py.net.models.typed_data import TypedData as TypedDataDict
9+
from starknet_py.net.models.typed_data import StarkNetDomainDict, TypedDataDict
1110

1211

1312
@dataclass(frozen=True)
@@ -28,7 +27,7 @@ class TypedData:
2827

2928
types: Dict[str, List[Parameter]]
3029
primary_type: str
31-
domain: StarkNetDomain
30+
domain: StarkNetDomainDict
3231
message: dict
3332

3433
@staticmethod

0 commit comments

Comments
 (0)