1 files changed, 10 insertions, 3 deletions

diff --git a/src/rpc.cpp b/src/rpc.cpp
index 7c5ef6c..62eec7a 100644
--- a/src/rpc.cpp
+++ b/src/rpc.cpp
@@ -284,6 +284,11 @@ static bool RebuildJob()
                 // Seeded with the header, tx count and coinbase, because
                 // CheckBlock() weighs the whole serialized block.
                 unsigned int sz = ::GetSerializeSize(block, SER_DISK);
+                // And the sigop budget, which CheckBlock() enforces and this
+                // builder never counted against. Same counting function
+                // CheckBlock() sums, seeded from the coinbase because it sums
+                // over all of vtx.
+                unsigned int nSigOps = block.vtx[0].GetSigOpCount();
                 while (fFoundSomething && sz < MAX_BLOCK_SIZE_GEN)
                 {
                     fFoundSomething = false;
@@ -301,8 +306,9 @@ static bool RebuildJob()
                         // nFees by reference on success, and a transaction we
                         // then decline would leave the coinbase claiming a fee
                         // this block does not collect.
-                        unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK);
-                        if (!BlockTemplateFits(sz, nTxSize))
+                        unsigned int nTxSize   = ::GetSerializeSize(tx, SER_NETWORK);
+                        unsigned int nTxSigOps = tx.GetSigOpCount();
+                        if (!BlockTemplateFits(sz, nSigOps, nTxSize, nTxSigOps))
                             continue;
                         map<uint256, CTxIndex> tmp(pool);
                         if (!tx.ConnectInputs(txdb, tmp, CDiskTxPos(1,1,1), 0, nFees,
@@ -310,7 +316,8 @@ static bool RebuildJob()
                             continue;
                         swap(pool, tmp);
                         block.vtx.push_back(tx);
-                        sz += nTxSize;
+                        sz      += nTxSize;
+                        nSigOps += nTxSigOps;
                         vfAlreadyAdded[n] = true;
                         fFoundSomething = true;
                     }