Utilize pyeth changes for solc >= 0.4.9#351
Utilize pyeth changes for solc >= 0.4.9#351LefterisJP merged 4 commits intoraiden-network:masterfrom
Conversation
Also skip lines starting with #
| ) | ||
| channel_manager_proxy = jsonrpc_client.new_contract_proxy( | ||
| registry_contracts['ChannelManagerContract']['abi'], | ||
| contract_data['abi'], |
There was a problem hiding this comment.
Can we use the exposed abi from the raiden.blockchain.abi module?
https://github.com/raiden-network/raiden/blob/master/raiden/blockchain/abi.py#L90
There was a problem hiding this comment.
yes, that is a really good idea
There was a problem hiding this comment.
Oh, I see, the abi.py only computes the abi, it doesn't compile the smart contract, that's why the test is using compile_file, so the question is then, what is the difference between solidity_get_contract_data and compile_file?
There was a problem hiding this comment.
compile_file just compiles the file and returns the output.
solidity_get_contract_data() is a new function I added in the linked pyethapp PR, to abstract away the reading of the contract data (the compile_file output) in a backwards compatible way which would work with all current solc versions.
There was a problem hiding this comment.
Okay, so never mind my comment then, I had the impression that solidity_get_contract_data called the compiler again.
requirements.txt
Outdated
| pysha3 | ||
| # temporary until https://github.com/ethereum/pyethapp/pull/184 comes upstream (see also setup.py) | ||
| -e git+https://github.com/konradkonrad/pyethapp@71f940c6d287b98a35ef524f4c5e3c13d530bfc5#egg=pyethapp | ||
| #-e git+https://github.com/konradkonrad/pyethapp@71f940c6d287b98a35ef524f4c5e3c13d530bfc5#egg=pyethapp |
There was a problem hiding this comment.
I think this should be removed instead of commented out
There was a problem hiding this comment.
yes it should, left it in there to ask @konradkonrad if we still need it but it's actually included in my branch anyway so it can go away
Also remove commented out requirement
2 participants
In solidity v0.4.9 they introduced a new key for the combined-json-abi compile output.
Before merging we need to think if we want to have 2 hot-fixed requirements for
pyethappandpyethereum. And if yes for how long, i.e: How long would it take to create releases for both of these repos.We are using changes introduced in: