From fb45259967032d409bca4d542b55414a7c522fba Mon Sep 17 00:00:00 2001
From: Gavin Andresen <gavinandresen@gmail.com>
Date: Fri, 2 Sep 2011 12:00:01 -0400
Subject: [PATCH 1/6] Do not try to download blockchain from 0.3.23 nodes

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index f68683e24..7230906e2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1823,7 +1823,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
 
         // Ask the first connected node for block updates
         static int nAskedForBlocks;
-        if (!pfrom->fClient && (nAskedForBlocks < 1 || vNodes.size() <= 1))
+        if (!pfrom->fClient && pfrom->nVersion != 32300 && (nAskedForBlocks < 1 || vNodes.size() <= 1))
         {
             nAskedForBlocks++;
             pfrom->PushGetBlocks(pindexBest, uint256(0));

From c591cc50eb126eddc78525dd386ea98abaaed724 Mon Sep 17 00:00:00 2001
From: Gavin Andresen <gavinandresen@gmail.com>
Date: Fri, 2 Sep 2011 12:01:42 -0400
Subject: [PATCH 2/6] If compiled -DDEBUG_LOCKORDER and run with -debug, print
 out every mutex lock/unlock (helpful for debugging
 something-is-holding-a-mutex-too-long problems)

---
 src/util.cpp | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index 390b3a340..76a270027 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -923,16 +923,22 @@ string FormatFullVersion()
 
 struct CLockLocation
 {
-    std::string mutexName;
-    std::string sourceFile;
-    int sourceLine;
-
     CLockLocation(const char* pszName, const char* pszFile, int nLine)
     {
         mutexName = pszName;
         sourceFile = pszFile;
         sourceLine = nLine;
     }
+
+    std::string ToString() const
+    {
+        return mutexName+"  "+sourceFile+":"+itostr(sourceLine);
+    }
+
+private:
+    std::string mutexName;
+    std::string sourceFile;
+    int sourceLine;
 };
 
 typedef std::vector< std::pair<CCriticalSection*, CLockLocation> > LockStack;
@@ -950,14 +956,14 @@ static void potential_deadlock_detected(const std::pair<CCriticalSection*, CCrit
     {
         if (i.first == mismatch.first) printf(" (1)");
         if (i.first == mismatch.second) printf(" (2)");
-        printf(" %s  %s:%d\n", i.second.mutexName.c_str(), i.second.sourceFile.c_str(), i.second.sourceLine);
+        printf(" %s\n", i.second.ToString().c_str());
     }
     printf("Current lock order is:\n");
     BOOST_FOREACH(const PAIRTYPE(CCriticalSection*, CLockLocation)& i, s1)
     {
         if (i.first == mismatch.first) printf(" (1)");
         if (i.first == mismatch.second) printf(" (2)");
-        printf(" %s  %s:%d\n", i.second.mutexName.c_str(), i.second.sourceFile.c_str(), i.second.sourceLine);
+        printf(" %s\n", i.second.ToString().c_str());
     }
 }
 
@@ -967,6 +973,7 @@ static void push_lock(CCriticalSection* c, const CLockLocation& locklocation)
     if (lockstack.get() == NULL)
         lockstack.reset(new LockStack);
 
+    if (fDebug) printf("Locking: %s\n", locklocation.ToString().c_str());
     dd_mutex.lock();
 
     (*lockstack).push_back(std::make_pair(c, locklocation));
@@ -992,7 +999,14 @@ static void push_lock(CCriticalSection* c, const CLockLocation& locklocation)
 
 static void pop_lock()
 {
+    if (fDebug) 
+    {
+        const CLockLocation& locklocation = (*lockstack).rbegin()->second;
+        printf("Unlocked: %s\n", locklocation.ToString().c_str());
+    }
+    dd_mutex.lock();
     (*lockstack).pop_back();
+    dd_mutex.unlock();
 }
 
 void CCriticalSection::Enter(const char* pszName, const char* pszFile, int nLine)

From b53e277ba12e011287d3b15823b64c303ab66243 Mon Sep 17 00:00:00 2001
From: Gavin Andresen <gavinandresen@gmail.com>
Date: Fri, 2 Sep 2011 12:25:25 -0400
Subject: [PATCH 3/6] Stay connected to seed nodes; disconnecting causes
 problems if you are trying to make the initial blockchain download.

---
 src/net.cpp | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 952102ede..5fca17aa4 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1349,7 +1349,6 @@ void ThreadOpenConnections2(void* parg)
         CRITICAL_BLOCK(cs_mapAddresses)
         {
             // Add seed nodes if IRC isn't working
-            static bool fSeedUsed;
             bool fTOR = (fUseProxy && addrProxy.port == htons(9050));
             if (mapAddresses.empty() && (GetTime() - nStart > 60 || fTOR) && !fTestNet)
             {
@@ -1365,35 +1364,6 @@ void ThreadOpenConnections2(void* parg)
                     addr.nTime = GetTime()-GetRand(nOneWeek)-nOneWeek;
                     AddAddress(addr);
                 }
-                fSeedUsed = true;
-            }
-
-            if (fSeedUsed && mapAddresses.size() > ARRAYLEN(pnSeed) + 100)
-            {
-                // Disconnect seed nodes
-                set<unsigned int> setSeed(pnSeed, pnSeed + ARRAYLEN(pnSeed));
-                static int64 nSeedDisconnected;
-                if (nSeedDisconnected == 0)
-                {
-                    nSeedDisconnected = GetTime();
-                    CRITICAL_BLOCK(cs_vNodes)
-                        BOOST_FOREACH(CNode* pnode, vNodes)
-                            if (setSeed.count(pnode->addr.ip))
-                                pnode->fDisconnect = true;
-                }
-
-                // Keep setting timestamps to 0 so they won't reconnect
-                if (GetTime() - nSeedDisconnected < 60 * 60)
-                {
-                    BOOST_FOREACH(PAIRTYPE(const vector<unsigned char>, CAddress)& item, mapAddresses)
-                    {
-                        if (setSeed.count(item.second.ip) && item.second.nTime != 0)
-                        {
-                            item.second.nTime = 0;
-                            CAddrDB().WriteAddress(item.second);
-                        }
-                    }
-                }
             }
         }
 

From fb462ab2723a210aebfbcdde331fe616b6e11b7b Mon Sep 17 00:00:00 2001
From: Matt Corallo <matt@bluematt.me>
Date: Fri, 2 Sep 2011 12:26:18 -0400
Subject: [PATCH 4/6] Update binary mos to latest translations.

---
 locale/cs/LC_MESSAGES/bitcoin.mo | Bin 20692 -> 23696 bytes
 locale/fr/LC_MESSAGES/bitcoin.mo | Bin 15859 -> 15804 bytes
 locale/nl/LC_MESSAGES/bitcoin.mo | Bin 20886 -> 20891 bytes
 locale/pt/LC_MESSAGES/bitcoin.mo | Bin 15767 -> 15721 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/locale/cs/LC_MESSAGES/bitcoin.mo b/locale/cs/LC_MESSAGES/bitcoin.mo
index 80354cf764f2d5f8fed28c37097ae575663afe35..8b6e444b66e6b5ad503792de8c4fddcacb212187 100644
GIT binary patch
delta 7697
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

delta 4762
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
CIu8>7

diff --git a/locale/fr/LC_MESSAGES/bitcoin.mo b/locale/fr/LC_MESSAGES/bitcoin.mo
index f4d669b4c01b4cda7742b30dc9737d88b8befe43..f60e15bd62177cced9d93e5ffea96faf8e631c19 100644
GIT binary patch
delta 3774
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
CCtL6U

delta 3827
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
E|M<CW*Z=?k

diff --git a/locale/nl/LC_MESSAGES/bitcoin.mo b/locale/nl/LC_MESSAGES/bitcoin.mo
index c5ae8489fb5ad09d5d68673de6d5fc87cacfe829..836e91d41b63d1dbe5596668e9d7768ac78f4708 100644
GIT binary patch
delta 1445
zcmXZcSxD7E6vy#%#U-noxu<0sR+cT8scCAYZKh_+gDqeLRw!D53-};iBM|DP0yDC(
z#Uvsm!!!^j!tBMQhX|}Fq%sf_BZ^8(`u_O)aQV!P|Cw{<%#4jKu4^r>_D6o6ATt|F
zG@FOh7?1Atj;XkSelae^S`5ZpI3GJP9G|1U`+zKAzfkMNCpo5}n|=<?#X=0h;w1Cf
zA{sRe1mI=VhpniEJ5Un_a19P&A^Ije-xuL>`X|r_8_*w{Pzm0_wb+Rn_!(E@k`$7`
zf)tOLAB`&v$Qw8d?_wmjV;Byg68nhy`!}3}e^3E^HaPtN+)sZYW@6>c_(P1M--{9W
z4z;nL9vWX<W?rdIpwTpT#~*B?vm?J5-KYt{7>6;q3v)088*w(?M}60Yf!K#T@im5G
zbh>l2$*9VBj?hp^E}#PU;0X3%J>H{k3YfrlvhV<^)J>=(yNRkqJ0@TcM&mfvpnDVL
zXM^>qqt4juBz6!<++$@lv{0QhU>8vVTTvMgVkCY-1)fIj*qdx<S_H1bL#Vq@k2<0@
z)ch_~f-le;hfwq1qaX3@I}I-eCQ)be4>ch?+w3aFqAJsiTKE|%&>*VRKTsQRZE<!M
zhzbykL70jZ!}3rSI)^%{ZuBR<_0x#Lm#Akmj#~IHu0#K=+*nM<9aw}Mr?sNKA4XMd
z0=HxMHfR1}R3c@lO4QAaH=-_W3wnZSw9(++*;7oyDdY)T0;_5KC~_UF8TG8*q7oZJ
zz56J#^2HQX;+gmWb8!SG@hcAJI1X|nwN7^~^{=KekZbk|v+~SNV`x542pdofx1$0+
zM&0UB48tkZWeegdD3L_eCCkITSb{o&Zq$(uqBiyhb=2+x>aYKJaRtu6KJ2Dnj#V1p
zZMFihV?FlcZOq?eb{r>A2^A7el`KJTtVP|GGpG%mN0s~%y6`N&C;ZAgR=WF^1r{Ew
YsI024u87GlttviMda|<PcVhG6{|AV<@c;k-

delta 1440
zcmXZbZA{Kl7{~GJZmGLeQb|&Im^_p$mGV4F5h~47X3L8v+AKC%w#>bTUSJDbELob&
z+A<2QW>%Rk%`00NYj{(w6=SAoG`_$6+q(BT=k!14y3TdZscUpyZ*;Xh@%03n*=Ukk
z5Kdqmx|1D~F@k;}F2ZsQ#akGREjSyWqrUrqEMY%T>&2!xrl8_vU;yT07#60O$D(MQ
zWMBqfL4DYOTKEBKLJuZjAMQifD(CwGTulEcPQz;S!x~hAw{Zow;ClRw%P}g|Y#U~$
zddz%jTw_4qL^s~SNNmP%>_H{=5%vF3oQ^+H0WHnx`{RDP;kW@yr^fGNH2n^ogYQrq
z`|hDJ<T9JYa0Uj}nEBuz)Q-H?I=WF4f^Z4W#T?AQFuaQXcn|emE6&7D%*NL^3nSM#
zN1KSMjOQQ?mE<BSa61lSCsyHI>ZXA4Y-cm>MkQ8*I<h)cC7Ll2+i@Na<7sqnG;3pn
zm8hdm+vFs+2T9yx#Wb`~g)?B6PyriI8TVo&enJJFK<)S+@@HXW6_0ySccBt>L`|sq
zt*8WFqBr)T=D$Z@;@ejmUJQ((&gM62LP)w<EykcK(}7yJ3l*prRqAi34g5uwJRrjf
z5Q8D~laXRr7OFz$QAgE=e#EzK8qxR)^=yVw3;)8E=)J{k0jA<sEI^La8c^T&qbfFn
zSs0S(%s+tIX)&r26;tC^QJ1zJJ)tz3XmH=`8K&Sk@`Np()iizxxeiu~dRA{yi4CFN
zeFRzg;7U~DtMMUb;vkOU7wq5W*vpO7I&Isj|0x<h+c_6pzr*Y-2JhsCV>N2wW>mmO
zs1gsLUduS@vIX)Klt=>Vl4W5&7NL%y4RxfwsExfr9kn}``p3~&nClGW;8XfXuuS85
zW=rt~R$({Z!L7R}D~_NN$|ssCS%ltLj=C#nP#d^_D*0t};W>U?{Ej_d7Wg7IAn(NC
T()sBnWkttJN*_-q)yMn?<lwkF

diff --git a/locale/pt/LC_MESSAGES/bitcoin.mo b/locale/pt/LC_MESSAGES/bitcoin.mo
index 20e100f578d4effd13e14dfd43061c9b24b2be25..35a3fd7bc96b012d63ebe7bd337ebb6d15e1e883 100644
GIT binary patch
delta 3790
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
Z5(8}8tjdb8BA?134bMeY#>LN#`X8t$SvCLw

delta 3834
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
K@4eN&u=)SsSY-+T


From ec74e8a44338202bfb82faa2cef4611cc37e7fa5 Mon Sep 17 00:00:00 2001
From: Gavin Andresen <gavinandresen@gmail.com>
Date: Fri, 2 Sep 2011 12:56:10 -0400
Subject: [PATCH 5/6] Versions 0.3.20 THROUGH 0.3.23 have trouble with
 blockchain downloads; avoid them

---
 src/main.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 7230906e2..cbcfef041 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1823,7 +1823,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
 
         // Ask the first connected node for block updates
         static int nAskedForBlocks;
-        if (!pfrom->fClient && pfrom->nVersion != 32300 && (nAskedForBlocks < 1 || vNodes.size() <= 1))
+        if (!pfrom->fClient &&
+            (pfrom->nVersion < 32000 || pfrom->nVersion >= 32400) &&
+             (nAskedForBlocks < 1 || vNodes.size() <= 1))
         {
             nAskedForBlocks++;
             pfrom->PushGetBlocks(pindexBest, uint256(0));

From 7464e647decace52bc075d9ac8788974504e0bb9 Mon Sep 17 00:00:00 2001
From: Gavin Andresen <gavinandresen@gmail.com>
Date: Fri, 2 Sep 2011 13:31:28 -0400
Subject: [PATCH 6/6] Bumped version numbers to 0.4.0rc1

---
 contrib/Bitcoin.app/Contents/Info.plist |  4 ++--
 doc/README                              |  2 +-
 doc/README_windows.txt                  |  2 +-
 doc/coding.txt                          | 32 ++++++++++++++++++-------
 doc/release-process.txt                 |  3 +++
 share/setup.nsi                         |  6 ++---
 src/serialize.h                         |  2 +-
 7 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/contrib/Bitcoin.app/Contents/Info.plist b/contrib/Bitcoin.app/Contents/Info.plist
index bfeb2f8de..a5c7da1c8 100644
--- a/contrib/Bitcoin.app/Contents/Info.plist
+++ b/contrib/Bitcoin.app/Contents/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.25</string>
+	<string>0.4.00</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>325</string>
+	<string>400</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.5</string>
 	<key>CFBundleIconFile</key>
diff --git a/doc/README b/doc/README
index 763fc415b..772fd7f31 100644
--- a/doc/README
+++ b/doc/README
@@ -1,4 +1,4 @@
-Bitcoin 0.3.25 BETA
+Bitcoin 0.4.0rc1 BETA
 
 Copyright (c) 2009-2011 Bitcoin Developers
 Distributed under the MIT/X11 software license, see the accompanying
diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index e715b3206..8378ae50d 100644
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -1,4 +1,4 @@
-Bitcoin 0.3.25 BETA
+Bitcoin 0.4.00rc1 BETA
 
 Copyright (c) 2009-2011 Bitcoin Developers
 Distributed under the MIT/X11 software license, see the accompanying
diff --git a/doc/coding.txt b/doc/coding.txt
index ec31ccded..b3c812a48 100644
--- a/doc/coding.txt
+++ b/doc/coding.txt
@@ -43,38 +43,52 @@ bn      CBigNum
 -------------------------
 Locking/mutex usage notes
 
-The code is multi-threaded, and uses mutexes and the CRITICAL_BLOCK/TRY_CRITICAL_BLOCK macros to protect data structures.
+The code is multi-threaded, and uses mutexes and the
+CRITICAL_BLOCK/TRY_CRITICAL_BLOCK macros to protect data structures.
 
-Deadlocks due to inconsistent lock ordering (thread 1 locks cs_main and then cs_wallet, while thread 2 locks them in the opposite order: result, deadlock as each waits for the other to release its lock) are a problem. Compile with -DDEBUG_LOCKORDER to get lock order inconsistencies reported in the debug.log file.
+Deadlocks due to inconsistent lock ordering (thread 1 locks cs_main
+and then cs_wallet, while thread 2 locks them in the opposite order:
+result, deadlock as each waits for the other to release its lock) are
+a problem. Compile with -DDEBUG_LOCKORDER to get lock order
+inconsistencies reported in the debug.log file.
 
-Re-architecting the core code so there are better-defined interfaces between the various components is a goal, with any necessary locking done by the components (e.g. see the self-contained CKeyStore class and its cs_KeyStore lock for example).
+Re-architecting the core code so there are better-defined interfaces
+between the various components is a goal, with any necessary locking
+done by the components (e.g. see the self-contained CKeyStore class
+and its cs_KeyStore lock for example).
 
 -------
 Threads
 
 StartNode : Starts other threads.
 
-ThreadGetMyExternalIP : Determines outside-the-firewall IP address, sends addr message to connected peers when it determines it.
+ThreadGetMyExternalIP : Determines outside-the-firewall IP address,
+sends addr message to connected peers when it determines it. 
 
-ThreadIRCSeed : Joins IRC bootstrapping channel, watching for new peers and advertising this node's IP address.
+ThreadIRCSeed : Joins IRC bootstrapping channel, watching for new
+peers and advertising this node's IP address. 
 
 ThreadSocketHandler : Sends/Receives data from peers on port 8333.
 
-ThreadMessageHandler : Higher-level message handling (sending and receiving).
+ThreadMessageHandler : Higher-level message handling (sending and
+receiving).
 
 ThreadOpenConnections : Initiates new connections to peers.
 
 ThreadTopUpKeyPool : replenishes the keystore's keypool.
 
-ThreadCleanWalletPassphrase : re-locks an encrypted wallet after user has unlocked it for a period of time.
+ThreadCleanWalletPassphrase : re-locks an encrypted wallet after user
+has unlocked it for a period of time. 
 
 SendingDialogStartTransfer : used by pay-via-ip-address code (obsolete)
 
 ThreadDelayedRepaint : repaint the gui 
 
-ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used in 500ms.
+ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used
+in 500ms.
 
-ThreadRPCServer : Remote procedure call handler, listens on port 8332 for connections and services them.
+ThreadRPCServer : Remote procedure call handler, listens on port 8332
+for connections and services them.
 
 ThreadBitcoinMiner : Generates bitcoins
 
diff --git a/doc/release-process.txt b/doc/release-process.txt
index 4940afefa..bcda64dbe 100644
--- a/doc/release-process.txt
+++ b/doc/release-process.txt
@@ -1,6 +1,9 @@
 * update (commit) version in sources
+  src/serialize.h
+  share/setup.nsi
 
 * update (commit) version in OSX app bundle
+ contrib/Bitcoin.app/Contents/Info.plist
 
   * CFBundleShortVersionString should have value like 0.3.23
   * CFBundleVersion should have value like 323
diff --git a/share/setup.nsi b/share/setup.nsi
index b4bf3cff4..6cf477747 100644
--- a/share/setup.nsi
+++ b/share/setup.nsi
@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 0.3.25
+!define VERSION 0.4.00
 !define COMPANY "Bitcoin project"
 !define URL http://www.bitcoin.org/
 
@@ -45,13 +45,13 @@ Var StartMenuGroup
 !insertmacro MUI_LANGUAGE English
 
 # Installer attributes
-OutFile bitcoin-0.3.25-win32-setup.exe
+OutFile bitcoin-0.4.00-win32-setup.exe
 InstallDir $PROGRAMFILES\Bitcoin
 CRCCheck on
 XPStyle on
 BrandingText " "
 ShowInstDetails show
-VIProductVersion 0.3.25.0
+VIProductVersion 0.4.00.0
 VIAddVersionKey ProductName Bitcoin
 VIAddVersionKey ProductVersion "${VERSION}"
 VIAddVersionKey CompanyName "${COMPANY}"
diff --git a/src/serialize.h b/src/serialize.h
index 0a31ff557..698bdfe6a 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -59,7 +59,7 @@ class CDataStream;
 class CAutoFile;
 static const unsigned int MAX_SIZE = 0x02000000;
 
-static const int VERSION = 32500;
+static const int VERSION = 40000;
 static const char* pszSubVer = "";
 static const bool VERSION_IS_BETA = true;