Merge shared-db branch into develop #472
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
Setting reset account requires owner key. After 60 days of inactivity the reset account can change the owner authority of the account. Challenging owner authority is enabled but only if being challenged by the reset account. Account reset is opt-in but accounts are grandfathered in on setting their first reset account by only requiring their posting key. This is so that accounts that were managing their keys separately and lost their owner key can set a reset account and have a chance at securing their account.
This change reduces the amount of dynamic memory allocation used and reduces string comparisons.
# Conflicts: # libraries/app/database_api.cpp # libraries/chain/include/steemit/chain/steem_objects.hpp # libraries/plugins/follow/follow_plugin.cpp
I don't understand (1) why the parent commit broke the build, or (2) why this commit fixes it. The linker is a creature of dark magic.
…of using try/catch
Use find_account() in HF9 logic
Serialize operations in account history
Finish removing std::stringstream from raw_block_api.cpp
Result of running following commands on previous commit:
find . -name "*.*pp" -type f -print0 | xargs -0 sed -i 's/generic_json_evaluator_registry/custom_operation_interpreter/g'
find . -name "*.*pp" -type f -print0 | xargs -0 sed -i 's/json_evaluator_registry/generic_custom_operation_interpreter/g'
find . -name "*.*pp" -type f -print0 | xargs -0 sed -i 's/generic_evaluator/evaluator_base/g'
find . -name "*.*pp" -type f -print0 | xargs -0 sed -i 's/set_custom_json_evaluator/set_custom_operation_interpreter/g'
find . -name "*.*pp" -type f -print0 | xargs -0 sed -i 's/_custom_json_evaluators/_custom_operation_interpreters/g'
find libraries/plugins -name "*.*pp" -type f -print0 | xargs -0 sed -i 's/_evaluator_registry/_custom_operation_interpreter/g'
git mv libraries/chain/include/steemit/chain/generic_json_evaluator_registry.hpp libraries/chain/include/steemit/chain/custom_operation_interpreter.hpp
git mv libraries/chain/include/steemit/chain/json_evaluator_registry.hpp libraries/chain/include/steemit/chain/generic_custom_operation_interpreter.hpp
…n api for get references. #531
Updates shared-db to 0.15.0 # Conflicts: # libraries/chain/database.cpp # libraries/chain/hardfork.d/0-preamble.hf # libraries/chain/hardfork.d/0_15.hf
mvandeberg
approved these changes
Nov 4, 2016
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.
No description provided.