Merge branches 'master' and 'hooks'

vinced · May 26, 2011 · 8820cd1 · 8820cd1
2 parents 18d3e8a + da62ee6
commit 8820cd1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/hook.cpp b/hook.cpp
@@ -53,7 +53,7 @@ int CStandardHooks::LockinHeight()
     if (fTestNet)
         return 0;
 
-    return 105000;
+    return 118000;
 }
 
 bool CStandardHooks::Lockin(int nHeight, uint256 hash)
@@ -64,7 +64,8 @@ bool CStandardHooks::Lockin(int nHeight, uint256 hash)
                 (nHeight ==  68555 && hash != uint256("0x00000000001e1b4903550a0b96e9a9405c8a95f387162e4944e8d9fbe501cd6a")) ||
                 (nHeight ==  70567 && hash != uint256("0x00000000006a49b14bcf27462068f1264c961f11fa2e0eddd2be0791e1d4124a")) ||
                 (nHeight ==  74000 && hash != uint256("0x0000000000573993a3c9e41ce34471c079dcf5f52a0e824a81e7f953b8661a20")) ||
-                (nHeight == 105000 && hash != uint256("0x00000000000291ce28027faea320c8d2b054b2e0fe44a773f3eefb151d6bdc97")))
+                (nHeight == 105000 && hash != uint256("0x00000000000291ce28027faea320c8d2b054b2e0fe44a773f3eefb151d6bdc97")) ||
+                (nHeight == 118000 && hash != uint256("0x000000000000774a7f8a7a12dc906ddb9e17e75d684f15e00f8767f9e8f36553")))
             return false;
     return true;
 }

diff --git a/main.cpp b/main.cpp
@@ -1764,7 +1764,7 @@ bool CBlock::AcceptBlock()
     if (hashBestChain == hash)
         CRITICAL_BLOCK(cs_vNodes)
             foreach(CNode* pnode, vNodes)
-                if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : 118000))
+                if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : hooks->LockinHeight()))
                     pnode->PushInventory(CInv(MSG_BLOCK, hash));
 
     return true;

diff --git a/makefile.unix b/makefile.unix
@@ -10,6 +10,8 @@ WXLIBS=$(shell wx-config --libs)
 
 USE_UPNP:=0
 
+DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL
+
 # for boost 1.37, add -mt to the boost libraries
 LIBS= \
  -Wl,-Bstatic \
@@ -34,7 +36,6 @@ LIBS+= \
    -l pthread
 
 
-DEFS=-DNOPCH -DUSE_SSL
 DEBUGFLAGS=-g -D__WXDEBUG__
 CXXFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS)
 HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \

diff --git a/net.cpp b/net.cpp
@@ -974,6 +974,7 @@ void MapPort(bool fMapPort)
 
 
 
+
 void DNSAddressSeed()
 {
     int found = 0;