aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-06-28 15:09:02 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-06-28 15:09:15 +0200
commit7b8fc9d8ad4791269fb8439126b5ceff39217f56 (patch)
treee26ad9c246486dc57c302cf9eb04caa190300b64 /src
parentc8b6c0a2cfee5d2d7d4b30f0e931d5823cfcdbfe (diff)
parent675bcd5892bc6f8997e999fb2c7a7e70e449063e (diff)
downloadbitcoin-7b8fc9d8ad4791269fb8439126b5ceff39217f56.tar.xz
Merge pull request #4436
675bcd5 Correct comment for 15-of-15 p2sh script size (Michael Ford)
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 091bd1bc7f..336a5a9a86 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -491,7 +491,7 @@ bool IsStandardTx(const CTransaction& tx, string& reason)
// Treat non-final transactions as non-standard to prevent a specific type
// of double-spend attack, as well as DoS attacks. (if the transaction
// can't be mined, the attacker isn't expending resources broadcasting it)
- // Basically we don't want to propagate transactions that can't included in
+ // Basically we don't want to propagate transactions that can't be included in
// the next block.
//
// However, IsFinalTx() is confusing... Without arguments, it uses
@@ -524,7 +524,7 @@ bool IsStandardTx(const CTransaction& tx, string& reason)
{
// 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)=1624
+ // 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