Skip to content

Commit 70ccc03

Browse files
committed
bch: revert config_pool donation gate to bare >=36 (bucket-3, mirror BTC)
The get_donation_script version gate was deliberately left bare in #160 as bucket-3 pre-V36 transition compat (per-coin, temporary, dropped after the crossing-soak) and to mirror BTC 1:1 (BTC did not route its donation gate through core::version_gate either). Routing it through the SSOT in 268eeec silently diverged BCH from BTC; revert. Whether the donation predicate should standardize cross-coin is a [decision-needed] for the operator/integrator, not a unilateral BCH change. node.hpp SSOT delegation (genuine #160 miss) is retained.
1 parent 268eeec commit 70ccc03

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

src/impl/bch/config_pool.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include <btclibs/util/strencodings.h>
77
#include <btclibs/crypto/sha256.h>
88
#include <core/uint256.hpp>
9-
#include <core/version_gate.hpp> // SSOT: core::version_gate::is_v36_active
109

1110
#include <array>
1211
#include <cstdint>
@@ -154,7 +153,7 @@ class PoolConfig : protected core::Fileconfig
154153
// use the combined P2SH 1-of-2 multisig script. Same shape as BTC/LTC.
155154
static std::vector<unsigned char> get_donation_script(int64_t share_version)
156155
{
157-
if (core::version_gate::is_v36_active(share_version))
156+
if (share_version >= 36)
158157
return {COMBINED_DONATION_SCRIPT.begin(), COMBINED_DONATION_SCRIPT.end()};
159158
return {DONATION_SCRIPT.begin(), DONATION_SCRIPT.end()};
160159
}

0 commit comments

Comments
 (0)