From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Sun, 22 Apr 2012 14:05:43 +0000 (-0400)
Subject: Merge branch '0.4.x' into 0.5.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~10^2
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=a93ab877877925c60b2dbf56bdde8aa46b6b7391

Merge branch '0.4.x' into 0.5.x

Conflicts:
	src/main.cpp
---

a93ab877877925c60b2dbf56bdde8aa46b6b7391
diff --cc src/main.cpp
index fade6a2,e6f9421..d72a131
--- a/src/main.cpp
+++ b/src/main.cpp
@@@ -1482,10 -1462,10 +1482,10 @@@ bool CBlock::CheckBlock() cons
  
      // First transaction must be coinbase, the rest must not be
      if (vtx.empty() || !vtx[0].IsCoinBase())
 -        return error("CheckBlock() : first tx is not coinbase");
 +        return DoS(100, error("CheckBlock() : first tx is not coinbase"));
-     for (int i = 1; i < vtx.size(); i++)
+     for (unsigned int i = 1; i < vtx.size(); i++)
          if (vtx[i].IsCoinBase())
 -            return error("CheckBlock() : more than one coinbase");
 +            return DoS(100, error("CheckBlock() : more than one coinbase"));
  
      // Check transactions
      BOOST_FOREACH(const CTransaction& tx, vtx)