Skip to content

Commit 955853a

Browse files
committed
Clear electrum midstate caching on reorganized, not regressed.
1 parent eac3a0a commit 955853a

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

include/bitcoin/server/protocols/protocol_electrum.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ class BCS_API protocol_electrum
242242
void do_header(node::header_t link) NOEXCEPT;
243243
void do_outpoint(node::header_t link) NOEXCEPT;
244244
void do_scripthash(node::header_t link) NOEXCEPT;
245-
void do_regressed(node::header_t link) NOEXCEPT;
245+
void do_reorganized(node::header_t link) NOEXCEPT;
246246

247247
/// Address.
248248
/// -----------------------------------------------------------------------

src/protocols/electrum/protocol_electrum.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,11 @@ bool protocol_electrum::handle_event(const code&, node::chase event_,
169169

170170
break;
171171
}
172-
case node::chase::regressed:
173-
case node::chase::disorganized:
172+
case node::chase::reorganized:
174173
{
175174
// value is regression branch_point.
176175
BC_ASSERT(std::holds_alternative<node::height_t>(value));
177-
NOTIFY(do_regressed, std::get<node::height_t>(value));
176+
NOTIFY(do_reorganized, std::get<node::height_t>(value));
178177
break;
179178
}
180179
default:

src/protocols/electrum/protocol_electrum_scripthash_subscribe.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ void protocol_electrum::scripthash_notify(const hash_digest& status,
226226
// regress
227227
// ----------------------------------------------------------------------------
228228

229-
// The chain has regressed, clear all midstate cache and cursors.
230-
void protocol_electrum::do_regressed(node::header_t) NOEXCEPT
229+
// The chain has been reduced in height, clear all midstate cache and cursors.
230+
void protocol_electrum::do_reorganized(node::header_t) NOEXCEPT
231231
{
232232
BC_ASSERT(notification_strand_.running_in_this_thread());
233233

0 commit comments

Comments
 (0)