Merge pull request #273 from AntelopeIO/mandel-301-3.1

[3.1] Fix replay to correctly add trxs into the de-dup list
AntelopeIO · Oct 3, 2022 · 66f1d61 · 66f1d61
2 parents 60781e2 + 6d84717
commit 66f1d61
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -1499,7 +1499,7 @@ struct controller_impl {
                trx_context.init_for_implicit_trx();
                trx_context.enforce_whiteblacklist = false;
             } else {
-               bool skip_recording = replay_head_time && (time_point(trn.expiration) <= *replay_head_time);
+               bool skip_recording = replay_head_time && (time_point(trn.expiration) < *replay_head_time);
                trx_context.init_for_input_trx( trx->packed_trx()->get_unprunable_size(),
                                                trx->packed_trx()->get_prunable_size(),
                                                skip_recording);
@@ -2350,7 +2350,8 @@ struct controller_impl {
             break;
          }
       }
-      dlog("removed ${n} expired transactions of the ${t} input dedup list", ("n", num_removed)("t", total));
+      dlog("removed ${n} expired transactions of the ${t} input dedup list, pending block time ${pt}",
+           ("n", num_removed)("t", total)("pt", now));
    }
 
    bool sender_avoids_whitelist_blacklist_enforcement( account_name sender )const {