diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-26 11:10:31 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-26 11:27:30 +0200 |
| commit | 618c9dd8c651f15ea37a09d3ee4fa4426c75ac02 (patch) | |
| tree | a34413030e80c00d49988a2354a4a2f8564e0c15 /src/main.h | |
| parent | 517eee3e8f8b14b9a2d7deabefcc71e2c0bd4312 (diff) | |
| parent | ab942c15bd3854650afa810d7c22d7fd30d346c1 (diff) | |
| download | bitcoin-618c9dd8c651f15ea37a09d3ee4fa4426c75ac02.tar.xz | |
Merge #8365: Treat high-sigop transactions as larger rather than rejecting them
ab942c1 Treat high-sigop transactions as larger rather than rejecting them (Pieter Wuille)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h index feaaaad750..26ea6adc6b 100644 --- a/src/main.h +++ b/src/main.h @@ -124,7 +124,6 @@ static const int64_t DEFAULT_MAX_TIP_AGE = 24 * 60 * 60; /** Default for -permitbaremultisig */ static const bool DEFAULT_PERMIT_BAREMULTISIG = true; -static const unsigned int DEFAULT_BYTES_PER_SIGOP = 20; static const bool DEFAULT_CHECKPOINTS_ENABLED = true; static const bool DEFAULT_TXINDEX = false; static const unsigned int DEFAULT_BANSCORE_THRESHOLD = 100; @@ -165,7 +164,6 @@ extern int nScriptCheckThreads; extern bool fTxIndex; extern bool fIsBareMultisigStd; extern bool fRequireStandard; -extern unsigned int nBytesPerSigOp; extern bool fCheckBlockIndex; extern bool fCheckpointsEnabled; extern size_t nCoinCacheUsage; |