Permalink
Browse files

Restore original bytespersigop as bytespersigopstrict

Plus a bugfix to accurately count sigops for this purpose
  • Loading branch information...
luke-jr committed Aug 8, 2016
1 parent 0674c10 commit 0152d4e9bec5645d23296002b795b22a517ab33c
Showing with 44 additions and 1 deletion.
  1. +1 −0 src/init.cpp
  2. +31 −0 src/policy/policy.cpp
  3. +8 −0 src/policy/policy.h
  4. +4 −1 src/validation.cpp
@@ -489,6 +489,7 @@ void SetupServerArgs()
gArgs.AddArg("-incrementalrelayfee=<amt>", strprintf("Fee rate (in %s/kB) used to define cost of relay, used for mempool limiting and BIP 125 replacement. (default: %s)", CURRENCY_UNIT, FormatMoney(DEFAULT_INCREMENTAL_RELAY_FEE)), true, OptionsCategory::NODE_RELAY);
gArgs.AddArg("-dustrelayfee=<amt>", strprintf("Fee rate (in %s/kB) used to defined dust, the value of an output such that it will cost more than its value in fees at this fee rate to spend it. (default: %s)", CURRENCY_UNIT, FormatMoney(DUST_RELAY_TX_FEE)), true, OptionsCategory::NODE_RELAY);
gArgs.AddArg("-bytespersigop", strprintf("Equivalent bytes per sigop in transactions for relay and mining (default: %u)", DEFAULT_BYTES_PER_SIGOP), false, OptionsCategory::NODE_RELAY);
gArgs.AddArg("-bytespersigopstrict", strprintf("Minimum bytes per sigop in transactions we relay and mine (default: %u)", DEFAULT_BYTES_PER_SIGOP_STRICT), false, OptionsCategory::NODE_RELAY);
gArgs.AddArg("-datacarrier", strprintf("Relay and mine data carrier transactions (default: %u)", DEFAULT_ACCEPT_DATACARRIER), false, OptionsCategory::NODE_RELAY);
gArgs.AddArg("-datacarriersize", strprintf("Maximum size of data in data carrier transactions we relay and mine (default: %u)", MAX_OP_RETURN_RELAY), false, OptionsCategory::NODE_RELAY);
gArgs.AddArg("-mempoolreplacement", strprintf("Enable transaction replacement in the memory pool (default: %u)", DEFAULT_ENABLE_REPLACEMENT), false, OptionsCategory::NODE_RELAY);
@@ -7,6 +7,7 @@

#include <policy/policy.h>

#include <consensus/tx_verify.h>
#include <consensus/validation.h>
#include <validation.h>
#include <coins.h>
@@ -288,6 +289,7 @@ bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs,
CFeeRate incrementalRelayFee = CFeeRate(DEFAULT_INCREMENTAL_RELAY_FEE);
CFeeRate dustRelayFee = CFeeRate(DUST_RELAY_TX_FEE);
unsigned int nBytesPerSigOp = DEFAULT_BYTES_PER_SIGOP;
unsigned int nBytesPerSigOpStrict = DEFAULT_BYTES_PER_SIGOP_STRICT;

int64_t GetVirtualTransactionSize(int64_t nWeight, int64_t nSigOpCost)
{
@@ -303,3 +305,32 @@ int64_t GetVirtualTransactionInputSize(const CTxIn& txin, int64_t nSigOpCost)
{
return GetVirtualTransactionSize(GetTransactionInputWeight(txin), nSigOpCost);
}

int64_t GetAccurateTransactionSigOpCost(const CTransaction& tx, const CCoinsViewCache& inputs, int flags)
{
if (tx.IsCoinBase()) {
return 0;
}

unsigned int nSigOps = 0;
for (const auto& txin : tx.vin) {
nSigOps += txin.scriptSig.GetSigOpCount(false);
}

if (flags & SCRIPT_VERIFY_P2SH) {
nSigOps += GetP2SHSigOpCount(tx, inputs);
}

nSigOps *= WITNESS_SCALE_FACTOR;

if (flags & SCRIPT_VERIFY_WITNESS) {
for (const auto& txin : tx.vin) {
const Coin& coin = inputs.AccessCoin(txin.prevout);
assert(!coin.IsSpent());
const CTxOut &prevout = coin.out;
nSigOps += CountWitnessSigOps(txin.scriptSig, prevout.scriptPubKey, &txin.scriptWitness, flags);
}
}

return nSigOps;
}
@@ -35,6 +35,8 @@ static const unsigned int DEFAULT_MAX_MEMPOOL_SIZE = 300;
static const unsigned int DEFAULT_INCREMENTAL_RELAY_FEE = 1000;
/** Default for -bytespersigop */
static const unsigned int DEFAULT_BYTES_PER_SIGOP = 20;
/** Default for -bytespersigopstrict */
static const unsigned int DEFAULT_BYTES_PER_SIGOP_STRICT = 20;
/** The maximum number of witness stack items in a standard P2WSH script */
static const unsigned int MAX_STANDARD_P2WSH_STACK_ITEMS = 100;
/** The maximum size of each witness stack item in a standard P2WSH script */
@@ -111,10 +113,16 @@ bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs,
extern CFeeRate incrementalRelayFee;
extern CFeeRate dustRelayFee;
extern unsigned int nBytesPerSigOp;
extern unsigned int nBytesPerSigOpStrict;

/** Compute the virtual transaction size (weight reinterpreted as bytes). */
int64_t GetVirtualTransactionSize(int64_t nWeight, int64_t nSigOpCost);
int64_t GetVirtualTransactionSize(const CTransaction& tx, int64_t nSigOpCost = 0);
int64_t GetVirtualTransactionInputSize(const CTxIn& tx, int64_t nSigOpCost = 0);

/** Compute accurate total signature operation cost of a transaction.
* Not consensus-critical, since legacy sigops counting is always used in the protocol.
*/
int64_t GetAccurateTransactionSigOpCost(const CTransaction&, const CCoinsViewCache& inputs, int flags);

#endif // BITCOIN_POLICY_POLICY_H
@@ -750,9 +750,12 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool
// itself can contain sigops MAX_STANDARD_TX_SIGOPS is less than
// MAX_BLOCK_SIGOPS; we still consider this an invalid rather than
// merely non-standard transaction.
if (nSigOpsCost > MAX_STANDARD_TX_SIGOPS_COST)
// To avoid rejecting low-sigop bare-multisig transactions, the sigops
// are counted a second time more accurately.
if ((nSigOpsCost > MAX_STANDARD_TX_SIGOPS_COST) || (nBytesPerSigOpStrict && GetAccurateTransactionSigOpCost(tx, view, STANDARD_SCRIPT_VERIFY_FLAGS) > nSize * WITNESS_SCALE_FACTOR / nBytesPerSigOpStrict)) {
MaybeRejectDbg(REJECT_NONSTANDARD, "bad-txns-too-many-sigops", false,
strprintf("%d", nSigOpsCost));
}

poolMinFeeRate = pool.GetMinFee(gArgs.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000);
CAmount mempoolRejectFee = poolMinFeeRate.GetFee(nSize);

0 comments on commit 0152d4e

Please sign in to comment.