Merge branch 'master' into sps

Author: Michael Vandeberg

.gitignore

@@ -1,24 +1,85 @@
+# Binary and library file types
 *.a
-*.sw*
+*.dylib
+*.so
+*.pyc
+*.pyo
+
+# Xcode project files
+*.xcodeproj/
+*.build/
+Debug/
+Release/
 
+# Visual Studio Code files
 .vscode
-*.cmake
+
+# CMake files
+cmake_install.cmake
 CMakeCache.txt
 CMakeFiles
+CMakeDoxyfile.in
+CMakeDoxygenDefaults.cmake
+CMakeScripts/
+
+# Unix Makefiles
 Makefile
-compile_commands.json
-moc_*
-*.moc
-hardfork.hpp
 
+# Misc files
+\#*\#
+*~
+compile_commands.json
 lcov
+doxygen
 
-libraries/utilities/git_revision.cpp
+# Project generated files/directories
 
+build_version.cc
+
+libraries/appbase/examples/appbase_example
+libraries/chainbase/test/chainbase_test
+libraries/protocol/include/steem/protocol/hardfork.hpp
+libraries/fc/git_revision.cpp
+libraries/fc/tests/all_tests
+libraries/fc/tests/api
+libraries/fc/tests/bip_lock
+libraries/fc/tests/blind
+libraries/fc/tests/bloom_test
+libraries/fc/tests/ecc_test
+libraries/fc/tests/ecdsa_canon_test
+libraries/fc/tests/hmac_test
+libraries/fc/tests/log_test
+libraries/fc/tests/ntp_test
+libraries/fc/tests/real128_test
+libraries/fc/tests/saturation_test
+libraries/fc/tests/sha_test
+libraries/fc/tests/task_cancel_test
+libraries/fc/tests/thread_test
+libraries/fc/vendor/secp256k1-zkp/src/project_secp256k1-build/
+libraries/fc/vendor/secp256k1-zkp/src/project_secp256k1-stamp/
+libraries/fc/vendor/secp256k1-zkp/tmp/
+libraries/jsonball/gensrc/
+libraries/jsonball/template_context/
+libraries/manifest/gensrc/
+libraries/manifest/template_context/
+libraries/mira/test/mira_test
+libraries/utilities/git_revision.cpp
+libraries/vendor/rocksdb/RocksDBConfig.cmake
+libraries/vendor/rocksdb/RocksDBConfigVersion.cmake
 libraries/wallet/Doxyfile
 libraries/wallet/api_documentation.cpp
 libraries/wallet/doxygen
 
+programs/build_helpers/steem_build_helpers/__pycache__/
+programs/util/dump_steem_schema
+programs/util/schema_test
+programs/util/serialize_set_properties
+programs/util/sign_digest
+programs/util/sign_transaction
+programs/util/test_block_log
+programs/util/test_fixed_string
+programs/util/test_shared_mem
+programs/util/test_sqrt
 programs/cli_wallet/cli_wallet
 programs/js_operation_serializer/js_operation_serializer
 programs/steemd/steemd
@@ -36,18 +97,7 @@ tests/plugin_test
 tests/intense_test
 tests/performance_test
 
-doxygen
-
-build
-build.debug
-build.release
-
-wallet.json
-witness_node_data_dir
-
-*.wallet
-
-*.pyc
-*.pyo
-*.egg-info/
-*.log
+# Build directories
+build/
+build.*/
+build-*/

libraries/chain/include/steem/chain/account_object.hpp

@@ -126,7 +126,7 @@ namespace steem { namespace chain {
 
       template< typename Constructor, typename Allocator >
       account_metadata_object( Constructor&& c, allocator< Allocator > a )
-         : json_metadata( a )
+         : json_metadata( a ), posting_json_metadata( a )
       {
          c( *this );
       }

libraries/chain/steem_evaluator.cpp

@@ -1883,7 +1883,15 @@ void hf20_vote_evaluator( const vote_operation& o, database& _db )
       util::manabar_params params( util::get_effective_vesting_shares( a ), STEEM_VOTING_MANA_REGENERATION_SECONDS );
       a.voting_manabar.regenerate_mana( params, now );
    });
-   FC_ASSERT( voter.voting_manabar.current_mana > 0, "Account does not have enough mana to vote." );
+
+   if ( _db.has_hardfork( STEEM_HARDFORK_0_21__3004 ) )
+   {
+      FC_ASSERT( voter.voting_manabar.current_mana >= 0, "Account does not have enough mana to vote." );
+   }
+   else
+   {
+      FC_ASSERT( voter.voting_manabar.current_mana > 0, "Account does not have enough mana to vote." );
+   }
 
    int16_t abs_weight = abs( o.weight );
    uint128_t used_mana = ( uint128_t( voter.voting_manabar.current_mana ) * abs_weight * 60 * 60 * 24 ) / STEEM_100_PERCENT;

libraries/protocol/hardfork.d/0_21.hf

@@ -5,6 +5,7 @@
 #define STEEM_HARDFORK_0_21_TIME 1549033025 // Friday, February 1, 2019 2:57:05 PM
 
 #define STEEM_HARDFORK_0_21__2203 (STEEM_HARDFORK_0_21)
+#define STEEM_HARDFORK_0_21__3004 (STEEM_HARDFORK_0_21)
 #define STEEM_HARDFORK_0_21__3274 (STEEM_HARDFORK_0_21)
 
 #define STEEM_HARDFORK_0_21_VERSION hardfork_version( 0, 21 )