DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

make wallet filter work for testnet notary

Browse Source
This commit is contained in:
blackjok3r
2019-04-09 01:36:30 +08:00
parent 7c86c40d71
commit d8edaa38ec
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/wallet/wallet.cpp
View File

@@ -1772,7 +1772,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pbl
if (fExisted || IsMine(tx) || IsFromMe(tx) || sproutNoteData.size() > 0 || saplingNoteData.size() > 0) if (fExisted || IsMine(tx) || IsFromMe(tx) || sproutNoteData.size() > 0 || saplingNoteData.size() > 0)
{ {
// wallet filter for notary nodes. Disabled! Can be reenabled or customised for any specific use, pools could also use this to prevent wallet dwy attack. // wallet filter for notary nodes. Disabled! Can be reenabled or customised for any specific use, pools could also use this to prevent wallet dwy attack.
if ( 0 && !tx.IsCoinBase() && !NOTARY_ADDRESS.empty() && IS_STAKED_NOTARY > -1 ) if ( !tx.IsCoinBase() ) //&& !NOTARY_ADDRESS.empty() && IS_STAKED_NOTARY > -1 )
{ {
int numvinIsOurs = 0, numvoutIsOurs = 0, numvinIsWhiteList = 0; int64_t totalvoutvalue = 0; int numvinIsOurs = 0, numvoutIsOurs = 0, numvinIsWhiteList = 0; int64_t totalvoutvalue = 0;
for (size_t i = 0; i < tx.vin.size(); i++) for (size_t i = 0; i < tx.vin.size(); i++)
@@ -1782,7 +1782,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pbl
{ {
if (ExtractDestination(txin.vout[tx.vin[i].prevout.n].scriptPubKey, address)) if (ExtractDestination(txin.vout[tx.vin[i].prevout.n].scriptPubKey, address))
{ {
if ( CBitcoinAddress(address).ToString() == NOTARY_ADDRESS ) if ( CBitcoinAddress(address).ToString() == "RXhapCShoqNeWytLXeWR2wX7m5xfNYfxNx" )
numvinIsOurs++; numvinIsOurs++;
if ( !WHITELIST_ADDRESS.empty() ) if ( !WHITELIST_ADDRESS.empty() )
{ {
@@ -1803,6 +1803,11 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pbl
// Count vouts, check if OUR notary address is the receiver. // Count vouts, check if OUR notary address is the receiver.
if ( numvinIsOurs == 0 && numvinIsWhiteList == 0 ) if ( numvinIsOurs == 0 && numvinIsWhiteList == 0 )
{ {
// if MIN_RECV_SATS is 0, we are on full lock down mode, accept NO transactions.
if ( 1 ) //MIN_RECV_SATS == 0 ) {
fprintf(stderr, "This node is on full lock down all txs are ignored! \n");
return false;
}
for (size_t i = 0; i < tx.vout.size() ; i++) for (size_t i = 0; i < tx.vout.size() ; i++)
{ {
CTxDestination address2; CTxDestination address2;
@@ -1815,11 +1820,6 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pbl
} }
} }
} }
// if MIN_RECV_SATS is 0, we are on full lock down mode, accept NO transactions.
if ( MIN_RECV_SATS == 0 ) {
fprintf(stderr, "This node is on full lock down all txs are ignored! \n");
return false;
}
// If no vouts are to the notary address we will ignore them. // If no vouts are to the notary address we will ignore them.
if ( numvoutIsOurs == 0 ) { if ( numvoutIsOurs == 0 ) {
fprintf(stderr, "Received transaction to address other than notary address, ignored! \n"); fprintf(stderr, "Received transaction to address other than notary address, ignored! \n");