Skip to content
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

Merged
merged 22 commits into from
Apr 10, 2020

Conversation

goldworm-icon
Copy link
Member

  • Merge updated code for hotfix-1.6.1 info develop

Chiwon Cho and others added 22 commits January 20, 2020 10:34
* Add new configuration: "BlockInvokeTimeout"
* Default timeout: 15s
* 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
…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 <goldworm@iconloop.com>
Co-authored-by: Chiwon Cho <goldworm@iconloop.com>
Co-authored-by: Chiwon Cho <goldworm@iconloop.com>
- 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
@goldworm-icon goldworm-icon requested a review from a team April 9, 2020 10:02
@goldworm-icon goldworm-icon self-assigned this Apr 9, 2020
@goldworm-icon goldworm-icon merged commit 853ec07 into develop Apr 10, 2020
@goldworm-icon goldworm-icon deleted the IS-1049-merge-hotfix-1-6-1 branch April 10, 2020 06:00
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants