Merged
Conversation
xlc
reviewed
Jan 7, 2021
xlc
reviewed
Jan 7, 2021
xlc
reviewed
Jan 7, 2021
modules/evm/src/lib.rs
Outdated
| &contract_info.maintainer, | ||
| pre_additional_storage, | ||
| additional_storage, | ||
| 100000, |
Member
There was a problem hiding this comment.
should pass u32::max_value if you want to mean no limit, instead of an arbitrary number
modules/evm/src/lib.rs
Outdated
| // get maintainer quota and refund the additional_storage | ||
| Self::do_update_maintainer_storage_usage(&contract_info.maintainer, additional_storage, 0)?; | ||
| // refund the additional_storage | ||
| Self::do_update_storage_usage(&contract, &contract_info.maintainer, additional_storage, 0, 100000)?; |
Member
There was a problem hiding this comment.
Suggested change
| Self::do_update_storage_usage(&contract, &contract_info.maintainer, additional_storage, 0, 100000)?; | |
| Self::do_update_storage_usage(&contract, &contract_info.maintainer, additional_storage, 0, 0)?; |
this shouldn't use more storage
xlc
reviewed
Jan 12, 2021
Member
xlc
left a comment
xlc
left a comment
There was a problem hiding this comment.
Looks good so far. I will do a more detailed review later.
modules/evm/src/runner/handler.rs
Outdated
| } | ||
|
|
||
| pub fn used_storage(&self) -> usize { | ||
| self.storagemeter.total_used_storage() - self.storagemeter.refunded_storage() |
Member
There was a problem hiding this comment.
it is possible refunded is more than used
modules/evm/src/runner/handler.rs
Outdated
|
|
||
| /// Storagemeter. | ||
| #[derive(Clone)] | ||
| pub struct Storagemeter { |
Member
There was a problem hiding this comment.
move this to a new file storage_meter.rs and have some tests in that file
modules/evm/src/runner/handler.rs
Outdated
| /// Storagemeter. | ||
| #[derive(Clone)] | ||
| pub struct Storagemeter { | ||
| storage_limit: usize, |
Member
There was a problem hiding this comment.
use u32 everywhere to keep things simple
Member
|
There are still few things can be improved but I think it is good enough for this to be merged now. I will do some refactor later. |
xlc
approved these changes
Jan 13, 2021
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Closes: #654