This repository has been archived by the owner on Dec 15, 2021. It is now read-only.
IS-1049: Fix some conflicts on merging master to develop #436
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
Member
goldworm-icon
commented
Apr 9, 2020
goldworm-icon
commented
- Merge updated code for hotfix-1.6.1 info develop
Release 1.6.0
* Add new configuration: "BlockInvokeTimeout" * Default timeout: 15s
officially we do not support iteration on DictDB so add raise Exception code references https://www.python.org/dev/peps/pep-0234/ https://docs.python.org/3/reference/datamodel.html#object.__getitem__
* Remove redundant codes * Fix a minor unittest failure
…-in-block IS-1015: Adjust the number of transactions in a block
add comment, append detail log message
* Add a related unittest
…support IS-1024: Add sha_256 function for SCORE development
…auses-infinite-loop IS-1021: DictDB iteration causes infinite loop
* IS-1029: Array Optimization hotfix * cache prefix_hash_key * Minor update in IconScoreDatabase * self.prefix_hash_key -> self._prefix_hash_key * Remove concatenation operator "+" from _make_prefix_hash_key() * Change an error message in DictDB: "Not Supported iter function on DictDB" -> "Iteration not supported in DictDB" Co-authored-by: Chiwon Cho <[email protected]>
Co-authored-by: Chiwon Cho <[email protected]>
Co-authored-by: Chiwon Cho <[email protected]>
- Can't withdraw deposit if penalty is charged
…draw-with-penalty IS-1042 fix Fee 2.0 bug
* Adjust tx count in a block with execution time * Raise an exception on DictDB iteration * Fix a minor bug in Fee-2.0 * Optimize ArrayDB, DictDB and VarDB used for SCORE development * Support sha_256 function in SCORE
yakkle
approved these changes
Apr 10, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.