Fix logic responsible for choosing hash method for CASM class hash calculation (#1670)

Author: franciszekjob

docs/migration_guide.rst

@@ -2,13 +2,14 @@ Migration guide
 ===============
 
 ***************************
-x.y.z Migration guide
+0.29.0-rc.1 Migration guide
 ***************************
 
-x.y.z Bugfixes
---------------
+0.29.0-rc.1 Bugfixes
+--------------------
 
 1. Fixed parsing ABI that contains signed integers (e.g. ``i128``).
+2. Fixed logic for choosing hash method used to calculated CASM class hash.
 
 ***************************
 0.29.0-rc.0 Migration guide

starknet_py/contract.py

@@ -7,6 +7,7 @@
 from typing import Dict, List, Optional, Tuple, TypeVar, Union
 
 from marshmallow import ValidationError
+from semver import Version
 
 from starknet_py.abi.v0 import Abi as AbiV0
 from starknet_py.abi.v0 import AbiParser as AbiParserV0
@@ -23,7 +24,7 @@
 from starknet_py.common import create_compiled_contract, create_sierra_compiled_contract
 from starknet_py.constants import DEFAULT_DEPLOYER_ADDRESS
 from starknet_py.contract_utils import _extract_compiled_class_hash, _unpack_provider
-from starknet_py.hash.casm_class_hash import get_casm_hash_method_for_rpc_version
+from starknet_py.hash.casm_class_hash import get_casm_hash_method_for_starknet_version
 from starknet_py.hash.selector import get_selector_from_name
 from starknet_py.net.account.base_account import BaseAccount
 from starknet_py.net.client import Client
@@ -722,8 +723,9 @@ async def declare_v3(
         :return: DeclareResult instance.
         """
 
-        rpc_version = await account.client.spec_version()
-        hash_method = get_casm_hash_method_for_rpc_version(rpc_version)
+        block = await account.client.get_block()
+        starknet_version = Version.parse(block.starknet_version)
+        hash_method = get_casm_hash_method_for_starknet_version(starknet_version)
 
         compiled_class_hash = _extract_compiled_class_hash(
             compiled_contract_casm, compiled_class_hash, hash_method=hash_method

starknet_py/hash/casm_class_hash.py

@@ -17,11 +17,9 @@
 CASM_CLASS_VERSION = "COMPILED_CLASS_V1"
 
 
-def get_casm_hash_method_for_rpc_version(rpc_version: str) -> HashMethod:
-    # RPC 0.10.0 and later use Blake2s
-    version = Version.parse(rpc_version)
-
-    if version >= Version.parse("0.10.0"):
+def get_casm_hash_method_for_starknet_version(starknet_version: Version) -> HashMethod:
+    # Starknet 0.14.1 and later use Blake2s
+    if starknet_version >= Version.parse("0.14.1"):
         return HashMethod.BLAKE2S
 
     return HashMethod.POSEIDON

starknet_py/net/full_node_client.py

@@ -113,7 +113,6 @@ def __init__(
         """
         self.url = node_url
         self._client = RpcHttpClient(url=node_url, session=session)
-        self._spec_version: Optional[str] = None
 
     async def get_block(
         self,
@@ -773,15 +772,14 @@ async def spec_version(self) -> str:
 
         :return: String with version of the Starknet JSON-RPC specification.
         """
-        if self._spec_version is None:
-            self._spec_version = cast(
-                str,
-                await self._client.call(
-                    method_name="specVersion",
-                    params={},
-                ),
-            )
-        return self._spec_version
+        spec_version = cast(
+            str,
+            await self._client.call(
+                method_name="specVersion",
+                params={},
+            ),
+        )
+        return spec_version
 
     async def get_transaction_status(self, tx_hash: Hash) -> TransactionStatusResponse:
         res = await self._client.call(

starknet_py/tests/unit/hash/casm_class_hash_test.py

@@ -4,7 +4,7 @@
 from starknet_py.common import create_casm_class
 from starknet_py.hash.casm_class_hash import (
     compute_casm_class_hash,
-    get_casm_hash_method_for_rpc_version,
+    get_casm_hash_method_for_starknet_version,
 )
 from starknet_py.hash.hash_method import HashMethod
 from starknet_py.tests.e2e.fixtures.constants import PRECOMPILED_CONTRACTS_DIR
@@ -57,20 +57,20 @@ def test_precompiled_compute_casm_class_hash_with_poseidon(casm_contract_class_s
 @pytest.mark.parametrize(
     "rpc_version, expected_hash_method",
     [
-        ("0.8.0", HashMethod.POSEIDON),
-        ("0.9.0", HashMethod.POSEIDON),
-        ("0.9.1", HashMethod.POSEIDON),
-        ("0.10.0", HashMethod.BLAKE2S),
-        ("0.10.1", HashMethod.BLAKE2S),
-        ("0.11.0", HashMethod.BLAKE2S),
+        ("0.13.5", HashMethod.POSEIDON),
+        ("0.14.0", HashMethod.POSEIDON),
+        ("0.14.1", HashMethod.BLAKE2S),
+        ("0.15.0", HashMethod.BLAKE2S),
         ("1.0.0", HashMethod.BLAKE2S),
+        ("1.10.0", HashMethod.BLAKE2S),
     ],
 )
-def test_get_casm_hash_method_for_rpc_version(rpc_version, expected_hash_method):
-    """Test that the correct hash method is returned for different RPC versions."""
-    hash_method = get_casm_hash_method_for_rpc_version(rpc_version)
+def test_get_casm_hash_method_for_starknet_version(rpc_version, expected_hash_method):
+    """Test that the correct hash method is returned for different Starknet versions."""
+    hash_method = get_casm_hash_method_for_starknet_version(rpc_version)
     assert hash_method == expected_hash_method
 
+
 @pytest.mark.parametrize(
     "contract, expected_casm_class_hash_blake2s",
     [