Migrate to Web3.py v5 (#2038)
* Install Py packages in dep. order, not in parallel Install Python packages in dependency order, not in parallel. * sra_client.py: Add `./setup.py clean` * Fix python package dependency ordering... ...and include a script to produce the proper ordering. * sra_client.py: reformat whitespace in doctest * contract_wrappers.py: don't auto-import wrappers This was discovered while minimizing CircleCI steps to dianose a problem with running the Launch Kit Backend in CircleCI. These classes should be imported via the zero_ex.contract_wrappers.exchange and zero_ex.contract_wrappers.erc20_token modules, respectively. We permitted importing them from just zero_ex.contract_wrappers back when they were the only wrappers we had, but now that we have so many different contracts being wrapped, this is just another list to keep manually updated (which, obviously is error prone, since it slipped through the cracks already), so it's better to just not support this type of import. * abi-gen/Py: doc contract method attributes Without this, generated documentation was not including the class members that represent the contract methods, rendering the usage unclear. * sra_client.py: disable tests in CI * abi-gen/Py: strip repeated spaces from devdoc * contract_wrappers.py: gen docs for all wrappers... ...except for the dummy tokens. * sra_client.py/test: change launch kit docker image Previously these teses were using 0xorg/launch-kit-ci, but that was a one-off thing created just for CI, back before there was a regularly maintained docker image of Launch Kit. Changed to use 0xorg/launch-kit-backend since it's regularly maintained/updated. Because the -backend image is using a different Linux distribution (Alpine), the commands used to wait for ganache startup also had to change. The tag used, 74bcc39, is provisional due to the pending Issue at https://github.com/0xProject/0x-launch-kit-backend/issues/73 . When that issue is resolved, the tag suffix on the imag name should be removed. * Migrate from Web3.py 4.x to 5.x * sra_client.py: checksum address in doctest Due to problem with launch-kit-backend, documented at https://github.com/0xProject/0x-launch-kit-backend/issues/73 , we need to checksum the makerAddress, in the order retrieved from the relayer, before filling it, otherwise Web3.py gives this error: InvalidAddress('Web3.py only accepts checksum addresses. The software that gave you this non-checksum address should be considered unsafe, please file it as a bug on their platform. Try using an ENS name instead. Or, if you must accept lower safety, use Web3.toChecksumAddress(lower_case_address).', '0x5409ed021d9299bf6814279a6a1411a7e866a631') * Update CHANGELOGs * sra_client.py: make CHANGELOG be REVESE chrono. Formerly CHANGELOG was in chronological order. Now it's in reverse chronological order. * abi-gen/Py: fix missing space in sanitized devdoc
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
## 3.0.0 - TBD
|
||||
|
||||
- Major breaking changes: removal of definitions for Order, OrderInfo, order_to_jsdict, jsdict_to_order, all of which have been moved to contract_wrappers.exchange.types; removal of signature validation.
|
||||
- Major breaking changes: removal of definitions for Order, OrderInfo, order_to_jsdict, jsdict_to_order, all of which have been moved to contract_wrappers.exchange.types; removal of signature validation; migration from v4 to v5 of Web3.py
|
||||
|
||||
## 2.0.0 - 2019-04-30
|
||||
|
||||
|
@@ -172,11 +172,9 @@ setup(
|
||||
"0x-contract-addresses",
|
||||
"0x-contract-artifacts",
|
||||
"0x-json-schemas",
|
||||
"0x-web3",
|
||||
"eth-abi<2.0.0",
|
||||
"web3",
|
||||
"eth-abi",
|
||||
"eth_utils",
|
||||
"hypothesis>=3.31.2", # HACK! this is web3's dependency!
|
||||
# above works around https://github.com/ethereum/web3.py/issues/1179
|
||||
"mypy_extensions",
|
||||
],
|
||||
extras_require={
|
||||
|
@@ -27,7 +27,7 @@ from eth_utils import keccak, remove_0x_prefix, to_bytes, to_checksum_address
|
||||
from web3 import Web3
|
||||
import web3.exceptions
|
||||
from web3.providers.base import BaseProvider
|
||||
from web3.utils import datatypes
|
||||
from web3.contract import Contract
|
||||
|
||||
from zero_ex.contract_addresses import NETWORK_TO_ADDRESSES, NetworkId
|
||||
import zero_ex.contract_artifacts
|
||||
@@ -186,7 +186,7 @@ def is_valid_signature(
|
||||
NetworkId(int(web3_instance.net.version))
|
||||
].exchange
|
||||
# false positive from pylint: disable=no-member
|
||||
contract: datatypes.Contract = web3_instance.eth.contract(
|
||||
contract: Contract = web3_instance.eth.contract(
|
||||
address=to_checksum_address(contract_address),
|
||||
abi=zero_ex.contract_artifacts.abi_by_name("Exchange"),
|
||||
)
|
||||
@@ -285,7 +285,7 @@ def sign_hash(
|
||||
>>> provider = Web3.HTTPProvider("http://127.0.0.1:8545")
|
||||
>>> sign_hash(
|
||||
... provider,
|
||||
... Web3(provider).personal.listAccounts[0],
|
||||
... Web3(provider).geth.personal.listAccounts()[0],
|
||||
... '0x34decbedc118904df65f379a175bb39ca18209d6ce41d5ed549d54e6e0a95004',
|
||||
... )
|
||||
'0x1b117902c86dfb95fe0d1badd983ee166ad259b27acb220174cbb4460d872871137feabdfe76e05924b484789f79af4ee7fa29ec006cedce1bbf369320d034e10b03'
|
||||
@@ -355,7 +355,7 @@ def sign_hash_to_bytes(
|
||||
>>> provider = Web3.HTTPProvider("http://127.0.0.1:8545")
|
||||
>>> sign_hash_to_bytes(
|
||||
... provider,
|
||||
... Web3(provider).personal.listAccounts[0],
|
||||
... Web3(provider).geth.personal.listAccounts()[0],
|
||||
... '0x34decbedc118904df65f379a175bb39ca18209d6ce41d5ed549d54e6e0a95004',
|
||||
... ).decode(encoding='utf_8')
|
||||
'1b117902c86dfb95fe0d1badd983ee166ad259b27acb220174cbb4460d872871137feabdfe76e05924b484789f79af4ee7fa29ec006cedce1bbf369320d034e10b03'
|
||||
|
@@ -1,6 +1,6 @@
|
||||
from typing import Dict, Optional, Union
|
||||
from typing import Dict, List, Optional, Union
|
||||
|
||||
from web3.utils import datatypes
|
||||
from web3.contract import Contract
|
||||
from web3.providers.base import BaseProvider
|
||||
|
||||
|
||||
@@ -23,6 +23,15 @@ class Web3:
|
||||
|
||||
class eth:
|
||||
@staticmethod
|
||||
def contract(address: str, abi: Dict) -> datatypes.Contract: ...
|
||||
def contract(address: str, abi: Dict) -> Contract: ...
|
||||
...
|
||||
|
||||
class geth:
|
||||
class personal:
|
||||
@staticmethod
|
||||
def listAccounts() -> List[str]:
|
||||
...
|
||||
...
|
||||
...
|
||||
|
||||
...
|
||||
|
@@ -133,7 +133,9 @@ def test_sign_hash_to_bytes__golden_path():
|
||||
provider = Web3.HTTPProvider("http://127.0.0.1:8545")
|
||||
signature = sign_hash_to_bytes(
|
||||
provider,
|
||||
Web3(provider).personal.listAccounts[0], # pylint: disable=no-member
|
||||
Web3( # pylint: disable=no-member
|
||||
provider
|
||||
).geth.personal.listAccounts()[0],
|
||||
"0x34decbedc118904df65f379a175bb39ca18209d6ce41d5ed549d54e6e0a95004",
|
||||
)
|
||||
assert (
|
||||
|
Reference in New Issue
Block a user