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

Enforce ac_private rules

Browse Source
This commit is contained in:
jl777
2018-11-23 06:42:50 -11:00
parent 1b726e61fa
commit fccd6e1d10
3 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cc/eval.cpp
View File

@@ -98,9 +98,10 @@ bool Eval::GetSpendsConfirmed(uint256 hash, std::vector<CTransaction> &spends) c
bool Eval::GetTxUnconfirmed(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock) const bool Eval::GetTxUnconfirmed(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock) const
{ {
if (!myGetTransaction(hash, txOut,hashBlock)) { return(myGetTransaction(hash, txOut,hashBlock);
/*if (!myGetTransaction(hash, txOut,hashBlock)) {
return(GetTransaction(hash, txOut,hashBlock)); return(GetTransaction(hash, txOut,hashBlock));
} else return(true); } else return(true);*/
} }

58
src/main.cpp
View File

@@ -1193,7 +1193,7 @@ bool ContextualCheckTransaction(
return true; return true;
} }
bool CheckTransaction(const CTransaction& tx, CValidationState &state, bool CheckTransaction(uint32_t tiptime,const CTransaction& tx, CValidationState &state,
libzcash::ProofVerifier& verifier) libzcash::ProofVerifier& verifier)
{ {
static uint256 array[64]; static int32_t numbanned,indallvouts; int32_t j,k,n; static uint256 array[64]; static int32_t numbanned,indallvouts; int32_t j,k,n;
@@ -1218,7 +1218,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state,
transactionsValidated.increment(); transactionsValidated.increment();
} }
if (!CheckTransactionWithoutProofVerification(tx, state)) { if (!CheckTransactionWithoutProofVerification(tiptime,tx, state)) {
return false; return false;
} else { } else {
// Ensure that zk-SNARKs v|| y // Ensure that zk-SNARKs v|| y
@@ -1254,10 +1254,10 @@ int32_t komodo_isnotaryvout(char *coinaddr) // from ac_private chains only
return(0); return(0);
} }
bool CheckTransactionWithoutProofVerification(const CTransaction& tx, CValidationState &state) bool CheckTransactionWithoutProofVerification(uint32_t tiptime,const CTransaction& tx, CValidationState &state)
{ {
// Basic checks that don't depend on any context // Basic checks that don't depend on any context
int32_t invalid_private_taddr=0,z_z=0,z_t=0,t_z=0,acpublic = ASSETCHAINS_PUBLIC;
/** /**
* Previously: * Previously:
* 1. The consensus rule below was: * 1. The consensus rule below was:
@@ -1341,7 +1341,10 @@ bool CheckTransactionWithoutProofVerification(const CTransaction& tx, CValidatio
char destaddr[65]; char destaddr[65];
Getscriptaddress(destaddr,txout.scriptPubKey); Getscriptaddress(destaddr,txout.scriptPubKey);
if ( komodo_isnotaryvout(destaddr) == 0 ) if ( komodo_isnotaryvout(destaddr) == 0 )
return state.DoS(100, error("CheckTransaction(): this is a private chain, no public allowed"),REJECT_INVALID, "bad-txns-acprivacy-chain"); {
invalid_private_taddr = 1;
//return state.DoS(100, error("CheckTransaction(): this is a private chain, no public allowed"),REJECT_INVALID, "bad-txns-acprivacy-chain");
}
} }
} }
if ( txout.scriptPubKey.size() > IGUANA_MAXSCRIPTSIZE ) if ( txout.scriptPubKey.size() > IGUANA_MAXSCRIPTSIZE )
@@ -1357,12 +1360,18 @@ bool CheckTransactionWithoutProofVerification(const CTransaction& tx, CValidatio
return state.DoS(100, error("CheckTransaction(): tx.valueBalance has no sources or sinks"), return state.DoS(100, error("CheckTransaction(): tx.valueBalance has no sources or sinks"),
REJECT_INVALID, "bad-txns-valuebalance-nonzero"); REJECT_INVALID, "bad-txns-valuebalance-nonzero");
} }
if ( ASSETCHAINS_PUBLIC != 0 && (tx.vShieldedSpend.empty() == 0 || tx.vShieldedOutput.empty() == 0) ) if ( ASSETCHAINS_SYMBOL[0] == 0 && tiptime >= KOMODO_SAPLING_DEADLINE )
acpublic = 1;
if ( acpublic != 0 && (tx.vShieldedSpend.empty() == 0 || tx.vShieldedOutput.empty() == 0) )
{ {
return state.DoS(100, error("CheckTransaction(): this is a public chain, no sapling allowed"), return state.DoS(100, error("CheckTransaction(): this is a public chain, no sapling allowed"),
REJECT_INVALID, "bad-txns-acpublic-chain"); REJECT_INVALID, "bad-txns-acpublic-chain");
} }
if ( ASSETCHAINS_PRIVATE != 0 && invalid_private_taddr != 0 && tx.vShieldedSpend.empty() == 0 )
{
return state.DoS(100, error("CheckTransaction(): this is a private chain, no sapling -> taddr"),
REJECT_INVALID, "bad-txns-acprivate-chain");
}
// Check for overflow valueBalance // Check for overflow valueBalance
if (tx.valueBalance > MAX_MONEY || tx.valueBalance < -MAX_MONEY) { if (tx.valueBalance > MAX_MONEY || tx.valueBalance < -MAX_MONEY) {
return state.DoS(100, error("CheckTransaction(): abs(tx.valueBalance) too large"), return state.DoS(100, error("CheckTransaction(): abs(tx.valueBalance) too large"),
@@ -1382,11 +1391,16 @@ bool CheckTransactionWithoutProofVerification(const CTransaction& tx, CValidatio
// Ensure that joinsplit values are well-formed // Ensure that joinsplit values are well-formed
BOOST_FOREACH(const JSDescription& joinsplit, tx.vjoinsplit) BOOST_FOREACH(const JSDescription& joinsplit, tx.vjoinsplit)
{ {
if ( ASSETCHAINS_PUBLIC != 0 ) if ( acpublic != 0 )
{ {
return state.DoS(100, error("CheckTransaction(): this is a public chain, no privacy allowed"), return state.DoS(100, error("CheckTransaction(): this is a public chain, no privacy allowed"),
REJECT_INVALID, "bad-txns-acpublic-chain"); REJECT_INVALID, "bad-txns-acpublic-chain");
} }
if ( tiptime >= KOMODO_SAPLING_DEADLINE )
{
return state.DoS(100, error("CheckTransaction(): no more sprout after deadline"),
REJECT_INVALID, "bad-txns-sprout-expired");
}
if (joinsplit.vpub_old < 0) { if (joinsplit.vpub_old < 0) {
return state.DoS(100, error("CheckTransaction(): joinsplit.vpub_old negative"), return state.DoS(100, error("CheckTransaction(): joinsplit.vpub_old negative"),
REJECT_INVALID, "bad-txns-vpub_old-negative"); REJECT_INVALID, "bad-txns-vpub_old-negative");
@@ -1417,8 +1431,20 @@ bool CheckTransactionWithoutProofVerification(const CTransaction& tx, CValidatio
return state.DoS(100, error("CheckTransaction(): txout total out of range"), return state.DoS(100, error("CheckTransaction(): txout total out of range"),
REJECT_INVALID, "bad-txns-txouttotal-toolarge"); REJECT_INVALID, "bad-txns-txouttotal-toolarge");
} }
if ( joinsplit.vpub_new == 0 && joinsplit.vpub_old == 0 )
z_z++;
else if ( joinsplit.vpub_new == 0 && joinsplit.vpub_old != 0 )
z_t++;
else if ( joinsplit.vpub_new != 0 && joinsplit.vpub_old == 0 )
t_z++;
} }
if ( ASSETCHAINS_TXPOW != 0 && tx.vjoinsplit.size() == 0 ) if ( ASSETCHAINS_PRIVATE != 0 && invalid_private_taddr != 0 )
{
fprintf(stderr,"found taddr in private chain: z_z.%d z_t.%d t_z.%d\n",z_z,z_t,t_z);
if ( z_z != 0 || t_z != 0 )
return state.DoS(100, error("CheckTransaction(): this is a private chain, only sprout -> taddr allowed until deadline"),REJECT_INVALID, "bad-txns-acprivacy-chain");
}
if ( ASSETCHAINS_TXPOW != 0 )
{ {
// genesis coinbase 4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b // genesis coinbase 4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b
uint256 txid = tx.GetHash(); uint256 txid = tx.GetHash();
@@ -1569,10 +1595,12 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
AssertLockHeld(cs_main); AssertLockHeld(cs_main);
if (pfMissingInputs) if (pfMissingInputs)
*pfMissingInputs = false; *pfMissingInputs = false;
uint32_t tiptime;
int flag=0,nextBlockHeight = chainActive.Height() + 1; int flag=0,nextBlockHeight = chainActive.Height() + 1;
auto consensusBranchId = CurrentEpochBranchId(nextBlockHeight, Params().GetConsensus()); auto consensusBranchId = CurrentEpochBranchId(nextBlockHeight, Params().GetConsensus());
if ( nextBlockHeight <= 1 || chainActive.LastTip() == 0 )
tiptime = (uint32_t)time(NULL);
else tiptime = (uint32_t)chainActive.LastTip()->nTime;
// Node operator can choose to reject tx by number of transparent inputs // Node operator can choose to reject tx by number of transparent inputs
static_assert(std::numeric_limits<size_t>::max() >= std::numeric_limits<int64_t>::max(), "size_t too small"); static_assert(std::numeric_limits<size_t>::max() >= std::numeric_limits<int64_t>::max(), "size_t too small");
size_t limit = (size_t) GetArg("-mempooltxinputlimit", 0); size_t limit = (size_t) GetArg("-mempooltxinputlimit", 0);
@@ -1593,7 +1621,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
//fprintf(stderr,"AcceptToMemoryPool komodo_validate_interest failure\n"); //fprintf(stderr,"AcceptToMemoryPool komodo_validate_interest failure\n");
return error("AcceptToMemoryPool: komodo_validate_interest failed"); return error("AcceptToMemoryPool: komodo_validate_interest failed");
} }
if (!CheckTransaction(tx, state, verifier)) if (!CheckTransaction(tiptime,tx, state, verifier))
{ {
return error("AcceptToMemoryPool: CheckTransaction failed"); return error("AcceptToMemoryPool: CheckTransaction failed");
} }
@@ -4557,7 +4585,7 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C
libzcash::ProofVerifier& verifier, libzcash::ProofVerifier& verifier,
bool fCheckPOW, bool fCheckMerkleRoot) bool fCheckPOW, bool fCheckMerkleRoot)
{ {
uint8_t pubkey33[33]; uint256 hash; uint8_t pubkey33[33]; uint256 hash; uint32_t tiptime = (uint32_t)block.nTime;
// These are checks that are independent of context. // These are checks that are independent of context.
hash = block.GetHash(); hash = block.GetHash();
// Check that the header is valid (particularly PoW). This is mostly redundant with the call in AcceptBlockHeader. // Check that the header is valid (particularly PoW). This is mostly redundant with the call in AcceptBlockHeader.
@@ -4569,6 +4597,8 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C
return false; return false;
} }
} }
if ( pindex != 0 && pindex->pprev != 0 )
tiptime = (uint32_t)pindex->pprev->nTime;
if ( fCheckPOW ) if ( fCheckPOW )
{ {
//if ( !CheckEquihashSolution(&block, Params()) ) //if ( !CheckEquihashSolution(&block, Params()) )
@@ -4682,7 +4712,7 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C
const CTransaction& tx = block.vtx[i]; const CTransaction& tx = block.vtx[i];
if ( komodo_validate_interest(tx,height == 0 ? komodo_block2height((CBlock *)&block) : height,block.nTime,0) < 0 ) if ( komodo_validate_interest(tx,height == 0 ? komodo_block2height((CBlock *)&block) : height,block.nTime,0) < 0 )
return error("CheckBlock: komodo_validate_interest failed"); return error("CheckBlock: komodo_validate_interest failed");
if (!CheckTransaction(tx, state, verifier)) if (!CheckTransaction(tiptime,tx, state, verifier))
return error("CheckBlock: CheckTransaction failed"); return error("CheckBlock: CheckTransaction failed");
} }
unsigned int nSigOps = 0; unsigned int nSigOps = 0;

4
src/main.h
View File

@@ -699,8 +699,8 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight);
/** Transaction validation functions */ /** Transaction validation functions */
/** Context-independent validity checks */ /** Context-independent validity checks */
bool CheckTransaction(const CTransaction& tx, CValidationState& state, libzcash::ProofVerifier& verifier); bool CheckTransaction(uint32_t tiptime,const CTransaction& tx, CValidationState& state, libzcash::ProofVerifier& verifier);
bool CheckTransactionWithoutProofVerification(const CTransaction& tx, CValidationState &state); bool CheckTransactionWithoutProofVerification(uint32_t tiptime,const CTransaction& tx, CValidationState &state);
/** Check for standard transaction types /** Check for standard transaction types
* @return True if all outputs (scriptPubKeys) use only standard transaction forms * @return True if all outputs (scriptPubKeys) use only standard transaction forms