wassname/catalyst
1
0
Fork 0
mirror of https://github.com/wassname/catalyst.git synced 2026-07-23 12:50:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

BUG: fix incompatibility with web3==4.0.0b11

Browse Source
This commit is contained in:
Victor
2018-03-02 11:34:18 -07:00
committed by GitHub
parent 497212383a
commit f990ecf14d
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
catalyst/marketplace/marketplace.py
+4 -9
View File
@@ -40,13 +40,6 @@ else:
log = logbook.Logger('Marketplace', level=LOG_LEVEL)
def first_line_from_url(url):
request = urllib.urlopen(url)
first_line = request.readline()
if sys.version_info.major >= 3:
charset = request.info().get_content_charset()
first_line = first_line.decode(charset)
return first_line.strip()
class Marketplace:
def __init__(self):
@@ -65,7 +58,8 @@ class Marketplace:
self.web3 = Web3(HTTPProvider(ETH_REMOTE_NODE))
self.mkt_contract_address = Web3.toChecksumAddress(
first_line_from_url(MARKETPLACE_CONTRACT))
contract_url.readline().decode(
contract_url.info().get_content_charset()).strip())
abi_url = urllib.urlopen(MARKETPLACE_CONTRACT_ABI)
abi = json.load(abi_url)
@@ -76,7 +70,8 @@ class Marketplace:
)
self.eng_contract_address = Web3.toChecksumAddress(
first_line_from_url(ENIGMA_CONTRACT))
contract_url.readline().decode(
contract_url.info().get_content_charset()).strip())
abi_url = urllib.urlopen(ENIGMA_CONTRACT_ABI)
abi = json.load(abi_url)