diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-09 18:00:30 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-09 18:01:54 +0100 |
| commit | dd1304ec216c7d4bdb302195e184b15503819f67 (patch) | |
| tree | 9b813abc7c24f1e6a159e8e025ae4a57f3af8bb1 /src/main.h | |
| parent | 93ca5a35b045b364a86a4e2691ca4964e095b940 (diff) | |
| parent | fdc202f4b02802bfb0ec162d71a115eb86f1bde9 (diff) | |
| download | bitcoin-dd1304ec216c7d4bdb302195e184b15503819f67.tar.xz | |
Merge pull request #7081
45b8e27 -bytespersigop option to additionally limit sigops in transactions we relay and mine (Luke Dashjr)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main.h b/src/main.h index cadd281c89..cefaedabf5 100644 --- a/src/main.h +++ b/src/main.h @@ -100,6 +100,7 @@ static const bool DEFAULT_RELAYPRIORITY = true; /** 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; @@ -130,6 +131,7 @@ 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; |