From 811d68ef4d700f7a5717433faf79dd4dcea65970 Mon Sep 17 00:00:00 2001
From: Davor Hirunda <mdmdavor@gmail.com>
Date: Tue, 15 Nov 2022 22:34:05 +0000
Subject: [PATCH] Fix for undo crash

---
 libraries/chain/hardfork.d/SIDECHAIN.hf       |  7 +++++
 .../chain/sidechain_address_evaluator.cpp     | 27 +++++++++++--------
 tests/tests/sidechain_addresses_test.cpp      | 14 +++++-----
 3 files changed, 30 insertions(+), 18 deletions(-)
 create mode 100644 libraries/chain/hardfork.d/SIDECHAIN.hf

diff --git a/libraries/chain/hardfork.d/SIDECHAIN.hf b/libraries/chain/hardfork.d/SIDECHAIN.hf
new file mode 100644
index 00000000..3a0a3990
--- /dev/null
+++ b/libraries/chain/hardfork.d/SIDECHAIN.hf
@@ -0,0 +1,7 @@
+#ifndef HARDFORK_SIDECHAIN_DELETE_TIME
+#ifdef BUILD_PEERPLAYS_TESTNET
+#define HARDFORK_SIDECHAIN_DELETE_TIME (fc::time_point_sec::from_iso_string("2022-11-16T02:00:00"))
+#else
+#define HARDFORK_SIDECHAIN_DELETE_TIME (fc::time_point_sec::from_iso_string("2022-11-16T02:00:00"))
+#endif
+#endif
diff --git a/libraries/chain/sidechain_address_evaluator.cpp b/libraries/chain/sidechain_address_evaluator.cpp
index 0efd54cf..3cffc61e 100644
--- a/libraries/chain/sidechain_address_evaluator.cpp
+++ b/libraries/chain/sidechain_address_evaluator.cpp
@@ -22,12 +22,14 @@ object_id_type add_sidechain_address_evaluator::do_apply(const sidechain_address
     const auto &sidechain_addresses_idx = db().get_index_type<sidechain_address_index>().indices().get<by_account_and_sidechain_and_expires>();
     const auto &addr_itr = sidechain_addresses_idx.find(std::make_tuple(op.sidechain_address_account, op.sidechain, time_point_sec::maximum()));
 
-    if (addr_itr != sidechain_addresses_idx.end())
-    {
-        //db().modify(*addr_itr, [&](sidechain_address_object &sao) {
-        //    sao.expires = db().head_block_time();
-        //});
-        db().remove(*addr_itr);
+    if (addr_itr != sidechain_addresses_idx.end()) {
+       if (db().head_block_time() >= HARDFORK_SIDECHAIN_DELETE_TIME) {
+          db().remove(*addr_itr);
+       } else {
+          db().modify(*addr_itr, [&](sidechain_address_object &sao) {
+             sao.expires = db().head_block_time();
+          });
+       }
     }
 
     const auto& new_sidechain_address_object = db().create<sidechain_address_object>( [&]( sidechain_address_object& obj ){
@@ -106,11 +108,14 @@ void_result delete_sidechain_address_evaluator::do_apply(const sidechain_address
 { try {
     const auto& idx = db().get_index_type<sidechain_address_index>().indices().get<by_id>();
     auto sidechain_address = idx.find(op.sidechain_address_id);
-    if(sidechain_address != idx.end()) {
-        //db().modify(*sidechain_address, [&](sidechain_address_object &sao) {
-        //    sao.expires = db().head_block_time();
-        //});
-        db().remove(*sidechain_address);
+    if (sidechain_address != idx.end()) {
+       if (db().head_block_time() >= HARDFORK_SIDECHAIN_DELETE_TIME) {
+          db().remove(*sidechain_address);
+       } else {
+          db().modify(*sidechain_address, [&](sidechain_address_object &sao) {
+             sao.expires = db().head_block_time();
+          });
+       }
     }
     return void_result();
 } FC_CAPTURE_AND_RETHROW( (op) ) }
diff --git a/tests/tests/sidechain_addresses_test.cpp b/tests/tests/sidechain_addresses_test.cpp
index 5f4885e6..8c3229d3 100644
--- a/tests/tests/sidechain_addresses_test.cpp
+++ b/tests/tests/sidechain_addresses_test.cpp
@@ -244,6 +244,9 @@ BOOST_AUTO_TEST_CASE( sidechain_address_delete_test ) {
 
    BOOST_TEST_MESSAGE("sidechain_address_delete_test");
 
+   generate_blocks(HARDFORK_SIDECHAIN_DELETE_TIME);
+   generate_block();
+
    INVOKE(sidechain_address_add_test);
 
    GET_ACTOR(alice);
@@ -266,18 +269,12 @@ BOOST_AUTO_TEST_CASE( sidechain_address_delete_test ) {
       sign(trx, alice_private_key);
       PUSH_TX(db, trx, ~0);
    }
-   //time_point_sec now = db.head_block_time();
-   generate_block();
 
+   generate_block();
    {
       BOOST_TEST_MESSAGE("Check sidechain_address_delete_operation results");
 
       const auto& idx = db.get_index_type<sidechain_address_index>().indices().get<by_account_and_sidechain_and_expires>();
-      //BOOST_REQUIRE( idx.size() == 1 );
-      //auto obj = idx.find( boost::make_tuple( alice_id, sidechain_type::bitcoin, time_point_sec::maximum() ) );
-      //BOOST_REQUIRE( obj == idx.end() );
-      //auto expired_obj = idx.find( boost::make_tuple( alice_id, sidechain_type::bitcoin, now ) );
-      //BOOST_REQUIRE( expired_obj != idx.end() );
       BOOST_REQUIRE( idx.size() == 0 );
    }
 }
@@ -286,6 +283,9 @@ BOOST_AUTO_TEST_CASE(sidechain_address_delete_create_test) {
 
    BOOST_TEST_MESSAGE("sidechain_address_delete_create_test");
 
+   generate_blocks(HARDFORK_SIDECHAIN_DELETE_TIME);
+   generate_block();
+
    INVOKE(sidechain_address_add_test);
 
    GET_ACTOR(alice);