Page MenuHomePhabricator
Files F13711131

D1263.id3432.diff
No OneTemporary
Actions

D1263.id3432.diff
View Options

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -103,9 +103,9 @@
consensus.BIP34Hash = uint256S("0x000000000000024b89b42a942fe0d9fea3bb4"
"4ab7bd1b19115dd6a759c0808b8");
// 000000000000000004c2b624ed5d7756c508d90fd0da2c7c679febfa6c4735f0
- consensus.BIP65Height = 388381;
+ consensus.BIP65Height = 388380;
// 00000000000000000379eaa19dce8c9b722d46ae6a57c2f1a988119488b50931
- consensus.BIP66Height = 363725;
+ consensus.BIP66Height = 363724;
consensus.antiReplayOpReturnSunsetHeight = 530000;
consensus.antiReplayOpReturnCommitment = GetAntiReplayCommitment();
consensus.powLimit = uint256S(
@@ -280,9 +280,9 @@
consensus.BIP34Hash = uint256S("0x0000000023b3a96d3484e5abb3755c413e7d4"
"1500f8e2a5c3f0dd01299cd8ef8");
// 00000000007f6655f22f98e72ed80d8b06dc761d5da09df0fa1dc4be4f861eb6
- consensus.BIP65Height = 581885;
+ consensus.BIP65Height = 581884;
// 000000002104c8c45e99a8853285a3b592602a3ccde2b832481da85e9e4ba182
- consensus.BIP66Height = 330776;
+ consensus.BIP66Height = 330775;
consensus.antiReplayOpReturnSunsetHeight = 1250000;
consensus.antiReplayOpReturnCommitment = GetAntiReplayCommitment();
consensus.powLimit = uint256S(
@@ -419,9 +419,9 @@
consensus.BIP34Height = 100000000;
consensus.BIP34Hash = uint256();
// BIP65 activated on regtest (Used in rpc activation tests)
- consensus.BIP65Height = 1351;
+ consensus.BIP65Height = 1350;
// BIP66 activated on regtest (Used in rpc activation tests)
- consensus.BIP66Height = 1251;
+ consensus.BIP66Height = 1250;
consensus.antiReplayOpReturnSunsetHeight = 530000;
consensus.antiReplayOpReturnCommitment = GetAntiReplayCommitment();
consensus.powLimit = uint256S(
diff --git a/src/validation.cpp b/src/validation.cpp
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1916,12 +1916,12 @@
fStrictPayToScriptHash ? SCRIPT_VERIFY_P2SH : SCRIPT_VERIFY_NONE;
// Start enforcing the DERSIG (BIP66) rule
- if (pindex->nHeight >= consensusparams.BIP66Height) {
+ if (pindex->pprev->nHeight >= consensusparams.BIP66Height) {
flags |= SCRIPT_VERIFY_DERSIG;
}
// Start enforcing CHECKLOCKTIMEVERIFY (BIP65) rule
- if (pindex->nHeight >= consensusparams.BIP65Height) {
+ if (pindex->pprev->nHeight >= consensusparams.BIP65Height) {
flags |= SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY;
}

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 26, 10:35 (3 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5573284
Default Alt Text
D1263.id3432.diff (2 KB)

Event Timeline