Merge branch 'dev_master' into testnet

gxchain · Mar 11, 2019 · 2ad988c · 2ad988c
2 parents f9b8c9a + f395c19
commit 2ad988c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -106,6 +106,11 @@
 #define HARDFORK_1103_TIME (fc::time_point_sec( 1541203200 ))
 #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 ))

diff --git 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;