Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Utilize pyeth changes for solc >= 0.4.9 #351

Merged
merged 4 commits into from
Jan 26, 2017

Conversation

LefterisJP
Copy link
Contributor

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 pyethapp and pyethereum. 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:

channel_manager_proxy = jsonrpc_client.new_contract_proxy(
registry_contracts['ChannelManagerContract']['abi'],
contract_data['abi'],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, that is a really good idea

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Contributor Author

@LefterisJP LefterisJP Jan 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, so never mind my comment then, I had the impression that solidity_get_contract_data called the compiler again.

@@ -1,13 +1,16 @@
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be removed instead of commented out

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
@LefterisJP LefterisJP merged commit ea8cbfd into raiden-network:master Jan 26, 2017
@LefterisJP LefterisJP deleted the solc_combinedjson_v049 branch January 26, 2017 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants