Merge branch 'main' into feat/windows

ApeWorX · Jun 12, 2024 · 1ac8dcd · 1ac8dcd
2 parents 8a70c28 + afcffb3
commit 1ac8dcd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -119,3 +119,7 @@ version.py
 
 # Ape projects
 .build/
+
+# IDE files
+.idea
+.vscode
diff --git a/setup.py b/setup.py
@@ -67,7 +67,7 @@
  install_requires=[
  "dataclassy>=0.11.1,<1",
  "eth-abi>=5.1.0,<6",
- "eth-account>=0.12.1,<0.13",
+ "eth-account>=0.12.1,<0.14",
  "eth-typing>=4.1.0,<5",
  "eth-utils>=4.1.0,<5",
  "hexbytes>=1.2.0,<2",

diff --git a/tests/test_common.py b/tests/test_common.py
@@ -1,5 +1,4 @@
 import pytest
-from eth_account._utils.structured_data.hashing import hash_message
 from hexbytes import HexBytes
 
 from eip712.common import SAFE_VERSIONS, create_safe_tx_def
@@ -25,7 +24,7 @@ def test_gnosis_safe_tx(version):
  else "590e9c66b22ee4584cd655fda57748ce186b85f829a092c28209478efbe86a92"
  )
 
- assert hash_message(msg).hex() == (
+ assert msg.signable_message.body.hex() == (
  "3c2fdf2ea8af328a67825162e7686000787c5cc9f4b27cb6bfbcaa445b59e2c4"
  if version in ("1.3.0",)
  else "1b393826bed1f2297ffc01916f8339892f9a51dc7f35f477b9a5cdd651d28603"