Merge pull request #6335
9238ecb
Policy: MOVEONLY: 3 functions to policy.o: (Luke Dashjr)627b9de
Policy: MOVEONLY: Create policy/policy.h with some constants (Jorge Timón)
This commit is contained in:
commit
9546a977d3
@ -111,6 +111,7 @@ BITCOIN_CORE_H = \
|
|||||||
netbase.h \
|
netbase.h \
|
||||||
noui.h \
|
noui.h \
|
||||||
policy/fees.h \
|
policy/fees.h \
|
||||||
|
policy/policy.h \
|
||||||
pow.h \
|
pow.h \
|
||||||
primitives/block.h \
|
primitives/block.h \
|
||||||
primitives/transaction.h \
|
primitives/transaction.h \
|
||||||
@ -176,6 +177,7 @@ libbitcoin_server_a_SOURCES = \
|
|||||||
net.cpp \
|
net.cpp \
|
||||||
noui.cpp \
|
noui.cpp \
|
||||||
policy/fees.cpp \
|
policy/fees.cpp \
|
||||||
|
policy/policy.cpp \
|
||||||
pow.cpp \
|
pow.cpp \
|
||||||
rest.cpp \
|
rest.cpp \
|
||||||
rpcblockchain.cpp \
|
rpcblockchain.cpp \
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
#include "consensus/consensus.h"
|
#include "consensus/consensus.h"
|
||||||
#include "core_io.h"
|
#include "core_io.h"
|
||||||
#include "keystore.h"
|
#include "keystore.h"
|
||||||
|
#include "policy/policy.h"
|
||||||
#include "primitives/transaction.h"
|
#include "primitives/transaction.h"
|
||||||
#include "script/script.h"
|
#include "script/script.h"
|
||||||
#include "script/sign.h"
|
#include "script/sign.h"
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "miner.h"
|
#include "miner.h"
|
||||||
#include "net.h"
|
#include "net.h"
|
||||||
|
#include "policy/policy.h"
|
||||||
#include "rpcserver.h"
|
#include "rpcserver.h"
|
||||||
#include "script/standard.h"
|
#include "script/standard.h"
|
||||||
#include "scheduler.h"
|
#include "scheduler.h"
|
||||||
|
140
src/main.cpp
140
src/main.cpp
@ -11,10 +11,12 @@
|
|||||||
#include "chainparams.h"
|
#include "chainparams.h"
|
||||||
#include "checkpoints.h"
|
#include "checkpoints.h"
|
||||||
#include "checkqueue.h"
|
#include "checkqueue.h"
|
||||||
|
#include "consensus/consensus.h"
|
||||||
#include "consensus/validation.h"
|
#include "consensus/validation.h"
|
||||||
#include "init.h"
|
#include "init.h"
|
||||||
#include "merkleblock.h"
|
#include "merkleblock.h"
|
||||||
#include "net.h"
|
#include "net.h"
|
||||||
|
#include "policy/policy.h"
|
||||||
#include "pow.h"
|
#include "pow.h"
|
||||||
#include "txdb.h"
|
#include "txdb.h"
|
||||||
#include "txmempool.h"
|
#include "txmempool.h"
|
||||||
@ -605,76 +607,6 @@ unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans)
|
|||||||
return nEvicted;
|
return nEvicted;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
bool IsStandardTx(const CTransaction& tx, string& reason)
|
|
||||||
{
|
|
||||||
if (tx.nVersion > CTransaction::CURRENT_VERSION || tx.nVersion < 1) {
|
|
||||||
reason = "version";
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Extremely large transactions with lots of inputs can cost the network
|
|
||||||
// almost as much to process as they cost the sender in fees, because
|
|
||||||
// computing signature hashes is O(ninputs*txsize). Limiting transactions
|
|
||||||
// to MAX_STANDARD_TX_SIZE mitigates CPU exhaustion attacks.
|
|
||||||
unsigned int sz = tx.GetSerializeSize(SER_NETWORK, CTransaction::CURRENT_VERSION);
|
|
||||||
if (sz >= MAX_STANDARD_TX_SIZE) {
|
|
||||||
reason = "tx-size";
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
BOOST_FOREACH(const CTxIn& txin, tx.vin)
|
|
||||||
{
|
|
||||||
// Biggest 'standard' txin is a 15-of-15 P2SH multisig with compressed
|
|
||||||
// keys. (remember the 520 byte limit on redeemScript size) That works
|
|
||||||
// out to a (15*(33+1))+3=513 byte redeemScript, 513+1+15*(73+1)+3=1627
|
|
||||||
// bytes of scriptSig, which we round off to 1650 bytes for some minor
|
|
||||||
// future-proofing. That's also enough to spend a 20-of-20
|
|
||||||
// CHECKMULTISIG scriptPubKey, though such a scriptPubKey is not
|
|
||||||
// considered standard)
|
|
||||||
if (txin.scriptSig.size() > 1650) {
|
|
||||||
reason = "scriptsig-size";
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (!txin.scriptSig.IsPushOnly()) {
|
|
||||||
reason = "scriptsig-not-pushonly";
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned int nDataOut = 0;
|
|
||||||
txnouttype whichType;
|
|
||||||
BOOST_FOREACH(const CTxOut& txout, tx.vout) {
|
|
||||||
if (!::IsStandard(txout.scriptPubKey, whichType)) {
|
|
||||||
reason = "scriptpubkey";
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (whichType == TX_NULL_DATA)
|
|
||||||
nDataOut++;
|
|
||||||
else if ((whichType == TX_MULTISIG) && (!fIsBareMultisigStd)) {
|
|
||||||
reason = "bare-multisig";
|
|
||||||
return false;
|
|
||||||
} else if (txout.IsDust(::minRelayTxFee)) {
|
|
||||||
reason = "dust";
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// only one OP_RETURN txout is permitted
|
|
||||||
if (nDataOut > 1) {
|
|
||||||
reason = "multi-op-return";
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime)
|
bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime)
|
||||||
{
|
{
|
||||||
if (tx.nLockTime == 0)
|
if (tx.nLockTime == 0)
|
||||||
@ -693,74 +625,6 @@ bool CheckFinalTx(const CTransaction &tx)
|
|||||||
return IsFinalTx(tx, chainActive.Height() + 1, GetAdjustedTime());
|
return IsFinalTx(tx, chainActive.Height() + 1, GetAdjustedTime());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Check transaction inputs to mitigate two
|
|
||||||
* potential denial-of-service attacks:
|
|
||||||
*
|
|
||||||
* 1. scriptSigs with extra data stuffed into them,
|
|
||||||
* not consumed by scriptPubKey (or P2SH script)
|
|
||||||
* 2. P2SH scripts with a crazy number of expensive
|
|
||||||
* CHECKSIG/CHECKMULTISIG operations
|
|
||||||
*/
|
|
||||||
bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
|
|
||||||
{
|
|
||||||
if (tx.IsCoinBase())
|
|
||||||
return true; // Coinbases don't use vin normally
|
|
||||||
|
|
||||||
for (unsigned int i = 0; i < tx.vin.size(); i++)
|
|
||||||
{
|
|
||||||
const CTxOut& prev = mapInputs.GetOutputFor(tx.vin[i]);
|
|
||||||
|
|
||||||
vector<vector<unsigned char> > vSolutions;
|
|
||||||
txnouttype whichType;
|
|
||||||
// get the scriptPubKey corresponding to this input:
|
|
||||||
const CScript& prevScript = prev.scriptPubKey;
|
|
||||||
if (!Solver(prevScript, whichType, vSolutions))
|
|
||||||
return false;
|
|
||||||
int nArgsExpected = ScriptSigArgsExpected(whichType, vSolutions);
|
|
||||||
if (nArgsExpected < 0)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
// Transactions with extra stuff in their scriptSigs are
|
|
||||||
// non-standard. Note that this EvalScript() call will
|
|
||||||
// be quick, because if there are any operations
|
|
||||||
// beside "push data" in the scriptSig
|
|
||||||
// IsStandardTx() will have already returned false
|
|
||||||
// and this method isn't called.
|
|
||||||
vector<vector<unsigned char> > stack;
|
|
||||||
if (!EvalScript(stack, tx.vin[i].scriptSig, SCRIPT_VERIFY_NONE, BaseSignatureChecker()))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if (whichType == TX_SCRIPTHASH)
|
|
||||||
{
|
|
||||||
if (stack.empty())
|
|
||||||
return false;
|
|
||||||
CScript subscript(stack.back().begin(), stack.back().end());
|
|
||||||
vector<vector<unsigned char> > vSolutions2;
|
|
||||||
txnouttype whichType2;
|
|
||||||
if (Solver(subscript, whichType2, vSolutions2))
|
|
||||||
{
|
|
||||||
int tmpExpected = ScriptSigArgsExpected(whichType2, vSolutions2);
|
|
||||||
if (tmpExpected < 0)
|
|
||||||
return false;
|
|
||||||
nArgsExpected += tmpExpected;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Any other Script with less than 15 sigops OK:
|
|
||||||
unsigned int sigops = subscript.GetSigOpCount(true);
|
|
||||||
// ... extra data left on the stack after execution is OK, too:
|
|
||||||
return (sigops <= MAX_P2SH_SIGOPS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (stack.size() != (unsigned int)nArgsExpected)
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned int GetLegacySigOpCount(const CTransaction& tx)
|
unsigned int GetLegacySigOpCount(const CTransaction& tx)
|
||||||
{
|
{
|
||||||
unsigned int nSigOps = 0;
|
unsigned int nSigOps = 0;
|
||||||
|
36
src/main.h
36
src/main.h
@ -14,7 +14,6 @@
|
|||||||
#include "chain.h"
|
#include "chain.h"
|
||||||
#include "chainparams.h"
|
#include "chainparams.h"
|
||||||
#include "coins.h"
|
#include "coins.h"
|
||||||
#include "consensus/consensus.h"
|
|
||||||
#include "net.h"
|
#include "net.h"
|
||||||
#include "primitives/block.h"
|
#include "primitives/block.h"
|
||||||
#include "primitives/transaction.h"
|
#include "primitives/transaction.h"
|
||||||
@ -47,19 +46,8 @@ class CValidationState;
|
|||||||
|
|
||||||
struct CNodeStateStats;
|
struct CNodeStateStats;
|
||||||
|
|
||||||
/** Default for -blockmaxsize and -blockminsize, which control the range of sizes the mining code will create **/
|
|
||||||
static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000;
|
|
||||||
static const unsigned int DEFAULT_BLOCK_MIN_SIZE = 0;
|
|
||||||
/** Default for -blockprioritysize, maximum space for zero/low-fee transactions **/
|
|
||||||
static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 50000;
|
|
||||||
/** Default for accepting alerts from the P2P network. */
|
/** Default for accepting alerts from the P2P network. */
|
||||||
static const bool DEFAULT_ALERTS = true;
|
static const bool DEFAULT_ALERTS = true;
|
||||||
/** The maximum size for transactions we're willing to relay/mine */
|
|
||||||
static const unsigned int MAX_STANDARD_TX_SIZE = 100000;
|
|
||||||
/** Maximum number of signature check operations in an IsStandard() P2SH script */
|
|
||||||
static const unsigned int MAX_P2SH_SIGOPS = 15;
|
|
||||||
/** The maximum number of sigops we're willing to relay/mine in a single tx */
|
|
||||||
static const unsigned int MAX_STANDARD_TX_SIGOPS = MAX_BLOCK_SIGOPS/5;
|
|
||||||
/** Default for -maxorphantx, maximum number of orphan transactions kept in memory */
|
/** Default for -maxorphantx, maximum number of orphan transactions kept in memory */
|
||||||
static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100;
|
static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100;
|
||||||
/** The maximum size of a blk?????.dat file (since 0.8) */
|
/** The maximum size of a blk?????.dat file (since 0.8) */
|
||||||
@ -274,25 +262,6 @@ struct CDiskTxPos : public CDiskBlockPos
|
|||||||
|
|
||||||
CAmount GetMinRelayFee(const CTransaction& tx, unsigned int nBytes, bool fAllowFree);
|
CAmount GetMinRelayFee(const CTransaction& tx, unsigned int nBytes, bool fAllowFree);
|
||||||
|
|
||||||
/**
|
|
||||||
* Check transaction inputs, and make sure any
|
|
||||||
* pay-to-script-hash transactions are evaluating IsStandard scripts
|
|
||||||
*
|
|
||||||
* Why bother? To avoid denial-of-service attacks; an attacker
|
|
||||||
* can submit a standard HASH... OP_EQUAL transaction,
|
|
||||||
* which will get accepted into blocks. The redemption
|
|
||||||
* script can be anything; an attacker could use a very
|
|
||||||
* expensive-to-check-upon-redemption script like:
|
|
||||||
* DUP CHECKSIG DROP ... repeated 100 times... OP_1
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check for standard transaction types
|
|
||||||
* @param[in] mapInputs Map of previous transactions that have outputs we're spending
|
|
||||||
* @return True if all inputs (scriptSigs) use only standard transaction forms
|
|
||||||
*/
|
|
||||||
bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Count ECDSA signature operations the old-fashioned (pre-0.6) way
|
* Count ECDSA signature operations the old-fashioned (pre-0.6) way
|
||||||
* @return number of sigops this transaction's outputs will produce when spent
|
* @return number of sigops this transaction's outputs will produce when spent
|
||||||
@ -324,11 +293,6 @@ void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCach
|
|||||||
/** Context-independent validity checks */
|
/** Context-independent validity checks */
|
||||||
bool CheckTransaction(const CTransaction& tx, CValidationState& state);
|
bool CheckTransaction(const CTransaction& tx, CValidationState& state);
|
||||||
|
|
||||||
/** Check for standard transaction types
|
|
||||||
* @return True if all outputs (scriptPubKeys) use only standard transaction forms
|
|
||||||
*/
|
|
||||||
bool IsStandardTx(const CTransaction& tx, std::string& reason);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if transaction is final and can be included in a block with the
|
* Check if transaction is final and can be included in a block with the
|
||||||
* specified height and time. Consensus critical.
|
* specified height and time. Consensus critical.
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
#include "hash.h"
|
#include "hash.h"
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "net.h"
|
#include "net.h"
|
||||||
|
#include "policy/policy.h"
|
||||||
#include "pow.h"
|
#include "pow.h"
|
||||||
#include "primitives/transaction.h"
|
#include "primitives/transaction.h"
|
||||||
#include "timedata.h"
|
#include "timedata.h"
|
||||||
|
178
src/policy/policy.cpp
Normal file
178
src/policy/policy.cpp
Normal file
@ -0,0 +1,178 @@
|
|||||||
|
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
||||||
|
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||||
|
// Distributed under the MIT software license, see the accompanying
|
||||||
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
|
// NOTE: This file is intended to be customised by the end user, and includes only local node policy logic
|
||||||
|
|
||||||
|
#include "policy/policy.h"
|
||||||
|
|
||||||
|
#include "main.h"
|
||||||
|
#include "tinyformat.h"
|
||||||
|
#include "util.h"
|
||||||
|
#include "utilstrencodings.h"
|
||||||
|
|
||||||
|
#include <boost/foreach.hpp>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check transaction inputs to mitigate two
|
||||||
|
* potential denial-of-service attacks:
|
||||||
|
*
|
||||||
|
* 1. scriptSigs with extra data stuffed into them,
|
||||||
|
* not consumed by scriptPubKey (or P2SH script)
|
||||||
|
* 2. P2SH scripts with a crazy number of expensive
|
||||||
|
* CHECKSIG/CHECKMULTISIG operations
|
||||||
|
*
|
||||||
|
* Check transaction inputs, and make sure any
|
||||||
|
* pay-to-script-hash transactions are evaluating IsStandard scripts
|
||||||
|
*
|
||||||
|
* Why bother? To avoid denial-of-service attacks; an attacker
|
||||||
|
* can submit a standard HASH... OP_EQUAL transaction,
|
||||||
|
* which will get accepted into blocks. The redemption
|
||||||
|
* script can be anything; an attacker could use a very
|
||||||
|
* expensive-to-check-upon-redemption script like:
|
||||||
|
* DUP CHECKSIG DROP ... repeated 100 times... OP_1
|
||||||
|
*/
|
||||||
|
|
||||||
|
bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType)
|
||||||
|
{
|
||||||
|
std::vector<std::vector<unsigned char> > vSolutions;
|
||||||
|
if (!Solver(scriptPubKey, whichType, vSolutions))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (whichType == TX_MULTISIG)
|
||||||
|
{
|
||||||
|
unsigned char m = vSolutions.front()[0];
|
||||||
|
unsigned char n = vSolutions.back()[0];
|
||||||
|
// Support up to x-of-3 multisig txns as standard
|
||||||
|
if (n < 1 || n > 3)
|
||||||
|
return false;
|
||||||
|
if (m < 1 || m > n)
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return whichType != TX_NONSTANDARD;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool IsStandardTx(const CTransaction& tx, std::string& reason)
|
||||||
|
{
|
||||||
|
if (tx.nVersion > CTransaction::CURRENT_VERSION || tx.nVersion < 1) {
|
||||||
|
reason = "version";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extremely large transactions with lots of inputs can cost the network
|
||||||
|
// almost as much to process as they cost the sender in fees, because
|
||||||
|
// computing signature hashes is O(ninputs*txsize). Limiting transactions
|
||||||
|
// to MAX_STANDARD_TX_SIZE mitigates CPU exhaustion attacks.
|
||||||
|
unsigned int sz = tx.GetSerializeSize(SER_NETWORK, CTransaction::CURRENT_VERSION);
|
||||||
|
if (sz >= MAX_STANDARD_TX_SIZE) {
|
||||||
|
reason = "tx-size";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOST_FOREACH(const CTxIn& txin, tx.vin)
|
||||||
|
{
|
||||||
|
// Biggest 'standard' txin is a 15-of-15 P2SH multisig with compressed
|
||||||
|
// keys. (remember the 520 byte limit on redeemScript size) That works
|
||||||
|
// out to a (15*(33+1))+3=513 byte redeemScript, 513+1+15*(73+1)+3=1627
|
||||||
|
// bytes of scriptSig, which we round off to 1650 bytes for some minor
|
||||||
|
// future-proofing. That's also enough to spend a 20-of-20
|
||||||
|
// CHECKMULTISIG scriptPubKey, though such a scriptPubKey is not
|
||||||
|
// considered standard)
|
||||||
|
if (txin.scriptSig.size() > 1650) {
|
||||||
|
reason = "scriptsig-size";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (!txin.scriptSig.IsPushOnly()) {
|
||||||
|
reason = "scriptsig-not-pushonly";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int nDataOut = 0;
|
||||||
|
txnouttype whichType;
|
||||||
|
BOOST_FOREACH(const CTxOut& txout, tx.vout) {
|
||||||
|
if (!::IsStandard(txout.scriptPubKey, whichType)) {
|
||||||
|
reason = "scriptpubkey";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (whichType == TX_NULL_DATA)
|
||||||
|
nDataOut++;
|
||||||
|
else if ((whichType == TX_MULTISIG) && (!fIsBareMultisigStd)) {
|
||||||
|
reason = "bare-multisig";
|
||||||
|
return false;
|
||||||
|
} else if (txout.IsDust(::minRelayTxFee)) {
|
||||||
|
reason = "dust";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// only one OP_RETURN txout is permitted
|
||||||
|
if (nDataOut > 1) {
|
||||||
|
reason = "multi-op-return";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
|
||||||
|
{
|
||||||
|
if (tx.IsCoinBase())
|
||||||
|
return true; // Coinbases don't use vin normally
|
||||||
|
|
||||||
|
for (unsigned int i = 0; i < tx.vin.size(); i++)
|
||||||
|
{
|
||||||
|
const CTxOut& prev = mapInputs.GetOutputFor(tx.vin[i]);
|
||||||
|
|
||||||
|
std::vector<std::vector<unsigned char> > vSolutions;
|
||||||
|
txnouttype whichType;
|
||||||
|
// get the scriptPubKey corresponding to this input:
|
||||||
|
const CScript& prevScript = prev.scriptPubKey;
|
||||||
|
if (!Solver(prevScript, whichType, vSolutions))
|
||||||
|
return false;
|
||||||
|
int nArgsExpected = ScriptSigArgsExpected(whichType, vSolutions);
|
||||||
|
if (nArgsExpected < 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// Transactions with extra stuff in their scriptSigs are
|
||||||
|
// non-standard. Note that this EvalScript() call will
|
||||||
|
// be quick, because if there are any operations
|
||||||
|
// beside "push data" in the scriptSig
|
||||||
|
// IsStandardTx() will have already returned false
|
||||||
|
// and this method isn't called.
|
||||||
|
std::vector<std::vector<unsigned char> > stack;
|
||||||
|
if (!EvalScript(stack, tx.vin[i].scriptSig, SCRIPT_VERIFY_NONE, BaseSignatureChecker()))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (whichType == TX_SCRIPTHASH)
|
||||||
|
{
|
||||||
|
if (stack.empty())
|
||||||
|
return false;
|
||||||
|
CScript subscript(stack.back().begin(), stack.back().end());
|
||||||
|
std::vector<std::vector<unsigned char> > vSolutions2;
|
||||||
|
txnouttype whichType2;
|
||||||
|
if (Solver(subscript, whichType2, vSolutions2))
|
||||||
|
{
|
||||||
|
int tmpExpected = ScriptSigArgsExpected(whichType2, vSolutions2);
|
||||||
|
if (tmpExpected < 0)
|
||||||
|
return false;
|
||||||
|
nArgsExpected += tmpExpected;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Any other Script with less than 15 sigops OK:
|
||||||
|
unsigned int sigops = subscript.GetSigOpCount(true);
|
||||||
|
// ... extra data left on the stack after execution is OK, too:
|
||||||
|
return (sigops <= MAX_P2SH_SIGOPS);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stack.size() != (unsigned int)nArgsExpected)
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
58
src/policy/policy.h
Normal file
58
src/policy/policy.h
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
||||||
|
// Copyright (c) 2009-2014 The Bitcoin developers
|
||||||
|
// Distributed under the MIT software license, see the accompanying
|
||||||
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
|
#ifndef BITCOIN_POLICY_H
|
||||||
|
#define BITCOIN_POLICY_H
|
||||||
|
|
||||||
|
#include "consensus/consensus.h"
|
||||||
|
#include "script/interpreter.h"
|
||||||
|
#include "script/standard.h"
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
class CCoinsViewCache;
|
||||||
|
|
||||||
|
/** Default for -blockmaxsize and -blockminsize, which control the range of sizes the mining code will create **/
|
||||||
|
static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000;
|
||||||
|
static const unsigned int DEFAULT_BLOCK_MIN_SIZE = 0;
|
||||||
|
/** Default for -blockprioritysize, maximum space for zero/low-fee transactions **/
|
||||||
|
static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 50000;
|
||||||
|
/** The maximum size for transactions we're willing to relay/mine */
|
||||||
|
static const unsigned int MAX_STANDARD_TX_SIZE = 100000;
|
||||||
|
/** Maximum number of signature check operations in an IsStandard() P2SH script */
|
||||||
|
static const unsigned int MAX_P2SH_SIGOPS = 15;
|
||||||
|
/** The maximum number of sigops we're willing to relay/mine in a single tx */
|
||||||
|
static const unsigned int MAX_STANDARD_TX_SIGOPS = MAX_BLOCK_SIGOPS/5;
|
||||||
|
/**
|
||||||
|
* Standard script verification flags that standard transactions will comply
|
||||||
|
* with. However scripts violating these flags may still be present in valid
|
||||||
|
* blocks and we must accept those blocks.
|
||||||
|
*/
|
||||||
|
static const unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VERIFY_FLAGS |
|
||||||
|
SCRIPT_VERIFY_DERSIG |
|
||||||
|
SCRIPT_VERIFY_STRICTENC |
|
||||||
|
SCRIPT_VERIFY_MINIMALDATA |
|
||||||
|
SCRIPT_VERIFY_NULLDUMMY |
|
||||||
|
SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS |
|
||||||
|
SCRIPT_VERIFY_CLEANSTACK |
|
||||||
|
SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY;
|
||||||
|
|
||||||
|
/** For convenience, standard but not mandatory verify flags. */
|
||||||
|
static const unsigned int STANDARD_NOT_MANDATORY_VERIFY_FLAGS = STANDARD_SCRIPT_VERIFY_FLAGS & ~MANDATORY_SCRIPT_VERIFY_FLAGS;
|
||||||
|
|
||||||
|
bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType);
|
||||||
|
/**
|
||||||
|
* Check for standard transaction types
|
||||||
|
* @return True if all outputs (scriptPubKeys) use only standard transaction forms
|
||||||
|
*/
|
||||||
|
bool IsStandardTx(const CTransaction& tx, std::string& reason);
|
||||||
|
/**
|
||||||
|
* Check for standard transaction types
|
||||||
|
* @param[in] mapInputs Map of previous transactions that have outputs we're spending
|
||||||
|
* @return True if all inputs (scriptSigs) use only standard transaction forms
|
||||||
|
*/
|
||||||
|
bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs);
|
||||||
|
|
||||||
|
#endif // BITCOIN_POLICY_H
|
@ -11,6 +11,7 @@
|
|||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "merkleblock.h"
|
#include "merkleblock.h"
|
||||||
#include "net.h"
|
#include "net.h"
|
||||||
|
#include "policy/policy.h"
|
||||||
#include "primitives/transaction.h"
|
#include "primitives/transaction.h"
|
||||||
#include "rpcserver.h"
|
#include "rpcserver.h"
|
||||||
#include "script/script.h"
|
#include "script/script.h"
|
||||||
|
@ -5,9 +5,10 @@
|
|||||||
|
|
||||||
#include "script/sign.h"
|
#include "script/sign.h"
|
||||||
|
|
||||||
#include "primitives/transaction.h"
|
|
||||||
#include "key.h"
|
#include "key.h"
|
||||||
#include "keystore.h"
|
#include "keystore.h"
|
||||||
|
#include "policy/policy.h"
|
||||||
|
#include "primitives/transaction.h"
|
||||||
#include "script/standard.h"
|
#include "script/standard.h"
|
||||||
#include "uint256.h"
|
#include "uint256.h"
|
||||||
|
|
||||||
|
@ -180,26 +180,6 @@ int ScriptSigArgsExpected(txnouttype t, const std::vector<std::vector<unsigned c
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType)
|
|
||||||
{
|
|
||||||
vector<valtype> vSolutions;
|
|
||||||
if (!Solver(scriptPubKey, whichType, vSolutions))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if (whichType == TX_MULTISIG)
|
|
||||||
{
|
|
||||||
unsigned char m = vSolutions.front()[0];
|
|
||||||
unsigned char n = vSolutions.back()[0];
|
|
||||||
// Support up to x-of-3 multisig txns as standard
|
|
||||||
if (n < 1 || n > 3)
|
|
||||||
return false;
|
|
||||||
if (m < 1 || m > n)
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return whichType != TX_NONSTANDARD;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
|
bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
|
||||||
{
|
{
|
||||||
vector<valtype> vSolutions;
|
vector<valtype> vSolutions;
|
||||||
|
@ -39,23 +39,6 @@ extern unsigned nMaxDatacarrierBytes;
|
|||||||
*/
|
*/
|
||||||
static const unsigned int MANDATORY_SCRIPT_VERIFY_FLAGS = SCRIPT_VERIFY_P2SH;
|
static const unsigned int MANDATORY_SCRIPT_VERIFY_FLAGS = SCRIPT_VERIFY_P2SH;
|
||||||
|
|
||||||
/**
|
|
||||||
* Standard script verification flags that standard transactions will comply
|
|
||||||
* with. However scripts violating these flags may still be present in valid
|
|
||||||
* blocks and we must accept those blocks.
|
|
||||||
*/
|
|
||||||
static const unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VERIFY_FLAGS |
|
|
||||||
SCRIPT_VERIFY_DERSIG |
|
|
||||||
SCRIPT_VERIFY_STRICTENC |
|
|
||||||
SCRIPT_VERIFY_MINIMALDATA |
|
|
||||||
SCRIPT_VERIFY_NULLDUMMY |
|
|
||||||
SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS |
|
|
||||||
SCRIPT_VERIFY_CLEANSTACK |
|
|
||||||
SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY;
|
|
||||||
|
|
||||||
/** For convenience, standard but not mandatory verify flags. */
|
|
||||||
static const unsigned int STANDARD_NOT_MANDATORY_VERIFY_FLAGS = STANDARD_SCRIPT_VERIFY_FLAGS & ~MANDATORY_SCRIPT_VERIFY_FLAGS;
|
|
||||||
|
|
||||||
enum txnouttype
|
enum txnouttype
|
||||||
{
|
{
|
||||||
TX_NONSTANDARD,
|
TX_NONSTANDARD,
|
||||||
@ -86,7 +69,6 @@ const char* GetTxnOutputType(txnouttype t);
|
|||||||
|
|
||||||
bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<std::vector<unsigned char> >& vSolutionsRet);
|
bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<std::vector<unsigned char> >& vSolutionsRet);
|
||||||
int ScriptSigArgsExpected(txnouttype t, const std::vector<std::vector<unsigned char> >& vSolutions);
|
int ScriptSigArgsExpected(txnouttype t, const std::vector<std::vector<unsigned char> >& vSolutions);
|
||||||
bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType);
|
|
||||||
bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet);
|
bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet);
|
||||||
bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<CTxDestination>& addressRet, int& nRequiredRet);
|
bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<CTxDestination>& addressRet, int& nRequiredRet);
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
#include "key.h"
|
#include "key.h"
|
||||||
#include "keystore.h"
|
#include "keystore.h"
|
||||||
#include "main.h"
|
#include "policy/policy.h"
|
||||||
#include "script/script.h"
|
#include "script/script.h"
|
||||||
#include "script/script_error.h"
|
#include "script/script_error.h"
|
||||||
#include "script/interpreter.h"
|
#include "script/interpreter.h"
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
#include "key.h"
|
#include "key.h"
|
||||||
#include "keystore.h"
|
#include "keystore.h"
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
#include "policy/policy.h"
|
||||||
#include "script/script.h"
|
#include "script/script.h"
|
||||||
#include "script/script_error.h"
|
#include "script/script_error.h"
|
||||||
#include "script/sign.h"
|
#include "script/sign.h"
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
#include "key.h"
|
#include "key.h"
|
||||||
#include "keystore.h"
|
#include "keystore.h"
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
#include "policy/policy.h"
|
||||||
#include "script/script.h"
|
#include "script/script.h"
|
||||||
#include "script/script_error.h"
|
#include "script/script_error.h"
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
#include "consensus/validation.h"
|
#include "consensus/validation.h"
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "net.h"
|
#include "net.h"
|
||||||
|
#include "policy/policy.h"
|
||||||
#include "script/script.h"
|
#include "script/script.h"
|
||||||
#include "script/sign.h"
|
#include "script/sign.h"
|
||||||
#include "timedata.h"
|
#include "timedata.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user