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
df06a794
Commit
df06a794
authored
Apr 14, 2019
by
barrystyle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
swiftTX sporks and checks removal
parent
7554cffc
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
0 additions
and
84 deletions
+0
-84
src/main.cpp
src/main.cpp
+0
-69
src/spork.cpp
src/spork.cpp
+0
-6
src/spork.h
src/spork.h
+0
-4
src/swifttx.cpp
src/swifttx.cpp
+0
-1
src/wallet.cpp
src/wallet.cpp
+0
-4
No files found.
src/main.cpp
View file @
df06a794
...
...
@@ -1107,31 +1107,6 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState& state, const CTransa
if
(
pool
.
exists
(
hash
))
return
false
;
// ----------- swiftTX transaction scanning -----------
BOOST_FOREACH
(
const
CTxIn
&
in
,
tx
.
vin
)
{
if
(
mapLockedInputs
.
count
(
in
.
prevout
))
{
if
(
mapLockedInputs
[
in
.
prevout
]
!=
tx
.
GetHash
())
{
return
state
.
DoS
(
0
,
error
(
"AcceptToMemoryPool : conflicts with existing transaction lock: %s"
,
reason
),
REJECT_INVALID
,
"tx-lock-conflict"
);
}
}
}
// Check for conflicts with in-memory transactions
{
LOCK
(
pool
.
cs
);
// protect pool.mapNextTx
for
(
unsigned
int
i
=
0
;
i
<
tx
.
vin
.
size
();
i
++
)
{
COutPoint
outpoint
=
tx
.
vin
[
i
].
prevout
;
if
(
pool
.
mapNextTx
.
count
(
outpoint
))
{
// Disable replacement feature for now
return
false
;
}
}
}
{
CCoinsView
dummy
;
CCoinsViewCache
view
(
&
dummy
);
...
...
@@ -1254,28 +1229,6 @@ bool AcceptableInputs(CTxMemPool& pool, CValidationState& state, const CTransact
if
(
pool
.
exists
(
hash
))
return
false
;
// ----------- swiftTX transaction scanning -----------
BOOST_FOREACH
(
const
CTxIn
&
in
,
tx
.
vin
)
{
if
(
mapLockedInputs
.
count
(
in
.
prevout
))
{
if
(
mapLockedInputs
[
in
.
prevout
]
!=
tx
.
GetHash
())
{
return
state
.
DoS
(
0
,
error
(
"AcceptableInputs : conflicts with existing transaction lock: %s"
,
reason
),
REJECT_INVALID
,
"tx-lock-conflict"
);
}
}
}
// Check for conflicts with in-memory transactions
LOCK
(
pool
.
cs
);
// protect pool.mapNextTx
for
(
unsigned
int
i
=
0
;
i
<
tx
.
vin
.
size
();
i
++
)
{
COutPoint
outpoint
=
tx
.
vin
[
i
].
prevout
;
if
(
pool
.
mapNextTx
.
count
(
outpoint
))
{
// Disable replacement feature for now
return
false
;
}
}
{
CCoinsView
dummy
;
CCoinsViewCache
view
(
&
dummy
);
...
...
@@ -3183,27 +3136,6 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
return
state
.
DoS
(
100
,
error
(
"CheckBlock() : more than one coinstake"
));
}
// ----------- swiftTX transaction scanning -----------
if
(
IsSporkActive
(
SPORK_3_SWIFTTX_BLOCK_FILTERING
))
{
BOOST_FOREACH
(
const
CTransaction
&
tx
,
block
.
vtx
)
{
if
(
!
tx
.
IsCoinBase
())
{
//only reject blocks when it's based on complete consensus
BOOST_FOREACH
(
const
CTxIn
&
in
,
tx
.
vin
)
{
if
(
mapLockedInputs
.
count
(
in
.
prevout
))
{
if
(
mapLockedInputs
[
in
.
prevout
]
!=
tx
.
GetHash
())
{
mapRejectedBlocks
.
insert
(
make_pair
(
block
.
GetHash
(),
GetTime
()));
LogPrintf
(
"CheckBlock() : found conflicting transaction with transaction lock %s %s
\n
"
,
mapLockedInputs
[
in
.
prevout
].
ToString
(),
tx
.
GetHash
().
ToString
());
return
state
.
DoS
(
0
,
error
(
"CheckBlock() : found conflicting transaction with transaction lock"
),
REJECT_INVALID
,
"conflicting-tx-ix"
);
}
}
}
}
}
}
else
{
LogPrintf
(
"CheckBlock() : skipping transaction locking checks
\n
"
);
}
// masternode payments / budgets
CBlockIndex
*
pindexPrev
=
chainActive
.
Tip
();
int
nHeight
=
0
;
...
...
@@ -5527,7 +5459,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
mnodeman
.
ProcessMessage
(
pfrom
,
strCommand
,
vRecv
);
budget
.
ProcessMessage
(
pfrom
,
strCommand
,
vRecv
);
masternodePayments
.
ProcessMessageMasternodePayments
(
pfrom
,
strCommand
,
vRecv
);
ProcessMessageSwiftTX
(
pfrom
,
strCommand
,
vRecv
);
ProcessSpork
(
pfrom
,
strCommand
,
vRecv
);
masternodeSync
.
ProcessMessage
(
pfrom
,
strCommand
,
vRecv
);
}
...
...
src/spork.cpp
View file @
df06a794
...
...
@@ -126,8 +126,6 @@ int64_t GetSporkValue(int nSporkID)
if
(
mapSporksActive
.
count
(
nSporkID
))
{
r
=
mapSporksActive
[
nSporkID
].
nValue
;
}
else
{
if
(
nSporkID
==
SPORK_2_SWIFTTX
)
r
=
SPORK_2_SWIFTTX_DEFAULT
;
if
(
nSporkID
==
SPORK_3_SWIFTTX_BLOCK_FILTERING
)
r
=
SPORK_3_SWIFTTX_BLOCK_FILTERING_DEFAULT
;
if
(
nSporkID
==
SPORK_5_MAX_VALUE
)
r
=
SPORK_5_MAX_VALUE_DEFAULT
;
if
(
nSporkID
==
SPORK_7_MASTERNODE_SCANNING
)
r
=
SPORK_7_MASTERNODE_SCANNING_DEFAULT
;
if
(
nSporkID
==
SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT
)
r
=
SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT
;
...
...
@@ -273,8 +271,6 @@ bool CSporkManager::SetPrivKey(std::string strPrivKey)
int
CSporkManager
::
GetSporkIDByName
(
std
::
string
strName
)
{
if
(
strName
==
"SPORK_2_SWIFTTX"
)
return
SPORK_2_SWIFTTX
;
if
(
strName
==
"SPORK_3_SWIFTTX_BLOCK_FILTERING"
)
return
SPORK_3_SWIFTTX_BLOCK_FILTERING
;
if
(
strName
==
"SPORK_5_MAX_VALUE"
)
return
SPORK_5_MAX_VALUE
;
if
(
strName
==
"SPORK_7_MASTERNODE_SCANNING"
)
return
SPORK_7_MASTERNODE_SCANNING
;
if
(
strName
==
"SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT"
)
return
SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT
;
...
...
@@ -288,8 +284,6 @@ int CSporkManager::GetSporkIDByName(std::string strName)
std
::
string
CSporkManager
::
GetSporkNameByID
(
int
id
)
{
if
(
id
==
SPORK_2_SWIFTTX
)
return
"SPORK_2_SWIFTTX"
;
if
(
id
==
SPORK_3_SWIFTTX_BLOCK_FILTERING
)
return
"SPORK_3_SWIFTTX_BLOCK_FILTERING"
;
if
(
id
==
SPORK_5_MAX_VALUE
)
return
"SPORK_5_MAX_VALUE"
;
if
(
id
==
SPORK_7_MASTERNODE_SCANNING
)
return
"SPORK_7_MASTERNODE_SCANNING"
;
if
(
id
==
SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT
)
return
"SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT"
;
...
...
src/spork.h
View file @
df06a794
...
...
@@ -30,8 +30,6 @@ using namespace boost;
#define SPORK_START 10001
#define SPORK_END 10015
#define SPORK_2_SWIFTTX 10001
#define SPORK_3_SWIFTTX_BLOCK_FILTERING 10002
#define SPORK_5_MAX_VALUE 10004
#define SPORK_7_MASTERNODE_SCANNING 10006
#define SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT 10007
...
...
@@ -40,8 +38,6 @@ using namespace boost;
#define SPORK_13_ENABLE_SUPERBLOCKS 10012
#define SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2 10014
#define SPORK_2_SWIFTTX_DEFAULT 978307200 //2001-1-1
#define SPORK_3_SWIFTTX_BLOCK_FILTERING_DEFAULT 1424217600 //2015-2-18
#define SPORK_5_MAX_VALUE_DEFAULT 1000 //1000 PIV
#define SPORK_7_MASTERNODE_SCANNING_DEFAULT 978307200 //2001-1-1
#define SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT 4070908800 //OFF
...
...
src/swifttx.cpp
View file @
df06a794
...
...
@@ -38,7 +38,6 @@ int nCompleteTXLocks;
void
ProcessMessageSwiftTX
(
CNode
*
pfrom
,
std
::
string
&
strCommand
,
CDataStream
&
vRecv
)
{
if
(
fLiteMode
)
return
;
//disable all obfuscation/masternode related functionality
if
(
!
IsSporkActive
(
SPORK_2_SWIFTTX
))
return
;
if
(
!
masternodeSync
.
IsBlockchainSynced
())
return
;
if
(
strCommand
==
"ix"
)
{
...
...
src/wallet.cpp
View file @
df06a794
...
...
@@ -3647,8 +3647,6 @@ bool CMerkleTx::AcceptToMemoryPool(bool fLimitFree, bool fRejectInsaneFee, bool
int
CMerkleTx
::
GetTransactionLockSignatures
()
const
{
if
(
fLargeWorkForkFound
||
fLargeWorkInvalidChainFound
)
return
-
2
;
if
(
!
IsSporkActive
(
SPORK_2_SWIFTTX
))
return
-
3
;
if
(
!
fEnableSwiftTX
)
return
-
1
;
//compile consessus vote
std
::
map
<
uint256
,
CTransactionLock
>::
iterator
i
=
mapTxLocks
.
find
(
GetHash
());
...
...
@@ -3661,8 +3659,6 @@ int CMerkleTx::GetTransactionLockSignatures() const
bool
CMerkleTx
::
IsTransactionLockTimedOut
()
const
{
if
(
!
fEnableSwiftTX
)
return
0
;
//compile consessus vote
std
::
map
<
uint256
,
CTransactionLock
>::
iterator
i
=
mapTxLocks
.
find
(
GetHash
());
if
(
i
!=
mapTxLocks
.
end
())
{
...
...
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