Clean up the handling of gas (use int64_t only) #332
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
axic
force-pushed
the
gas-handling
branch
3 times, most recently
from
20440d1
to
afab377
Compare
axic
changed the title
|
@chfast I think this should be correct now (tests are failing though due to the edge cases I guess?). Can you have a look at the logic in this PR? |
axic
force-pushed
the
gas-handling
branch
4 times, most recently
from
93cdff3
to
1287376
Compare
Codecov Report
@@ Coverage Diff @@
## master #332 +/- ##
==========================================
+ Coverage 67.28% 67.31% +0.03%
==========================================
Files 5 5
Lines 868 875 +7
Branches 123 123
==========================================
+ Hits 584 589 +5
- Misses 255 257 +2
Partials 29 29 |
chfast
reviewed
Aug 20, 2018
src/eei.cpp
Outdated
| @@ -485,7 +487,7 @@ namespace hera { | |||
| static_assert(GasSchedule::logTopic <= 65536, "Gas cost of logTopic could lead to overflow"); | |||
| static_assert(GasSchedule::logData <= 65536, "Gas cost of logData could lead to overflow"); | |||
| // Using uint64_t to force a type issue if the underlying API changes. | |||
| takeInterfaceGas(GasSchedule::log + (GasSchedule::logTopic * numberOfTopics) + (GasSchedule::logData * static_cast<uint64_t>(length))); | |||
| takeInterfaceGas(GasSchedule::log + (GasSchedule::logTopic * numberOfTopics) + (GasSchedule::logData * static_cast<int64_t>(length))); | |||
There was a problem hiding this comment.
This is safe cast, so you can use int64_t(length).
src/eei.cpp
Outdated
| @@ -1012,7 +1018,7 @@ namespace hera { | |||
| // Allow 16 bits here. | |||
| static_assert(GasSchedule::copy <= 65536, "Gas cost of copy could lead to overflow"); | |||
| // Using uint64_t to force a type issue if the underlying API changes. | |||
| takeInterfaceGas(GasSchedule::copy * ((static_cast<uint64_t>(length) + 31) / 32)); | |||
| takeInterfaceGas(GasSchedule::copy * ((static_cast<int64_t>(length) + 31) / 32)); | |||
There was a problem hiding this comment.
This cast is safe, could use int64_t(length).
| @@ -1001,7 +1007,7 @@ namespace hera { | |||
| /* | |||
| * Utilities | |||
| */ | |||
| void EthereumInterface::safeChargeDataCopy(uint32_t length, uint32_t baseCost) { | |||
| void EthereumInterface::safeChargeDataCopy(uint32_t length, unsigned baseCost) { | |||
There was a problem hiding this comment.
Why have you changed this?
From my little experience I recommend using int or int64_t for cost constants as well.
There was a problem hiding this comment.
The constants are currently defined as unsigned, wanted to ensure it is the same here.
chfast
approved these changes
Aug 20, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #311.