Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in / Register
Toggle navigation
Merge Wallet
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
8
Issues
8
List
Boards
Labels
Milestones
Packages
Packages
Container Registry
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Merge
Merge Wallet
Commits
7554cffc
Commit
7554cffc
authored
Apr 14, 2019
by
barrystyle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
spork 14 and 16 removal
parent
809073c4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
25 deletions
+2
-25
configure.ac
configure.ac
+1
-1
src/main.cpp
src/main.cpp
+1
-11
src/spork.cpp
src/spork.cpp
+0
-6
src/spork.h
src/spork.h
+0
-7
No files found.
configure.ac
View file @
7554cffc
...
...
@@ -4,7 +4,7 @@ define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 3)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE,
tru
e)
define(_CLIENT_VERSION_IS_RELEASE,
fals
e)
define(_COPYRIGHT_YEAR, 2019)
AC_INIT([Merge Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.projectmerge.org],[merge])
AC_CONFIG_SRCDIR([src/main.cpp])
...
...
src/main.cpp
View file @
7554cffc
...
...
@@ -4746,9 +4746,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
// MERGE: We use certain sporks during IBD, so check to see if they are
// available. If not, ask the first peer connected for them.
bool
fMissingSporks
=
!
pSporkDB
->
SporkExists
(
SPORK_14_NEW_PROTOCOL_ENFORCEMENT
)
&&
!
pSporkDB
->
SporkExists
(
SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2
)
&&
!
pSporkDB
->
SporkExists
(
SPORK_16_ZEROCOIN_MAINTENANCE_MODE
);
bool
fMissingSporks
=
!
pSporkDB
->
SporkExists
(
SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2
);
if
(
fMissingSporks
||
!
fRequestedSporksIDB
){
LogPrintf
(
"asking peer for sporks
\n
"
);
...
...
@@ -5544,14 +5542,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
// it was the one which was commented out
int
ActiveProtocol
()
{
// SPORK_14 was used for 70910. Leave it 'ON' so they don't see > 70910 nodes. They won't react to SPORK_15
// messages because it's not in their code
/* if (IsSporkActive(SPORK_14_NEW_PROTOCOL_ENFORCEMENT))
return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT;
*/
// SPORK_15 is used for 70911. Nodes < 70911 don't see it and still get their protocol version via SPORK_14 and their
// own ModifierUpgradeBlock()
...
...
src/spork.cpp
View file @
7554cffc
...
...
@@ -134,9 +134,7 @@ int64_t GetSporkValue(int nSporkID)
if
(
nSporkID
==
SPORK_9_MASTERNODE_BUDGET_ENFORCEMENT
)
r
=
SPORK_9_MASTERNODE_BUDGET_ENFORCEMENT_DEFAULT
;
if
(
nSporkID
==
SPORK_10_MASTERNODE_PAY_UPDATED_NODES
)
r
=
SPORK_10_MASTERNODE_PAY_UPDATED_NODES_DEFAULT
;
if
(
nSporkID
==
SPORK_13_ENABLE_SUPERBLOCKS
)
r
=
SPORK_13_ENABLE_SUPERBLOCKS_DEFAULT
;
if
(
nSporkID
==
SPORK_14_NEW_PROTOCOL_ENFORCEMENT
)
r
=
SPORK_14_NEW_PROTOCOL_ENFORCEMENT_DEFAULT
;
if
(
nSporkID
==
SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2
)
r
=
SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2_DEFAULT
;
if
(
nSporkID
==
SPORK_16_ZEROCOIN_MAINTENANCE_MODE
)
r
=
SPORK_16_ZEROCOIN_MAINTENANCE_MODE_DEFAULT
;
if
(
r
==
-
1
)
LogPrintf
(
"%s : Unknown Spork %d
\n
"
,
__func__
,
nSporkID
);
}
...
...
@@ -283,9 +281,7 @@ int CSporkManager::GetSporkIDByName(std::string strName)
if
(
strName
==
"SPORK_9_MASTERNODE_BUDGET_ENFORCEMENT"
)
return
SPORK_9_MASTERNODE_BUDGET_ENFORCEMENT
;
if
(
strName
==
"SPORK_10_MASTERNODE_PAY_UPDATED_NODES"
)
return
SPORK_10_MASTERNODE_PAY_UPDATED_NODES
;
if
(
strName
==
"SPORK_13_ENABLE_SUPERBLOCKS"
)
return
SPORK_13_ENABLE_SUPERBLOCKS
;
if
(
strName
==
"SPORK_14_NEW_PROTOCOL_ENFORCEMENT"
)
return
SPORK_14_NEW_PROTOCOL_ENFORCEMENT
;
if
(
strName
==
"SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2"
)
return
SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2
;
if
(
strName
==
"SPORK_16_ZEROCOIN_MAINTENANCE_MODE"
)
return
SPORK_16_ZEROCOIN_MAINTENANCE_MODE
;
return
-
1
;
}
...
...
@@ -300,9 +296,7 @@ std::string CSporkManager::GetSporkNameByID(int id)
if
(
id
==
SPORK_9_MASTERNODE_BUDGET_ENFORCEMENT
)
return
"SPORK_9_MASTERNODE_BUDGET_ENFORCEMENT"
;
if
(
id
==
SPORK_10_MASTERNODE_PAY_UPDATED_NODES
)
return
"SPORK_10_MASTERNODE_PAY_UPDATED_NODES"
;
if
(
id
==
SPORK_13_ENABLE_SUPERBLOCKS
)
return
"SPORK_13_ENABLE_SUPERBLOCKS"
;
if
(
id
==
SPORK_14_NEW_PROTOCOL_ENFORCEMENT
)
return
"SPORK_14_NEW_PROTOCOL_ENFORCEMENT"
;
if
(
id
==
SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2
)
return
"SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2"
;
if
(
id
==
SPORK_16_ZEROCOIN_MAINTENANCE_MODE
)
return
"SPORK_16_ZEROCOIN_MAINTENANCE_MODE"
;
return
"Unknown"
;
}
src/spork.h
View file @
7554cffc
...
...
@@ -37,12 +37,8 @@ using namespace boost;
#define SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT 10007
#define SPORK_9_MASTERNODE_BUDGET_ENFORCEMENT 10008
#define SPORK_10_MASTERNODE_PAY_UPDATED_NODES 10009
//#define SPORK_11_LOCK_INVALID_UTXO 10010
//#define SPORK_12_RECONSIDER_BLOCKS 10011
#define SPORK_13_ENABLE_SUPERBLOCKS 10012
#define SPORK_14_NEW_PROTOCOL_ENFORCEMENT 10013
#define SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2 10014
#define SPORK_16_ZEROCOIN_MAINTENANCE_MODE 10015
#define SPORK_2_SWIFTTX_DEFAULT 978307200 //2001-1-1
#define SPORK_3_SWIFTTX_BLOCK_FILTERING_DEFAULT 1424217600 //2015-2-18
...
...
@@ -51,11 +47,8 @@ using namespace boost;
#define SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT 4070908800 //OFF
#define SPORK_9_MASTERNODE_BUDGET_ENFORCEMENT_DEFAULT 4070908800 //OFF
#define SPORK_10_MASTERNODE_PAY_UPDATED_NODES_DEFAULT 4070908800 //OFF
//#define SPORK_11_LOCK_INVALID_UTXO_DEFAULT 4070908800 //OFF - NOTE: this is block height not time!
#define SPORK_13_ENABLE_SUPERBLOCKS_DEFAULT 4070908800 //OFF
#define SPORK_14_NEW_PROTOCOL_ENFORCEMENT_DEFAULT 4070908800 //OFF
#define SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2_DEFAULT 4070908800 //OFF
#define SPORK_16_ZEROCOIN_MAINTENANCE_MODE_DEFAULT 4070908800 //OFF
class
CSporkMessage
;
class
CSporkManager
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment