Add MerkleTree and merkletree support in TypedData

docs/api/typed_data.rst

@@ -17,9 +17,12 @@ Parameter
     :exclude-members: __init__
 
 --------------
-StarkNetDomain
+Domain
 --------------
 
-.. autoclass:: starknet_py.net.models.typed_data.StarkNetDomainDict
+.. autoclass:: starknet_py.utils.typed_data.Domain
     :members:
     :undoc-members:
+    :exclude-members: __init__
+    :member-order: bysource
+

docs/migration_guide.rst

@@ -1,6 +1,24 @@
 Migration guide
 ===============
 
+******************************
+0.23.0 Migration guide
+******************************
+
+0.23.0 Targeted versions
+------------------------
+
+- Starknet - `0.13.1.1 <https://docs.starknet.io/documentation/starknet_versions/version_notes/#version0.13.1.1>`_
+- RPC - `0.7.1 <https://github.com/starkware-libs/starknet-specs/releases/tag/v0.7.1>`_
+
+0.23.0 Breaking changes
+-----------------------
+.. currentmodule:: starknet_py.utils.typed_data
+
+1. :class:`StarkNetDomain` has been renamed to :class:`Domain`
+
+2. :class:`TypedData` field ``domain`` has been changed from ``dict`` to :class:`Domain`
+
 ******************************
 0.22.0 Migration guide
 ******************************

starknet_py/hash/hash_method.py

@@ -0,0 +1,29 @@
+from enum import Enum
+from typing import List
+
+from poseidon_py.poseidon_hash import poseidon_hash, poseidon_hash_many
+
+from starknet_py.hash.utils import compute_hash_on_elements, pedersen_hash
+
+
+class HashMethod(Enum):
+    """
+    Enum representing hash method.
+    """
+
+    PEDERSEN = "pedersen"
+    POSEIDON = "poseidon"
+
+    def hash(self, left: int, right: int):
+        if self == HashMethod.PEDERSEN:
+            return pedersen_hash(left, right)
+        if self == HashMethod.POSEIDON:
+            return poseidon_hash(left, right)
+        raise ValueError(f"Unsupported hash method: {self}.")
+
+    def hash_many(self, values: List[int]):
+        if self == HashMethod.PEDERSEN:
+            return compute_hash_on_elements(values)
+        if self == HashMethod.POSEIDON:
+            return poseidon_hash_many(values)
+        raise ValueError(f"Unsupported hash method: {self}.")

starknet_py/net/account/base_account.py

@@ -318,6 +318,7 @@ def sign_message(self, typed_data: TypedDataDict) -> List[int]:
         """
         Sign an TypedData TypedDict for off-chain usage with the Starknet private key and return the signature.
         This adds a message prefix, so it can't be interchanged with transactions.
+        Both v0 and v1 domain revision versions are supported.
 
         :param typed_data: TypedData TypedDict to be signed.
         :return: The signature of the TypedData TypedDict.
@@ -327,6 +328,7 @@ def sign_message(self, typed_data: TypedDataDict) -> List[int]:
     def verify_message(self, typed_data: TypedDataDict, signature: List[int]) -> bool:
         """
         Verify a signature of a TypedData dict on Starknet.
+        Both v0 and v1 domain revision versions are supported.
 
         :param typed_data: TypedData TypedDict to be verified.
         :param signature: signature of the TypedData TypedDict.

starknet_py/net/models/typed_data.py

@@ -2,7 +2,9 @@
 TypedDict structures for TypedData
 """
 
-from typing import Any, Dict, List, TypedDict, Union
+from typing import Any, Dict, List, Optional, TypedDict
+
+from starknet_py.net.schemas.common import Revision
 
 
 class ParameterDict(TypedDict):
@@ -12,16 +14,18 @@ class ParameterDict(TypedDict):
 
     name: str
     type: str
+    contains: Optional[str]
 
 
-class StarkNetDomainDict(TypedDict):
+class DomainDict(TypedDict):
     """
-    TypedDict representing a StarkNetDomain object
+    TypedDict representing a domain object (both StarkNetDomain, StarknetDomain).
     """
 
     name: str
     version: str
-    chainId: Union[str, int]
+    chainId: str
+    revision: Optional[Revision]
 
 
 class TypedDataDict(TypedDict):
@@ -31,5 +35,10 @@ class TypedDataDict(TypedDict):
 
     types: Dict[str, List[ParameterDict]]
     primaryType: str
-    domain: StarkNetDomainDict
+    domain: DomainDict
     message: Dict[str, Any]
+
+
+class TypeContext(TypedDict):
+    parent: str
+    key: str

starknet_py/net/schemas/common.py

@@ -1,5 +1,6 @@
 import re
 import sys
+from enum import Enum
 from typing import Any, Mapping, Optional, Union
 
 from marshmallow import Schema, ValidationError, fields, post_load
@@ -336,3 +337,27 @@ class StorageEntrySchema(Schema):
     def make_dataclass(self, data, **kwargs):
         # pylint: disable=no-self-use
         return StorageEntry(**data)
+
+
+class Revision(Enum):
+    """
+    Enum representing the revision of the specification to be used.
+    """
+
+    V0 = 0
+    V1 = 1
+
+
+class RevisionField(fields.Field):
+    def _deserialize(self, value, attr, data, **kwargs) -> Revision:
+        if isinstance(value, str):
+            value = int(value)
+
+        revisions = [revision.value for revision in Revision]
+        if value not in revisions:
+            allowed_revisions_str = "".join(list(map(str, revisions)))
+            raise ValidationError(
+                f"Invalid value provided for Revision: {value}. Allowed values are {allowed_revisions_str}."
+            )
+
+        return Revision(value)

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

@@ -78,7 +78,7 @@ def test_sign_message(account):
                 ],
             },
             primaryType="Example",
-            domain={"name": "StarkNet Example", "version": "1", "chainId": 1},
+            domain={"name": "StarkNet Example", "version": "1", "chainId": "1"},
             message={"value": 1},
         )
     )
@@ -100,7 +100,7 @@ def test_verify_message(account):
                 ],
             },
             primaryType="Example",
-            domain={"name": "StarkNet Example", "version": "1", "chainId": 1},
+            domain={"name": "StarkNet Example", "version": "1", "chainId": "1"},
             message={"value": 1},
         ),
         signature=[12, 34],

starknet_py/tests/e2e/docs/guide/test_sign_offchain_message.py

@@ -31,7 +31,7 @@ async def test_sign_offchain_message(account):
             ],
         },
         "primaryType": "Mail",
-        "domain": {"name": "StarkNet Mail", "version": "1", "chainId": 1},
+        "domain": {"name": "StarkNet Mail", "version": "1", "chainId": "1"},
         "message": {
             "from": {
                 "name": "Cow",

starknet_py/tests/e2e/fixtures/misc.py

@@ -30,10 +30,11 @@ def pytest_addoption(parser):
 
 @pytest.fixture(
     params=[
-        "typed_data_example.json",
-        "typed_data_felt_array_example.json",
-        "typed_data_long_string_example.json",
-        "typed_data_struct_array_example.json",
+        "typed_data_rev_0_example.json",
+        "typed_data_rev_0_felt_array_example.json",
+        "typed_data_rev_0_long_string_example.json",
+        "typed_data_rev_0_struct_array_example.json",
+        "typed_data_rev_1_example.json",
     ],
 )
 def typed_data(request) -> TypedDataDict:

starknet_py/tests/e2e/mock/typed_data/typed_data_example.json → starknet_py/tests/e2e/mock/typed_data/typed_data_rev_0_example.json

@@ -19,7 +19,7 @@
   "domain": {
     "name": "StarkNet Mail",
     "version": "1",
-    "chainId": 1
+    "chainId": "1"
   },
   "message": {
     "from": {

starknet_py/tests/e2e/mock/typed_data/typed_data_felt_array_example.json → starknet_py/tests/e2e/mock/typed_data/typed_data_rev_0_felt_array_example.json

@@ -20,7 +20,7 @@
   "domain": {
     "name": "StarkNet Mail",
     "version": "1",
-    "chainId": 1
+    "chainId": "1"
   },
   "message": {
     "from": {

starknet_py/tests/e2e/mock/typed_data/typed_data_long_string_example.json → starknet_py/tests/e2e/mock/typed_data/typed_data_rev_0_long_string_example.json

@@ -23,7 +23,7 @@
     "domain": {
         "name": "StarkNet Mail",
         "version": "1",
-        "chainId": 1
+        "chainId": "1"
     },
     "message": {
         "from": {

starknet_py/tests/e2e/mock/typed_data/typed_data_struct_array_example.json → starknet_py/tests/e2e/mock/typed_data/typed_data_rev_0_struct_array_example.json

@@ -24,7 +24,7 @@
   "domain": {
     "name": "StarkNet Mail",
     "version": "1",
-    "chainId": 1
+    "chainId": "1"
   },
   "message": {
     "from": {

starknet_py/tests/e2e/mock/typed_data/typed_data_rev_0_struct_merkletree_example.json

@@ -0,0 +1,67 @@
+{
+  "primaryType": "Session",
+  "types": {
+    "Policy": [
+      {
+        "name": "contractAddress",
+        "type": "felt"
+      },
+      {
+        "name": "selector",
+        "type": "selector"
+      }
+    ],
+    "Session": [
+      {
+        "name": "key",
+        "type": "felt"
+      },
+      {
+        "name": "expires",
+        "type": "felt"
+      },
+      {
+        "name": "root",
+        "type": "merkletree",
+        "contains": "Policy"
+      }
+    ],
+    "StarkNetDomain": [
+      {
+        "name": "name",
+        "type": "felt"
+      },
+      {
+        "name": "version",
+        "type": "felt"
+      },
+      {
+        "name": "chainId",
+        "type": "felt"
+      }
+    ]
+  },
+  "domain": {
+    "name": "StarkNet Mail",
+    "version": "1",
+    "chainId": "1"
+  },
+  "message": {
+    "key": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "expires": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "root": [
+      {
+        "contractAddress": "0x1",
+        "selector": "transfer"
+      },
+      {
+        "contractAddress": "0x2",
+        "selector": "transfer"
+      },
+      {
+        "contractAddress": "0x3",
+        "selector": "transfer"
+      }
+    ]
+  }
+}

starknet_py/tests/e2e/mock/typed_data/typed_data_rev_1_example.json

@@ -0,0 +1,37 @@
+{
+  "types": {
+    "StarknetDomain": [
+      { "name": "name", "type": "shortstring" },
+      { "name": "version", "type": "shortstring" },
+      { "name": "chainId", "type": "shortstring" },
+      { "name": "revision", "type": "shortstring" }
+    ],
+    "Person": [
+      { "name": "name", "type": "felt" },
+      { "name": "wallet", "type": "felt" }
+    ],
+    "Mail": [
+      { "name": "from", "type": "Person" },
+      { "name": "to", "type": "Person" },
+      { "name": "contents", "type": "felt" }
+    ]
+  },
+  "primaryType": "Mail",
+  "domain": {
+    "name": "StarkNet Mail",
+    "version": "1",
+    "chainId": "1",
+    "revision": 1
+  },
+  "message": {
+    "from": {
+      "name": "Cow",
+      "wallet": "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+    },
+    "to": {
+      "name": "Bob",
+      "wallet": "0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB"
+    },
+    "contents": "Hello, Bob!"
+  }
+}

starknet_py/tests/e2e/mock/typed_data/typed_data_rev_1_felt_merkletree_example.json

@@ -0,0 +1,29 @@
+{
+    "primaryType": "Example",
+    "types": {
+        "Example": [
+            { "name": "value", "type": "felt" },
+            { "name": "root", "type": "merkletree", "contains": "felt" }
+        ],
+        "StarknetDomain": [
+            { "name": "name", "type": "shortstring" },
+            { "name": "version", "type": "shortstring" },
+            { "name": "chainId", "type": "shortstring" },
+            { "name": "revision", "type": "shortstring" }
+        ]
+    },
+    "domain": {
+        "name": "StarkNet Mail",
+        "version": "1",
+        "chainId": "1",
+        "revision": "1"
+    },
+    "message": {
+        "value": "0x2137",
+        "root": [
+            "0x1",
+            "0x2",
+            "0x3"
+        ]
+    }
+}