patches/main.cpp.diff

   1 diff --git a/src/main.cpp b/src/main.cpp
   2 index 45de76a..8a9002f 100644
   3 --- a/src/main.cpp
   4 +++ b/src/main.cpp
   5 @@ -2787,16 +2787,19 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
   6
   7              // Size limits
   8              unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK);
   9 -            if (nBlockSize + nTxSize >= MAX_BLOCK_SIZE_GEN)
  10 -                continue;
  11 +            //if (nBlockSize + nTxSize >= MAX_BLOCK_SIZE_GEN)
  12 +            //    continue;
  13              int nTxSigOps = tx.GetSigOpCount();
  14 -            if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS)
  15 -                continue;
  16 +            //if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS)
  17 +            //    continue;
  18
  19              // Transaction fee required depends on block size
  20              bool fAllowFree = (nBlockSize + nTxSize < 4000 || CTransaction::AllowFree(dPriority));
  21              int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree, true);
  22
  23 +           // electrum server: do not check fees
  24 +           nMinFee = 0;
  25 +
  26              // Connecting shouldn't fail due to dependency on other memory pool transactions
  27              // because we're already processing them in order of dependency
  28              map<uint256, CTxIndex> mapTestPoolTmp(mapTestPool);