-
Notifications
You must be signed in to change notification settings - Fork 45
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
MonitoringService update + contracts recompilation #747
Conversation
a2613f6
to
6c51b26
Compare
Codecov Report
@@ Coverage Diff @@
## master #747 +/- ##
===========================================
- Coverage 81.47% 61.72% -19.76%
===========================================
Files 18 18
Lines 1139 1139
Branches 113 113
===========================================
- Hits 928 703 -225
- Misses 183 415 +232
+ Partials 28 21 -7
Continue to review full report at Codecov.
|
Codecov Report
@@ Coverage Diff @@
## master #747 +/- ##
=======================================
Coverage 81.47% 81.47%
=======================================
Files 18 18
Lines 1139 1139
Branches 113 113
=======================================
Hits 928 928
Misses 183 183
Partials 28 28
Continue to review full report at Codecov.
|
@@ -55,6 +55,7 @@ def relativise(path): | |||
output_values=PRECOMPILED_DATA_FIELDS + ['ast'], | |||
import_remappings=import_dir_map, | |||
optimize=False, | |||
evm_version='byzantium', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think evm_version
should be recorded in contracts.json
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How do I do this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- change
contract_manager.py
to read/write the new field - set up a default value for
evm_version
.
Maybe I should do it later. When I modify contract_manager.py
, I can also manually add the field to the existing contracts.json
s with the new solc versions.
(, channel_state) = token_network.getChannelInfo( | ||
// Only allowed to claim, if channel is out of the settlement period | ||
uint256 settle_block_number; | ||
(settle_block_number,) = token_network.getChannelInfo( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks tricky. settle_block_number
is sometimes 0, and sometimes the length of the settlement period. I think both channel_state
and settle_block_number
are necessary.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense, we should at least check that the channel_state is closed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That should work.
You can also tell me to implement it the way I like. |
Based on #744
This contains an update of
solc
from 0.5.4 to 0.5.6 (because that's what I have installed locally).Because the
eth_tester
dependency doesn't seem fit for the petersburg EVM I forcesolc
to outputbyzantium
compatible code, but this should be fixed later.