Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.1 -> main] Fix replay to correctly add trxs into the de-dup list #275

Merged
merged 3 commits into from
Oct 4, 2022
Merged

[3.1 -> main] Fix replay to correctly add trxs into the de-dup list #275

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d84717
Mandel-301 Fix replay to correctly add trxs into the de-dup list
heifner Oct 3, 2022
66f1d61
Merge pull request #273 from AntelopeIO/mandel-301-3.1
heifner Oct 3, 2022
d0874b1
Merge remote-tracking branch 'origin/release/3.1' into mandel-301
heifner Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions libraries/chain/controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1528,7 +1528,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);
Expand Down Expand Up @@ -2404,7 +2404,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 {
Expand Down