From d26ff47a5ebfc4db0ab126b948c98c41967aa5f5 Mon Sep 17 00:00:00 2001 From: liukunyu Date: Sun, 10 Mar 2019 00:55:13 +0800 Subject: [PATCH 1/2] fix: fix compile cli_wallet failed in ubuntu18.04 --- libraries/wallet/generate_api_documentation.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/wallet/generate_api_documentation.pl b/libraries/wallet/generate_api_documentation.pl index a3f333db..cf51804e 100755 --- a/libraries/wallet/generate_api_documentation.pl +++ b/libraries/wallet/generate_api_documentation.pl @@ -3,7 +3,7 @@ use Text::Wrap; use IO::File; -require 'doxygen/perlmod/DoxyDocs.pm'; +require './doxygen/perlmod/DoxyDocs.pm'; my($outputFileName) = @ARGV; die "usage: $0 output_file_name" unless $outputFileName; From f395c19bc70da3697e278d0c62788760518d7319 Mon Sep 17 00:00:00 2001 From: liukunyu Date: Mon, 11 Mar 2019 17:56:18 +0800 Subject: [PATCH 2/2] fix: fix remove contract item crash --- libraries/chain/apply_context.cpp | 4 +++- libraries/chain/include/graphene/chain/hardfork.hpp | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libraries/chain/apply_context.cpp b/libraries/chain/apply_context.cpp index 0762bfba..5b120353 100644 --- a/libraries/chain/apply_context.cpp +++ b/libraries/chain/apply_context.cpp @@ -185,7 +185,9 @@ void apply_context::db_remove_i64(int iterator) --t.count; }); if (table_obj.count == 0) { - remove_table(table_obj); + if(_db->head_block_time() <= HARDFORK_1020_TIME) { + remove_table(table_obj); + } } } else { update_ram_usage(ram_delta); diff --git a/libraries/chain/include/graphene/chain/hardfork.hpp b/libraries/chain/include/graphene/chain/hardfork.hpp index 7b3807ca..cffc1f4a 100644 --- a/libraries/chain/include/graphene/chain/hardfork.hpp +++ b/libraries/chain/include/graphene/chain/hardfork.hpp @@ -101,6 +101,11 @@ #define HARDFORK_1019_TIME (fc::time_point_sec( 1552176000 )) // for mainnet, 2019-03-10T00:00:00 UTC #endif +#ifndef HARDFORK_1020_TIME +// for testnet after this time can not remove contract table +#define HARDFORK_1020_TIME (fc::time_point_sec( 1552381200 )) // for testnet, 2019-03-12T08:00:00(UTC) +#endif + // #413 Add operation to claim asset fees #ifndef HARDFORK_413_TIME #define HARDFORK_413_TIME (fc::time_point_sec( 1446652800 ))