diff --git a/gnosis/eth/constants.py b/gnosis/eth/constants.py index 52057883a..751ae5e19 100644 --- a/gnosis/eth/constants.py +++ b/gnosis/eth/constants.py @@ -1,4 +1,6 @@ -from eth.constants import SECPK1_N +SECPK1_N = ( + 115792089237316195423570985008687907852837564279074904382605163141518161494337 +) NULL_ADDRESS: str = "0x" + "0" * 40 SENTINEL_ADDRESS: str = "0x" + "0" * 39 + "1" diff --git a/gnosis/safe/safe_creation_tx.py b/gnosis/safe/safe_creation_tx.py index 0fe09dee5..6d8ecdf93 100644 --- a/gnosis/safe/safe_creation_tx.py +++ b/gnosis/safe/safe_creation_tx.py @@ -4,14 +4,13 @@ from typing import Any, Dict, List, Optional, Tuple import rlp -from eth.constants import SECPK1_N from eth.vm.forks.frontier.transactions import FrontierTransaction from eth_keys.exceptions import BadSignature from hexbytes import HexBytes from web3 import Web3 from web3.contract import ContractConstructor -from gnosis.eth.constants import GAS_CALL_DATA_BYTE, NULL_ADDRESS +from gnosis.eth.constants import GAS_CALL_DATA_BYTE, NULL_ADDRESS, SECPK1_N from gnosis.eth.contracts import ( get_erc20_contract, get_paying_proxy_contract, diff --git a/gnosis/safe/tests/utils.py b/gnosis/safe/tests/utils.py index c06202c37..2c5489181 100644 --- a/gnosis/safe/tests/utils.py +++ b/gnosis/safe/tests/utils.py @@ -2,11 +2,11 @@ import random from logging import getLogger -from eth.constants import SECPK1_N from web3 import Web3 from gnosis.eth.tests.utils import send_tx +from ...eth.constants import SECPK1_N from ..safe_creation_tx import SafeCreationTx logger = getLogger(__name__) diff --git a/setup.py b/setup.py index ce86b8a1e..73291ec81 100644 --- a/setup.py +++ b/setup.py @@ -11,8 +11,7 @@ requirements = [ "cached-property>=1.5; python_version < '3.8'", "eip712_structs", - "packaging", - "py-evm>=0.5.0a3", + "py-evm==0.5.0a3", "pysha3>=1.0.0", "requests>=2", "typing-extensions>=3.10; python_version < '3.8'",