better prevention of inventory relaying during initial download,

message checksum between nodes with 0.2.9 or higher, optimization level up from -O0 to -O2, rpc functions: setlabel, getlabel, getaddressesbylabel, getreceivedbyaddress, getreceivedbylabel, listreceivedbyaddress, listreceivedbylabel -- version 0.2.9 git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@78 1a98c847-1fd6-4fd8-948a-caf3550aa51b
build-osx.txt build instructions and makefile.osx from Laszlo
2026-01-31 04:17:34 +01:00 · 2010-05-26 00:05:26 +00:00 · 2010-05-25 23:58:27 +00:00 · 2010-05-19 00:26:56 +00:00 · 2010-03-05 02:55:09 +00:00 · 2010-03-05 01:13:27 +00:00
21 changed files with 769 additions and 188 deletions
--- a/build-osx.txt
+++ b/build-osx.txt
@@ -0,0 +1,209 @@
+Mac OS X build instructions
+Laszlo Hanyecz (solar@heliacal.net)
+
+
+Tested on 10.5 and 10.6 intel.  PPC is not supported because it's big-endian.
+
+All of the commands should be executed in Terminal.app.. it's in
+/Applications/Utilities
+
+You need to install XCode with all the options checked so that the compiler
+and everything is available in /usr not just /Developer
+I think it comes on the DVD but you can get the current version from
+http://developer.apple.com
+
+
+1.  Pick a directory to work inside.. something like ~/bitcoin works.  The
+structure I use looks like this:
+(~ is your home directory)
+
+~/bitcoin
+~/bitcoin/trunk         # source code
+~/bitcoin/deps          # dependencies.. like libraries and headers needed to compile
+~/bitcoin/Bitcoin.app   # the application bundle where you can run the app
+
+Just execute: mkdir ~/bitcoin
+This will create the top dir for you..
+
+WARNING: do not use the ~ notation with the configure scripts.. use the full
+name of the directory, for example /Users/james/bitcoin/deps for a user named
+'james'.  In my examples I am using 'macosuser' so make sure you change that.
+
+2.  Check out the trunk version of the bitcoin code from subversion:
+
+cd ~/bitcoin
+svn checkout https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk
+
+This will make ~/bitcoin/trunk for you with all the files from subversion. 
+
+3.  Get and build the dependencies
+
+
+Boost
+-----
+
+Download from http://www.boost.org/users/download/
+I'm assuming it ended up in ~/Downloads..
+
+mkdir ~/bitcoin/deps
+cd ~/bitcoin/deps
+tar xvjf ~/Downloads/boost_1_42_0.tar.bz2
+cd boost_1_42_0
+./bootstrap.sh
+./bjam architecture=combined address-model=32_64 macosx-version=10.6 macosx-version-min=10.5 link=static runtime-link=static --toolset=darwin --prefix=/Users/macosuser/bitcoin/deps install
+
+This part takes a while.. use your judgement and fix it if something doesn't
+build for some reason.
+
+Change the prefix to whatever your directory is (my username in this example
+is macosuser).  I'm also running on 10.6 so i have macosx-version=10.6  change
+to 10.5 if you're using leopard.
+
+This is what my output looked like at the end:
+...failed updating 2 targets...
+...skipped 144 targets...
+...updated 8074 targets...
+
+
+OpenSSL
+-------
+
+Download from http://www.openssl.org/source/
+
+We would like to build this as a 32 bit/64 bit library so we actually build it
+2 times and join it together here..  If you downloaded with safari it already
+uncompressed it so it will just be a tar not a tar.gz
+
+cd ~/bitcoin/deps
+tar xvf ~/Downloads/openssl-1.0.0.tar
+mv openssl-1.0.0 openssl-1.0.0-i386
+tar xvf ~/Downloads/openssl-1.0.0.tar
+mv openssl-1.0.0 openssl-1.0.0-x86_64
+# build i386 (32 bit intel) binary
+cd openssl-1.0.0-i386
+./Configure --prefix=/Users/macosuser/bitcoin/deps --openssldir=/Users/macosuser/deps/openssl darwin-i386-cc && make
+make install # only do this on one of the architectures, to install the headers
+cd ..
+# build x86_64 (64 bit intel) binary
+cd openssl-1.0.0-x86_64
+./Configure --prefix=/Users/macosuser/bitcoin/deps --openssldir=/Users/macosuser/deps/openssl darwin64-x86_64-cc && make
+cd ..
+
+# combine the libs
+cd ~/bitcoin/deps
+lipo -arch i386 openssl-1.0.0-i386/libcrypto.a -arch x86_64 openssl-1.0.0-x86_64/libcrypto.a -o lib/libcrypto.a -create
+lipo -arch i386 openssl-1.0.0-i386/libssl.a -arch x86_64 openssl-1.0.0-x86_64/libssl.a -o lib/libssl.a -create
+
+Verify your binaries
+
+file lib/libcrypto.a
+
+output should look like this:
+
+ib/libcrypto.a: Mach-O universal binary with 2 architectures
+lib/libcrypto.a (for architecture i386):	current ar archive random library
+lib/libcrypto.a (for architecture x86_64):	current ar archive random library
+
+
+Berkeley DB
+-----------
+
+Download from http://freshmeat.net/projects/berkeleydb/
+
+cd ~/bitcoin/deps
+tar xvf ~/Downloads/db-4.8.26.tar
+cd db-4.8.26/build_unix
+../dist/configure --prefix=/Users/macosuser/bitcoin/deps --enable-cxx && make && make install
+
+
+wxWidgets
+---------
+
+This is the big one..
+
+Check it out from svn
+
+cd ~/bitcoin/deps
+svn checkout http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets-trunk
+
+This will make a wxWidgets-trunk directory in deps.
+
+Use this script snippet, change your prefix to whatever your dir is:
+
+PREFIX=~/bitcoin/deps
+SRCDIR="$PREFIX/wxWidgets-trunk"
+BUILDDIR="$SRCDIR/macbuild"
+
+cd "$PREFIX" &&
+#svn checkout http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets-trunk &&
+cd "$SRCDIR" &&
+
+[ -f include/wx/hashmap.h.orig ] || cp include/wx/hashmap.h include/wx/hashmap.h.orig &&
+sed 's/if wxUSE_STL/if 0 \&\& wxUSE_STL/g' < include/wx/hashmap.h.orig > include/wx/hashmap.h &&
+
+[ -f include/wx/hashset.h.orig ] || cp include/wx/hashset.h include/wx/hashset.h.orig &&
+sed 's/if wxUSE_STL/if 0 \&\& wxUSE_STL/g' < include/wx/hashset.h.orig > include/wx/hashset.h &&
+
+
+
+rm -vrf "$BUILDDIR" &&
+mkdir "$BUILDDIR" &&
+cd "$BUILDDIR" &&
+
+../configure --prefix="$PREFIX" \
+--with-osx_cocoa \
+--disable-shared \
+--disable-debug_flag \
+--with-macosx-version-min=10.5 \
+--enable-stl \
+--enable-utf8 \
+--enable-universal_binary \
+--with-libjpeg=builtin \
+--with-libpng=builtin \
+--with-regex=builtin \
+--with-libtiff=builtin \
+--with-zlib=builtin \
+--with-expat=builtin \
+--with-macosx-sdk=/Developer/SDKs/MacOSX10.5.sdk &&
+
+
+find . -name Makefile | 
+while read i; do 
+  echo $i; 
+  sed 's/-arch i386/-arch i386 -arch x86_64/g' < "$i" > "$i".new && 
+  mv "$i" "$i".old && 
+  mv "$i".new "$i"; 
+done
+
+
+
+make && 
+make install
+
+
+
+Now you should be able to build bitcoin
+
+cd ~/bitcoin/trunk
+make -f makefile.osx bitcoin
+
+Before you can run it, you need to create an application bundle for Mac OS.
+Create the directories in terminal using mkdir and copy the files into place.
+They are available at http://heliacal.net/~solar/bitcoin/mac-build/
+You need the Info.plist and the .ins file.  The Contents/MacOS/bitcoin file is
+the output of the build.
+Your directory structure should look like this:
+
+Bitcoin.app
+Bitcoin.app/Contents
+Bitcoin.app/Contents/Info.plist
+Bitcoin.app/Contents/MacOS
+Bitcoin.app/Contents/MacOS/bitcoin
+Bitcoin.app/Contents/Resources
+Bitcoin.app/Contents/Resources/BitcoinAppIcon.icns
+
+To run it you can just click the Bitcoin.app in Finder, or just do open
+~/bitcoin/Bitcoin.app
+If you want to run it with arguments you can just run it without backgrounding
+by specifying the full name in terminal:
+~/bitcoin/Bitcoin.app/Contents/MacOS/bitcoin -addnode=192.75.207.66
--- a/db.h
+++ b/db.h
@@ -328,6 +328,8 @@ public:

    bool EraseName(const string& strAddress)
    {
+        // This should only be used for sending addresses, never for receiving addresses,
+        // receiving addresses must always have an address book entry if they're not change return.
        CRITICAL_BLOCK(cs_mapAddressBook)
            mapAddressBook.erase(strAddress);
        nWalletDBUpdated++;
--- a/headers.h
+++ b/headers.h
@@ -19,11 +19,11 @@
 #define WIN32_LEAN_AND_MEAN 1
 #define __STDC_LIMIT_MACROS // to enable UINT64_MAX from stdint.h
 #include <wx/wx.h>
-#include <wx/clipbrd.h>
-#include <wx/snglinst.h>
 #include <wx/stdpaths.h>
-#include <wx/utils.h>
+#include <wx/snglinst.h>
 #if wxUSE_GUI
+#include <wx/utils.h>
+#include <wx/clipbrd.h>
 #include <wx/taskbar.h>
 #endif
 #include <openssl/ecdsa.h>
--- a/init.cpp
+++ b/init.cpp
@@ -224,9 +224,6 @@ bool CMyApp::Initialize(int& argc, wxChar** argv)
        }
    }

-    if (fDaemon)
-        fprintf(stdout, "bitcoin server starting\n");
-
 #ifdef __WXGTK__
    if (fDaemon || fCommandLine)
    {
@@ -284,6 +281,10 @@ bool CMyApp::OnInit2()
    _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
    _CrtSetReportFile(_CRT_WARN, CreateFileA("NUL", GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0));
 #endif
+#if _MSC_VER >= 1400
+    // Disable confusing "helpful" text message on abort, ctrl-c
+    _set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
+#endif
 #if defined(__WXMSW__) && defined(__WXDEBUG__) && wxUSE_GUI
    // Disable malfunctioning wxWidgets debug assertion
    g_isPainting = 10000;
@@ -291,10 +292,12 @@ bool CMyApp::OnInit2()
 #if wxUSE_GUI
    wxImage::AddHandler(new wxPNGHandler);
 #endif
-#ifdef __WXMSW__
+#if defined(__WXMSW__ ) || defined(__WXMAC__)
    SetAppName("Bitcoin");
 #else
    SetAppName("bitcoin");
+#endif
+#ifndef __WXMSW__
    umask(077);
 #endif
 #ifdef __WXMSW__
@@ -441,7 +444,8 @@ bool CMyApp::OnInit2()
    //
    // Load data files
    //
-    bool fFirstRun;
+    if (fDaemon)
+        fprintf(stdout, "bitcoin server starting\n");
    strErrors = "";
    int64 nStart;

@@ -459,6 +463,7 @@ bool CMyApp::OnInit2()

    printf("Loading wallet...\n");
    nStart = GetTimeMillis();
+    bool fFirstRun;
    if (!LoadWallet(fFirstRun))
        strErrors += _("Error loading wallet.dat      \n");
    printf(" wallet      %15"PRI64d"ms\n", GetTimeMillis() - nStart);
--- a/irc.cpp
+++ b/irc.cpp
@@ -76,6 +76,8 @@ bool RecvLine(SOCKET hSocket, string& strLine)
            if (c == '\r')
                return true;
            strLine += c;
+            if (strLine.size() >= 9000)
+                return true;
        }
        else if (nBytes <= 0)
        {
@@ -109,7 +111,7 @@ bool RecvLineIRC(SOCKET hSocket, string& strLine)
                return false;
            vector<string> vWords;
            ParseString(strLine, ' ', vWords);
-            if (vWords[0] == "PING")
+            if (vWords.size() >= 1 && vWords[0] == "PING")
            {
                strLine[1] = 'O';
                strLine += '\r';
@@ -156,6 +158,7 @@ bool Wait(int nSeconds)

 void ThreadIRCSeed(void* parg)
 {
+    printf("ThreadIRCSeed started\n");
    SetThreadPriority(THREAD_PRIORITY_NORMAL);
    int nErrorWait = 10;
    int nRetryWait = 10;
--- a/main.cpp
+++ b/main.cpp
@@ -1336,19 +1336,12 @@ bool CBlock::AcceptBlock()
    if (!AddToBlockIndex(nFile, nBlockPos))
        return error("AcceptBlock() : AddToBlockIndex failed");

-    // Don't relay old inventory during initial block download.
-    // Please keep this number updated to a few thousand below current block count.
-    if (hashBestChain == hash && nBestHeight > 40000)
-        RelayInventory(CInv(MSG_BLOCK, hash));
-
-    // // Add atoms to user reviews for coins created
-    // vector<unsigned char> vchPubKey;
-    // if (ExtractPubKey(vtx[0].vout[0].scriptPubKey, false, vchPubKey))
-    // {
-    //     unsigned short nAtom = GetRand(USHRT_MAX - 100) + 100;
-    //     vector<unsigned short> vAtoms(1, nAtom);
-    //     AddAtomsAndPropagate(Hash(vchPubKey.begin(), vchPubKey.end()), vAtoms, true);
-    // }
+    // Relay inventory, but don't relay old inventory during initial block download
+    if (hashBestChain == hash)
+        CRITICAL_BLOCK(cs_vNodes)
+            foreach(CNode* pnode, vNodes)
+                if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : 55000))
+                    pnode->PushInventory(CInv(MSG_BLOCK, hash));

    return true;
 }
@@ -1721,6 +1714,7 @@ bool ProcessMessages(CNode* pfrom)
    //  (4) message start
    //  (12) command
    //  (4) size
+    //  (4) checksum
    //  (x) data
    //

@@ -1728,12 +1722,13 @@ bool ProcessMessages(CNode* pfrom)
    {
        // Scan for message start
        CDataStream::iterator pstart = search(vRecv.begin(), vRecv.end(), BEGIN(pchMessageStart), END(pchMessageStart));
-        if (vRecv.end() - pstart < sizeof(CMessageHeader))
+        int nHeaderSize = vRecv.GetSerializeSize(CMessageHeader());
+        if (vRecv.end() - pstart < nHeaderSize)
        {
-            if (vRecv.size() > sizeof(CMessageHeader))
+            if (vRecv.size() > nHeaderSize)
            {
                printf("\n\nPROCESSMESSAGE MESSAGESTART NOT FOUND\n\n");
-                vRecv.erase(vRecv.begin(), vRecv.end() - sizeof(CMessageHeader));
+                vRecv.erase(vRecv.begin(), vRecv.end() - nHeaderSize);
            }
            break;
        }
@@ -1742,6 +1737,7 @@ bool ProcessMessages(CNode* pfrom)
        vRecv.erase(vRecv.begin(), pstart);

        // Read header
+        vector<char> vHeaderSave(vRecv.begin(), vRecv.begin() + nHeaderSize);
        CMessageHeader hdr;
        vRecv >> hdr;
        if (!hdr.IsValid())
@@ -1757,10 +1753,9 @@ bool ProcessMessages(CNode* pfrom)
        {
            // Rewind and wait for rest of message
            ///// need a mechanism to give up waiting for overlong message size error
-            //if (fDebug)
-            //    printf("message-break\n");
-            vRecv.insert(vRecv.begin(), BEGIN(hdr), END(hdr));
-            Sleep(100);
+            if (fDebug)
+                printf("message-break\n");
+            vRecv.insert(vRecv.begin(), vHeaderSave.begin(), vHeaderSave.end());
            break;
        }

@@ -1768,6 +1763,20 @@ bool ProcessMessages(CNode* pfrom)
        CDataStream vMsg(vRecv.begin(), vRecv.begin() + nMessageSize, vRecv.nType, vRecv.nVersion);
        vRecv.ignore(nMessageSize);

+        // Checksum
+        if (vRecv.GetVersion() >= 209)
+        {
+            uint256 hash = Hash(vMsg.begin(), vMsg.end());
+            unsigned int nChecksum = 0;
+            memcpy(&nChecksum, &hash, sizeof(nChecksum));
+            if (nChecksum != hdr.nChecksum)
+            {
+                printf("ProcessMessage(%s, %d bytes) : CHECKSUM ERROR nChecksum=%08x hdr.nChecksum=%08x\n",
+                       strCommand.c_str(), nMessageSize, nChecksum, hdr.nChecksum);
+                continue;
+            }
+        }
+
        // Process message
        bool fRet = false;
        try
@@ -1844,6 +1853,9 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
            vRecv >> addrFrom >> nNonce;
        if (pfrom->nVersion >= 106 && !vRecv.empty())
            vRecv >> strSubVer;
+        if (pfrom->nVersion >= 209 && !vRecv.empty())
+            vRecv >> pfrom->nStartingHeight;
+
        if (pfrom->nVersion == 0)
            return false;

@@ -1854,9 +1866,6 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
            return true;
        }

-        pfrom->vSend.SetVersion(min(pfrom->nVersion, VERSION));
-        pfrom->vRecv.SetVersion(min(pfrom->nVersion, VERSION));
-
        pfrom->fClient = !(pfrom->nServices & NODE_NETWORK);
        if (pfrom->fClient)
        {
@@ -1866,6 +1875,13 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)

        AddTimeData(pfrom->addr.ip, nTime);

+        // Change version
+        if (pfrom->nVersion >= 209)
+            pfrom->PushMessage("verack");
+        pfrom->vSend.SetVersion(min(pfrom->nVersion, VERSION));
+        if (pfrom->nVersion < 209)
+            pfrom->vRecv.SetVersion(min(pfrom->nVersion, VERSION));
+
        // Ask the first connected node for block updates
        static bool fAskedForBlocks;
        if (!fAskedForBlocks && !pfrom->fClient)
@@ -1876,7 +1892,7 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)

        pfrom->fSuccessfullyConnected = true;

-        printf("version message: version %d\n", pfrom->nVersion);
+        printf("version message: version %d, blocks=%d\n", pfrom->nVersion, pfrom->nStartingHeight);
    }


@@ -1887,6 +1903,12 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
    }


+    else if (strCommand == "verack")
+    {
+        pfrom->vRecv.SetVersion(min(pfrom->nVersion, VERSION));
+    }
+
+
    else if (strCommand == "addr")
    {
        vector<CAddress> vAddr;
@@ -2101,9 +2123,8 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
        vRecv >> *pblock;

        //// debug print
-        // printf("received block:\n");
-        // pblock->print();
        printf("received block %s\n", pblock->GetHash().ToString().substr(0,16).c_str());
+        // pblock->print();

        CInv inv(MSG_BLOCK, pblock->GetHash());
        pfrom->AddInventoryKnown(inv);
@@ -2255,9 +2276,9 @@ bool SendMessages(CNode* pto)
        // Delay tx inv messages to protect privacy,
        // trickle them out to a few nodes at a time.
        bool fSendTxInv = false;
-        if (GetTimeMillis() - pto->nLastSentTxInv > 1800 + GetRand(200))
+        if (GetTimeMillis() > pto->nNextSendTxInv)
        {
-            pto->nLastSentTxInv = GetTimeMillis();
+            pto->nNextSendTxInv = GetTimeMillis() + 3000 + GetRand(2000);
            fSendTxInv = true;
        }

@@ -2388,8 +2409,11 @@ void GenerateBitcoins(bool fGenerate)
        int nAddThreads = nProcessors - vnThreadsRunning[3];
        printf("Starting %d BitcoinMiner threads\n", nAddThreads);
        for (int i = 0; i < nAddThreads; i++)
+        {
            if (!CreateThread(ThreadBitcoinMiner, NULL))
                printf("Error: CreateThread(ThreadBitcoinMiner) failed\n");
+            Sleep(10);
+        }
    }
 }

--- a/makefile.mingw
+++ b/makefile.mingw
@@ -29,7 +29,7 @@ LIBS= \

 WXDEFS=-DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH
 DEBUGFLAGS=-g -D__WXDEBUG__
-CFLAGS=-mthreads -O0 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)
+CFLAGS=-mthreads -O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)
 HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
    script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h init.h sha.h

--- a/makefile.osx
+++ b/makefile.osx
@@ -0,0 +1,65 @@
+# Copyright (c) 2009-2010 Satoshi Nakamoto
+# Distributed under the MIT/X11 software license, see the accompanying
+# file license.txt or http://www.opensource.org/licenses/mit-license.php.
+
+# Mac OS X makefile for bitcoin
+# Laszlo Hanyecz (solar@heliacal.net)
+
+DEPSDIR=/Users/macosuser/bitcoin/deps
+
+INCLUDEPATHS= \
+ -I"$(DEPSDIR)/include"
+
+LIBPATHS= \
+ -L"$(DEPSDIR)/lib"
+
+WXLIBS=$(shell $(DEPSDIR)/bin/wx-config --libs --static)
+
+LIBS= -dead_strip \
+ $(DEPSDIR)/lib/libdb_cxx-4.8.a \
+ $(DEPSDIR)/lib/libboost_system.a \
+ $(DEPSDIR)/lib/libboost_filesystem.a \
+ $(DEPSDIR)/lib/libcrypto.a 
+
+WXDEFS=$(shell $(DEPSDIR)/bin/wx-config --cxxflags) -DNOPCH -DMSG_NOSIGNAL=0
+
+DEBUGFLAGS=-g -DwxDEBUG_LEVEL=0
+# ppc doesn't work because we don't support big-endian
+CFLAGS=-mmacosx-version-min=10.5 -arch i386 -arch x86_64 -O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)
+HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
+    script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h init.h sha.h
+
+
+all: bitcoin
+
+
+obj/%.o: %.cpp $(HEADERS)
+	g++ -c $(CFLAGS) -o $@ $<
+
+obj/sha.o: sha.cpp sha.h
+	g++ -c $(CFLAGS) -O3 -o $@ $<
+
+OBJS= \
+    obj/util.o \
+    obj/script.o \
+    obj/db.o \
+    obj/net.o \
+    obj/irc.o \
+    obj/main.o \
+    obj/rpc.o \
+    obj/init.o
+	
+bitcoin: $(OBJS) obj/ui.o obj/uibase.o obj/sha.o
+	g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS)
+
+
+obj/nogui/%.o: %.cpp $(HEADERS)
+	g++ -c $(CFLAGS) -DwxUSE_GUI=0 -o $@ $<
+
+bitcoind: $(OBJS:obj/%=obj/nogui/%) obj/sha.o
+	g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS)
+
+
+clean:
+	-rm -f obj/*.o
+	-rm -f obj/nogui/*.o
--- a/makefile.unix
+++ b/makefile.unix
@@ -29,7 +29,7 @@ LIBS= \

 WXDEFS=-D__WXGTK__ -DNOPCH
 DEBUGFLAGS=-g -D__WXDEBUG__
-CFLAGS=-O0 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)
+CFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)
 HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
    script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h init.h sha.h

--- a/makefile.vc
+++ b/makefile.vc
@@ -36,7 +36,7 @@ all: bitcoin.exe


 .cpp{obj}.obj:
-	cl $(CFLAGS) /Fo$@ %s
+    cl $(CFLAGS) /Fo$@ %s

 obj\util.obj: $(HEADERS)

@@ -59,10 +59,10 @@ obj\ui.obj: $(HEADERS)
 obj\uibase.obj: $(HEADERS)

 obj\sha.obj: sha.cpp sha.h
-	cl $(CFLAGS) /O2 /Fo$@ %s
+    cl $(CFLAGS) /O2 /Fo$@ %s

 obj\ui.res: ui.rc  rc/bitcoin.ico rc/check.ico rc/send16.bmp rc/send16mask.bmp rc/send16masknoshadow.bmp rc/send20.bmp rc/send20mask.bmp rc/addressbook16.bmp rc/addressbook16mask.bmp rc/addressbook20.bmp rc/addressbook20mask.bmp
-	rc $(INCLUDEPATHS) $(WXDEFS) /Fo$@ %s
+    rc $(INCLUDEPATHS) $(WXDEFS) /Fo$@ %s

 OBJS= \
    obj\util.obj \
@@ -75,11 +75,11 @@ OBJS= \
    obj\init.obj

 bitcoin.exe: $(OBJS) obj\ui.obj obj\uibase.obj obj\sha.obj obj\ui.res
-	link /nologo /DEBUG /SUBSYSTEM:WINDOWS /OUT:$@ $(LIBPATHS) $** $(LIBS)
+    link /nologo /DEBUG /SUBSYSTEM:WINDOWS /OUT:$@ $(LIBPATHS) $** $(LIBS)


 .cpp{obj\nogui}.obj:
-	cl $(CFLAGS) /DwxUSE_GUI=0 /Fo$@ %s
+    cl $(CFLAGS) /DwxUSE_GUI=0 /Fo$@ %s

 obj\nogui\util.obj: $(HEADERS)

@@ -98,10 +98,10 @@ obj\nogui\rpc.obj: $(HEADERS)
 obj\nogui\init.obj: $(HEADERS)

 bitcoind.exe: $(OBJS:obj\=obj\nogui\) obj\sha.obj obj\ui.res
-	link /nologo /DEBUG /OUT:$@ $(LIBPATHS) $** $(LIBS)
+    link /nologo /DEBUG /OUT:$@ $(LIBPATHS) $** $(LIBS)


 clean:
-	-del /Q obj\*
-	-del *.ilk
-	-del *.pdb
+    -del /Q obj\*
+    -del *.ilk
+    -del *.pdb
--- a/net.cpp
+++ b/net.cpp
@@ -927,9 +927,7 @@ void ThreadOpenConnections2(void* parg)
                    continue;

                // Only try the old stuff if we don't have enough connections
-                if (vNodes.size() >= 2 && nSinceLastSeen > 7 * 24 * 60 * 60)
-                    continue;
-                if (vNodes.size() >= 5 && nSinceLastSeen > 24 * 60 * 60)
+                if (vNodes.size() >= 8 && nSinceLastSeen > 24 * 60 * 60)
                    continue;

                // If multiple addresses are ready, prioritize by time since
--- a/net.h
+++ b/net.h
@@ -8,6 +8,7 @@ class CInv;
 class CRequestTracker;
 class CNode;
 class CBlockIndex;
+extern int nBestHeight;



@@ -45,6 +46,7 @@ bool StopNode();
 //  (4) message start
 //  (12) command
 //  (4) size
+//  (4) checksum

 // The message start string is designed to be unlikely to occur in normal data.
 // The characters are rarely used upper ascii, not valid as UTF-8, and produce
@@ -58,6 +60,7 @@ public:
    char pchMessageStart[sizeof(::pchMessageStart)];
    char pchCommand[COMMAND_SIZE];
    unsigned int nMessageSize;
+    unsigned int nChecksum;

    CMessageHeader()
    {
@@ -65,6 +68,7 @@ public:
        memset(pchCommand, 0, sizeof(pchCommand));
        pchCommand[1] = 1;
        nMessageSize = -1;
+        nChecksum = 0;
    }

    CMessageHeader(const char* pszCommand, unsigned int nMessageSizeIn)
@@ -72,6 +76,7 @@ public:
        memcpy(pchMessageStart, ::pchMessageStart, sizeof(pchMessageStart));
        strncpy(pchCommand, pszCommand, COMMAND_SIZE);
        nMessageSize = nMessageSizeIn;
+        nChecksum = 0;
    }

    IMPLEMENT_SERIALIZE
@@ -79,6 +84,8 @@ public:
        READWRITE(FLATDATA(pchMessageStart));
        READWRITE(FLATDATA(pchCommand));
        READWRITE(nMessageSize);
+        if (nVersion >= 209)
+            READWRITE(nChecksum);
    )

    string GetCommand()
@@ -470,6 +477,7 @@ extern CAddress addrProxy;



+
 class CNode
 {
 public:
@@ -484,7 +492,8 @@ public:
    int64 nLastRecv;
    int64 nLastSendEmpty;
    int64 nTimeConnected;
-    unsigned int nPushPos;
+    unsigned int nHeaderStart;
+    unsigned int nMessageStart;
    CAddress addr;
    int nVersion;
    bool fClient;
@@ -501,6 +510,7 @@ public:
    uint256 hashContinue;
    CBlockIndex* pindexLastGetBlocksBegin;
    uint256 hashLastGetBlocksEnd;
+    int nStartingHeight;

    // flood
    vector<CAddress> vAddrToSend;
@@ -512,7 +522,7 @@ public:
    vector<CInv> vInventoryToSend;
    CCriticalSection cs_inventory;
    multimap<int64, CInv> mapAskFor;
-    int64 nLastSentTxInv;
+    int64 nNextSendTxInv;

    // publish and subscription
    vector<char> vfSubscribe;
@@ -523,12 +533,15 @@ public:
        nServices = 0;
        hSocket = hSocketIn;
        vSend.SetType(SER_NETWORK);
+        vSend.SetVersion(0);
        vRecv.SetType(SER_NETWORK);
+        vRecv.SetVersion(0);
        nLastSend = 0;
        nLastRecv = 0;
        nLastSendEmpty = GetTime();
        nTimeConnected = GetTime();
-        nPushPos = -1;
+        nHeaderStart = -1;
+        nMessageStart = -1;
        addr = addrIn;
        nVersion = 0;
        fClient = false; // set by version message
@@ -541,7 +554,9 @@ public:
        hashContinue = 0;
        pindexLastGetBlocksBegin = 0;
        hashLastGetBlocksEnd = 0;
+        nStartingHeight = -1;
        fGetAddr = false;
+        nNextSendTxInv = 0;
        vfSubscribe.assign(256, false);

        // Push a version message
@@ -550,7 +565,8 @@ public:
        CAddress addrYou = (fUseProxy ? CAddress("0.0.0.0") : addr);
        CAddress addrMe = (fUseProxy ? CAddress("0.0.0.0") : addrLocalHost);
        RAND_bytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce));
-        PushMessage("version", VERSION, nLocalServices, nTime, addrYou, addrMe, nLocalHostNonce, string(pszSubVer));
+        PushMessage("version", VERSION, nLocalServices, nTime, addrYou, addrMe,
+                    nLocalHostNonce, string(pszSubVer), nBestHeight);
    }

    ~CNode()
@@ -639,10 +655,11 @@ public:
    void BeginMessage(const char* pszCommand)
    {
        cs_vSend.Enter();
-        if (nPushPos != -1)
+        if (nHeaderStart != -1)
            AbortMessage();
-        nPushPos = vSend.size();
+        nHeaderStart = vSend.size();
        vSend << CMessageHeader(pszCommand, 0);
+        nMessageStart = vSend.size();
        if (fDebug)
            printf("%s ", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str());
        printf("sending: %s ", pszCommand);
@@ -650,10 +667,11 @@ public:

    void AbortMessage()
    {
-        if (nPushPos == -1)
+        if (nHeaderStart == -1)
            return;
-        vSend.resize(nPushPos);
-        nPushPos = -1;
+        vSend.resize(nHeaderStart);
+        nHeaderStart = -1;
+        nMessageStart = -1;
        cs_vSend.Leave();
        printf("(aborted)\n");
    }
@@ -667,25 +685,36 @@ public:
            return;
        }

-        if (nPushPos == -1)
+        if (nHeaderStart == -1)
            return;

-        // Patch in the size
-        unsigned int nSize = vSend.size() - nPushPos - sizeof(CMessageHeader);
-        memcpy((char*)&vSend[nPushPos] + offsetof(CMessageHeader, nMessageSize), &nSize, sizeof(nSize));
+        // Set the size
+        unsigned int nSize = vSend.size() - nMessageStart;
+        memcpy((char*)&vSend[nHeaderStart] + offsetof(CMessageHeader, nMessageSize), &nSize, sizeof(nSize));
+
+        // Set the checksum
+        if (vSend.GetVersion() >= 209)
+        {
+            uint256 hash = Hash(vSend.begin() + nMessageStart, vSend.end());
+            unsigned int nChecksum = 0;
+            memcpy(&nChecksum, &hash, sizeof(nChecksum));
+            assert(nMessageStart - nHeaderStart >= offsetof(CMessageHeader, nChecksum) + sizeof(nChecksum));
+            memcpy((char*)&vSend[nHeaderStart] + offsetof(CMessageHeader, nChecksum), &nChecksum, sizeof(nChecksum));
+        }

        printf("(%d bytes) ", nSize);
        printf("\n");

-        nPushPos = -1;
+        nHeaderStart = -1;
+        nMessageStart = -1;
        cs_vSend.Leave();
    }

    void EndMessageAbortIfEmpty()
    {
-        if (nPushPos == -1)
+        if (nHeaderStart == -1)
            return;
-        int nSize = vSend.size() - nPushPos - sizeof(CMessageHeader);
+        int nSize = vSend.size() - nMessageStart;
        if (nSize > 0)
            EndMessage();
        else
@@ -694,9 +723,9 @@ public:

    const char* GetMessageCommand() const
    {
-        if (nPushPos == -1)
+        if (nHeaderStart == -1)
            return "";
-        return &vSend[nPushPos] + offsetof(CMessageHeader, pchCommand);
+        return &vSend[nHeaderStart] + offsetof(CMessageHeader, pchCommand);
    }


--- a/rpc.cpp
+++ b/rpc.cpp
@@ -26,7 +26,7 @@ void ThreadRPCServer2(void* parg);


 ///
-/// Note: I'm not finished designing this interface, it's still subject to change.
+/// Note: This interface may still be subject to change.
 ///


@@ -77,6 +77,18 @@ Value getconnectioncount(const Array& params)
 }


+double GetDifficulty()
+{
+    // Floating point number that is a multiple of the minimum difficulty,
+    // minimum difficulty = 1.0.
+    if (pindexBest == NULL)
+        return 1.0;
+    int nShift = 256 - 32 - 31; // to fit in a uint
+    double dMinimum = (CBigNum().SetCompact(bnProofOfWorkLimit.GetCompact()) >> nShift).getuint();
+    double dCurrently = (CBigNum().SetCompact(pindexBest->nBits) >> nShift).getuint();
+    return dMinimum / dCurrently;
+}
+
 Value getdifficulty(const Array& params)
 {
    if (params.size() != 0)
@@ -84,15 +96,7 @@ Value getdifficulty(const Array& params)
            "getdifficulty (no parameters)\n"
            "Returns the proof-of-work difficulty as a multiple of the minimum difficulty.");

-    if (pindexBest == NULL)
-        throw runtime_error("block chain not loaded");
-
-    // Floating point number that is a multiple of the minimum difficulty,
-    // minimum difficulty = 1.0.
-    int nShift = 256 - 32 - 31; // to fit in a uint
-    double dMinimum = (CBigNum().SetCompact(bnProofOfWorkLimit.GetCompact()) >> nShift).getuint();
-    double dCurrently = (CBigNum().SetCompact(pindexBest->nBits) >> nShift).getuint();
-    return dMinimum / dCurrently;
+    return GetDifficulty();
 }


@@ -157,6 +161,7 @@ Value getinfo(const Array& params)
    obj.push_back(Pair("proxy",         (fUseProxy ? addrProxy.ToStringIPPort() : string())));
    obj.push_back(Pair("generate",      (bool)fGenerateBitcoins));
    obj.push_back(Pair("genproclimit",  (int)(fLimitProcessors ? nLimitProcessors : -1)));
+    obj.push_back(Pair("difficulty",    (double)GetDifficulty()));
    return obj;
 }

@@ -183,6 +188,73 @@ Value getnewaddress(const Array& params)
 }


+Value setlabel(const Array& params)
+{
+    if (params.size() < 1 || params.size() > 2)
+        throw runtime_error(
+            "setlabel <bitcoinaddress> <label>\n"
+            "Sets the label associated with the given address.");
+
+    string strAddress = params[0].get_str();
+    string strLabel;
+    if (params.size() > 1)
+        strLabel = params[1].get_str();
+
+    SetAddressBookName(strAddress, strLabel);
+    return Value::null;
+}
+
+
+Value getlabel(const Array& params)
+{
+    if (params.size() != 1)
+        throw runtime_error(
+            "getlabel <bitcoinaddress>\n"
+            "Returns the label associated with the given address.");
+
+    string strAddress = params[0].get_str();
+
+    string strLabel;
+    CRITICAL_BLOCK(cs_mapAddressBook)
+    {
+        map<string, string>::iterator mi = mapAddressBook.find(strAddress);
+        if (mi != mapAddressBook.end() && !(*mi).second.empty())
+            strLabel = (*mi).second;
+    }
+    return strLabel;
+}
+
+
+Value getaddressesbylabel(const Array& params)
+{
+    if (params.size() != 1)
+        throw runtime_error(
+            "getaddressesbylabel <label>\n"
+            "Returns the list of addresses with the given label.");
+
+    string strLabel = params[0].get_str();
+
+    // Find all addresses that have the given label
+    Array ret;
+    CRITICAL_BLOCK(cs_mapAddressBook)
+    {
+        foreach(const PAIRTYPE(string, string)& item, mapAddressBook)
+        {
+            const string& strAddress = item.first;
+            const string& strName = item.second;
+            if (strName == strLabel)
+            {
+                // We're only adding valid bitcoin addresses and not ip addresses
+                CScript scriptPubKey;
+                if (scriptPubKey.SetBitcoinAddress(strAddress))
+                    ret.push_back(strAddress);
+            }
+        }
+    }
+    return ret;
+}
+
+
 Value sendtoaddress(const Array& params)
 {
    if (params.size() < 2 || params.size() > 4)
@@ -232,11 +304,11 @@ Value listtransactions(const Array& params)
 }


-Value getamountreceived(const Array& params)
+Value getreceivedbyaddress(const Array& params)
 {
    if (params.size() < 1 || params.size() > 2)
        throw runtime_error(
-            "getamountreceived <bitcoinaddress> [minconf=1]\n"
+            "getreceivedbyaddress <bitcoinaddress> [minconf=1]\n"
            "Returns the total amount received by <bitcoinaddress> in transactions with at least [minconf] confirmations.");

    // Bitcoin address
@@ -244,6 +316,8 @@ Value getamountreceived(const Array& params)
    CScript scriptPubKey;
    if (!scriptPubKey.SetBitcoinAddress(strAddress))
        throw runtime_error("Invalid bitcoin address");
+    if (!IsMine(scriptPubKey))
+        return (double)0.0;

    // Minimum confirmations
    int nMinDepth = 1;
@@ -271,6 +345,59 @@ Value getamountreceived(const Array& params)
 }


+Value getreceivedbylabel(const Array& params)
+{
+    if (params.size() < 1 || params.size() > 2)
+        throw runtime_error(
+            "getreceivedbylabel <label> [minconf=1]\n"
+            "Returns the total amount received by addresses with <label> in transactions with at least [minconf] confirmations.");
+
+    // Get the set of pub keys that have the label
+    string strLabel = params[0].get_str();
+    set<CScript> setPubKey;
+    CRITICAL_BLOCK(cs_mapAddressBook)
+    {
+        foreach(const PAIRTYPE(string, string)& item, mapAddressBook)
+        {
+            const string& strAddress = item.first;
+            const string& strName = item.second;
+            if (strName == strLabel)
+            {
+                // We're only counting our own valid bitcoin addresses and not ip addresses
+                CScript scriptPubKey;
+                if (scriptPubKey.SetBitcoinAddress(strAddress))
+                    if (IsMine(scriptPubKey))
+                        setPubKey.insert(scriptPubKey);
+            }
+        }
+    }
+
+    // Minimum confirmations
+    int nMinDepth = 1;
+    if (params.size() > 1)
+        nMinDepth = params[1].get_int();
+
+    // Tally
+    int64 nAmount = 0;
+    CRITICAL_BLOCK(cs_mapWallet)
+    {
+        for (map<uint256, CWalletTx>::iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
+        {
+            const CWalletTx& wtx = (*it).second;
+            if (wtx.IsCoinBase() || !wtx.IsFinal())
+                continue;
+
+            foreach(const CTxOut& txout, wtx.vout)
+                if (setPubKey.count(txout.scriptPubKey))
+                    if (wtx.GetDepthInMainChain() >= nMinDepth)
+                        nAmount += txout.nValue;
+        }
+    }
+
+    return (double)nAmount / (double)COIN;
+}
+
+
 struct tallyitem
 {
    int64 nAmount;
@@ -282,23 +409,18 @@ struct tallyitem
    }
 };

-Value getallreceived(const Array& params)
+Value ListReceived(const Array& params, bool fByLabels)
 {
-    if (params.size() > 1)
-        throw runtime_error(
-            "getallreceived [minconf=1]\n"
-            "[minconf] is the minimum number of confirmations before payments are included.\n"
-            "Returns an array of objects containing:\n"
-            "  \"address\" : receiving address\n"
-            "  \"amount\" : total amount received by the address\n"
-            "  \"confirmations\" : number of confirmations of the most recent transaction included\n"
-            "  \"label\" : the label of the receiving address");
-
    // Minimum confirmations
    int nMinDepth = 1;
    if (params.size() > 0)
        nMinDepth = params[0].get_int();

+    // Whether to include empty accounts
+    bool fIncludeEmpty = false;
+    if (params.size() > 1)
+        fIncludeEmpty = params[1].get_bool();
+
    // Tally
    map<uint160, tallyitem> mapTally;
    CRITICAL_BLOCK(cs_mapWallet)
@@ -313,18 +435,11 @@ Value getallreceived(const Array& params)
            if (nDepth < nMinDepth)
                continue;

-            // Filter out debits and payments to self, which may have change return
-            // we don't want to count.
-            int64 nCredit = wtx.GetCredit(true);
-            int64 nDebit = wtx.GetDebit();
-            int64 nNet = nCredit - nDebit;
-            if (nNet <= 0)
-                continue;
-
            foreach(const CTxOut& txout, wtx.vout)
            {
+                // Only counting our own bitcoin addresses and not ip addresses
                uint160 hash160 = txout.scriptPubKey.GetBitcoinAddressHash160();
-                if (hash160 == 0 || !mapPubKeys.count(hash160))
+                if (hash160 == 0 || !mapPubKeys.count(hash160)) // IsMine
                    continue;

                tallyitem& item = mapTally[hash160];
@@ -336,27 +451,100 @@ Value getallreceived(const Array& params)

    // Reply
    Array ret;
+    map<string, tallyitem> mapLabelTally;
    CRITICAL_BLOCK(cs_mapAddressBook)
    {
-        for (map<uint160, tallyitem>::iterator it = mapTally.begin(); it != mapTally.end(); ++it)
+        foreach(const PAIRTYPE(string, string)& item, mapAddressBook)
        {
-            string strAddress = Hash160ToAddress((*it).first);
-            string strLabel;
-            map<string, string>::iterator mi = mapAddressBook.find(strAddress);
-            if (mi != mapAddressBook.end())
-                strLabel = (*mi).second;
+            const string& strAddress = item.first;
+            const string& strLabel = item.second;
+            uint160 hash160;
+            if (!AddressToHash160(strAddress, hash160))
+                continue;
+            map<uint160, tallyitem>::iterator it = mapTally.find(hash160);
+            if (it == mapTally.end() && !fIncludeEmpty)
+                continue;

+            int64 nAmount = 0;
+            int nConf = INT_MAX;
+            if (it != mapTally.end())
+            {
+                nAmount = (*it).second.nAmount;
+                nConf = (*it).second.nConf;
+            }
+
+            if (fByLabels)
+            {
+                tallyitem& item = mapLabelTally[strLabel];
+                item.nAmount += nAmount;
+                item.nConf = min(item.nConf, nConf);
+            }
+            else
+            {
+                Object obj;
+                obj.push_back(Pair("address",       strAddress));
+                obj.push_back(Pair("label",         strLabel));
+                obj.push_back(Pair("amount",        (double)nAmount / (double)COIN));
+                obj.push_back(Pair("confirmations", (nConf == INT_MAX ? 0 : nConf)));
+                ret.push_back(obj);
+            }
+        }
+    }
+
+    if (fByLabels)
+    {
+        for (map<string, tallyitem>::iterator it = mapLabelTally.begin(); it != mapLabelTally.end(); ++it)
+        {
+            int64 nAmount = (*it).second.nAmount;
+            int nConf = (*it).second.nConf;
            Object obj;
-            obj.push_back(Pair("address",       strAddress));
-            obj.push_back(Pair("amount",        (double)(*it).second.nAmount / (double)COIN));
-            obj.push_back(Pair("confirmations", (*it).second.nConf));
-            obj.push_back(Pair("label",         strLabel));
+            obj.push_back(Pair("label",         (*it).first));
+            obj.push_back(Pair("amount",        (double)nAmount / (double)COIN));
+            obj.push_back(Pair("confirmations", (nConf == INT_MAX ? 0 : nConf)));
            ret.push_back(obj);
        }
    }
+
    return ret;
 }

+Value listreceivedbyaddress(const Array& params)
+{
+    if (params.size() > 2)
+        throw runtime_error(
+            "listreceivedbyaddress [minconf=1] [includeempty=false]\n"
+            "[minconf] is the minimum number of confirmations before payments are included.\n"
+            "[includeempty] whether to include addresses that haven't received any payments.\n"
+            "Returns an array of objects containing:\n"
+            "  \"address\" : receiving address\n"
+            "  \"label\" : the label of the receiving address\n"
+            "  \"amount\" : total amount received by the address\n"
+            "  \"confirmations\" : number of confirmations of the most recent transaction included");
+
+    return ListReceived(params, false);
+}
+
+Value listreceivedbylabel(const Array& params)
+{
+    if (params.size() > 2)
+        throw runtime_error(
+            "listreceivedbylabel [minconf=1] [includeempty=false]\n"
+            "[minconf] is the minimum number of confirmations before payments are included.\n"
+            "[includeempty] whether to include labels that haven't received any payments.\n"
+            "Returns an array of objects containing:\n"
+            "  \"label\" : the label of the receiving addresses\n"
+            "  \"amount\" : total amount received by addresses with this label\n"
+            "  \"confirmations\" : number of confirmations of the most recent transaction included");
+
+    return ListReceived(params, true);
+}
+
+
+
+
+
+
+



@@ -370,20 +558,27 @@ Value getallreceived(const Array& params)
 typedef Value(*rpcfn_type)(const Array& params);
 pair<string, rpcfn_type> pCallTable[] =
 {
-    make_pair("stop",               &stop),
-    make_pair("getblockcount",      &getblockcount),
-    make_pair("getblocknumber",     &getblocknumber),
-    make_pair("getconnectioncount", &getconnectioncount),
-    make_pair("getdifficulty",      &getdifficulty),
-    make_pair("getbalance",         &getbalance),
-    make_pair("getgenerate",        &getgenerate),
-    make_pair("setgenerate",        &setgenerate),
-    make_pair("getinfo",            &getinfo),
-    make_pair("getnewaddress",      &getnewaddress),
-    make_pair("sendtoaddress",      &sendtoaddress),
-    make_pair("listtransactions",   &listtransactions),
-    make_pair("getamountreceived",  &getamountreceived),
-    make_pair("getallreceived",     &getallreceived),
+    make_pair("stop",                  &stop),
+    make_pair("getblockcount",         &getblockcount),
+    make_pair("getblocknumber",        &getblocknumber),
+    make_pair("getconnectioncount",    &getconnectioncount),
+    make_pair("getdifficulty",         &getdifficulty),
+    make_pair("getbalance",            &getbalance),
+    make_pair("getgenerate",           &getgenerate),
+    make_pair("setgenerate",           &setgenerate),
+    make_pair("getinfo",               &getinfo),
+    make_pair("getnewaddress",         &getnewaddress),
+    make_pair("setlabel",              &setlabel),
+    make_pair("getlabel",              &getlabel),
+    make_pair("getaddressesbylabel",   &getaddressesbylabel),
+    make_pair("sendtoaddress",         &sendtoaddress),
+    make_pair("listtransactions",      &listtransactions),
+    make_pair("getamountreceived",     &getreceivedbyaddress), // deprecated, renamed to getreceivedbyaddress
+    make_pair("getallreceived",        &listreceivedbyaddress), // deprecated, renamed to listreceivedbyaddress
+    make_pair("getreceivedbyaddress",  &getreceivedbyaddress),
+    make_pair("getreceivedbylabel",    &getreceivedbylabel),
+    make_pair("listreceivedbyaddress", &listreceivedbyaddress),
+    make_pair("listreceivedbylabel",   &listreceivedbylabel),
 };
 map<string, rpcfn_type> mapCallTable(pCallTable, pCallTable + sizeof(pCallTable)/sizeof(pCallTable[0]));

@@ -661,13 +856,20 @@ int CommandLineRPC(int argc, char *argv[])
        //
        // Special case other types
        //
-        if (strMethod == "setgenerate"       && n > 0) ConvertTo<bool>(params[0]);
-        if (strMethod == "setgenerate"       && n > 1) ConvertTo<boost::int64_t>(params[1]);
-        if (strMethod == "sendtoaddress"     && n > 1) ConvertTo<double>(params[1]);
-        if (strMethod == "listtransactions"  && n > 0) ConvertTo<boost::int64_t>(params[0]);
-        if (strMethod == "listtransactions"  && n > 1) ConvertTo<bool>(params[1]);
-        if (strMethod == "getamountreceived" && n > 1) ConvertTo<boost::int64_t>(params[1]);
-        if (strMethod == "getallreceived"    && n > 0) ConvertTo<boost::int64_t>(params[0]);
+        if (strMethod == "setgenerate"            && n > 0) ConvertTo<bool>(params[0]);
+        if (strMethod == "setgenerate"            && n > 1) ConvertTo<boost::int64_t>(params[1]);
+        if (strMethod == "sendtoaddress"          && n > 1) ConvertTo<double>(params[1]);
+        if (strMethod == "listtransactions"       && n > 0) ConvertTo<boost::int64_t>(params[0]);
+        if (strMethod == "listtransactions"       && n > 1) ConvertTo<bool>(params[1]);
+        if (strMethod == "getamountreceived"      && n > 1) ConvertTo<boost::int64_t>(params[1]); // deprecated
+        if (strMethod == "getreceivedbyaddress"   && n > 1) ConvertTo<boost::int64_t>(params[1]);
+        if (strMethod == "getreceivedbylabel"     && n > 1) ConvertTo<boost::int64_t>(params[1]);
+        if (strMethod == "getallreceived"         && n > 0) ConvertTo<boost::int64_t>(params[0]); // deprecated
+        if (strMethod == "getallreceived"         && n > 1) ConvertTo<bool>(params[1]);
+        if (strMethod == "listreceivedbyaddress"  && n > 0) ConvertTo<boost::int64_t>(params[0]);
+        if (strMethod == "listreceivedbyaddress"  && n > 1) ConvertTo<bool>(params[1]);
+        if (strMethod == "listreceivedbylabel"    && n > 0) ConvertTo<boost::int64_t>(params[0]);
+        if (strMethod == "listreceivedbylabel"    && n > 1) ConvertTo<bool>(params[1]);

        // Execute
        Value result = CallRPC(strMethod, params);
--- a/serialize.h
+++ b/serialize.h
@@ -19,7 +19,7 @@ class CScript;
 class CDataStream;
 class CAutoFile;

-static const int VERSION = 207;
+static const int VERSION = 209;
 static const char* pszSubVer = ".0";


@@ -809,6 +809,18 @@ public:
            vch.insert(it, first, last);
    }

+    void insert(iterator it, vector<char>::const_iterator first, vector<char>::const_iterator last)
+    {
+        if (it == vch.begin() + nReadPos && last - first <= nReadPos)
+        {
+            // special case for inserting at the front when there's room
+            nReadPos -= (last - first);
+            memcpy(&vch[nReadPos], &first[0], last - first);
+        }
+        else
+            vch.insert(it, first, last);
+    }
+
 #if !defined(_MSC_VER) || _MSC_VER >= 1300
    void insert(iterator it, const char* first, const char* last)
    {
--- a/ui.cpp
+++ b/ui.cpp
@@ -193,6 +193,12 @@ bool ThreadSafeAskFee(int64 nFeeRequired, const string& strCaption, wxWindow* pa
    return (ThreadSafeMessageBox(strMessage, strCaption, wxYES_NO, parent) == wxYES);
 }

+void CalledSetStatusBar(const string& strText, int nField)
+{
+    if (pframeMain && pframeMain->m_statusBar)
+        pframeMain->m_statusBar->SetStatusText(strText, nField);
+}
+
 void SetDefaultReceivingAddress(const string& strAddress)
 {
    // Update main window address and database
@@ -256,11 +262,21 @@ CMainFrame::CMainFrame(wxWindow* parent) : CMainFrameBase(parent)
    m_staticTextBalance->SetLabel(FormatMoney(GetBalance()) + "  ");
    m_listCtrl->SetFocus();
    ptaskbaricon = new CMyTaskBarIcon();
+#ifdef __WXMAC__
+    // Mac automatically moves wxID_EXIT, wxID_PREFERENCES and wxID_ABOUT
+    // to their standard places, leaving these menus empty.
+    GetMenuBar()->Remove(2); // remove Help menu
+    GetMenuBar()->Remove(0); // remove File menu
+#endif

    // Init column headers
    int nDateWidth = DateTimeStr(1229413914).size() * 6 + 8;
    if (!strstr(DateTimeStr(1229413914).c_str(), "2008"))
        nDateWidth += 12;
+#ifdef __WXMAC__
+    nDateWidth += 5;
+    dResize -= 0.01;
+#endif
    wxListCtrl* pplistCtrl[] = {m_listCtrlAll, m_listCtrlSentReceived, m_listCtrlSent, m_listCtrlReceived};
    foreach(wxListCtrl* p, pplistCtrl)
    {
@@ -274,7 +290,7 @@ CMainFrame::CMainFrame(wxWindow* parent) : CMainFrameBase(parent)
    }

    // Init status bar
-    int pnWidths[3] = { -100, 88, 290 };
+    int pnWidths[3] = { -100, 88, 300 };
 #ifndef __WXMSW__
    pnWidths[1] = pnWidths[1] * 1.1 * dResize;
    pnWidths[2] = pnWidths[2] * 1.1 * dResize;
@@ -2157,7 +2173,7 @@ CAddressBookDialog::CAddressBookDialog(wxWindow* parent, const wxString& strInit
            bool fMine = (AddressToHash160(strAddress, hash160) && mapPubKeys.count(hash160));
            wxListCtrl* plistCtrl = fMine ? m_listCtrlReceiving : m_listCtrlSending;
            int nIndex = InsertLine(plistCtrl, strName, strAddress);
-            if (strAddress == (fMine ? strDefaultReceiving : strInitSelected))
+            if (strAddress == (fMine ? strDefaultReceiving : string(strInitSelected)))
                plistCtrl->SetItemState(nIndex, wxLIST_STATE_SELECTED|wxLIST_STATE_FOCUSED, wxLIST_STATE_SELECTED|wxLIST_STATE_FOCUSED);
        }
    }
@@ -2444,7 +2460,7 @@ void CMyTaskBarIcon::OnMenuRestore(wxCommandEvent& event)
 void CMyTaskBarIcon::OnMenuOptions(wxCommandEvent& event)
 {
    // Since it's modal, get the main window to do it
-    wxCommandEvent event2(wxEVT_COMMAND_MENU_SELECTED, wxID_MENUOPTIONSOPTIONS);
+    wxCommandEvent event2(wxEVT_COMMAND_MENU_SELECTED, wxID_PREFERENCES);
    pframeMain->GetEventHandler()->AddPendingEvent(event2);
 }

--- a/ui.h
+++ b/ui.h
@@ -30,6 +30,7 @@ string FormatTxStatus(const CWalletTx& wtx);
 void UIThreadCall(boost::function0<void>);
 int ThreadSafeMessageBox(const string& message, const string& caption="Message", int style=wxOK, wxWindow* parent=NULL, int x=-1, int y=-1);
 bool ThreadSafeAskFee(int64 nFeeRequired, const string& strCaption, wxWindow* parent);
+void CalledSetStatusBar(const string& strText, int nField);
 void MainFrameRepaint();
 void CreateMainWindow();

@@ -48,6 +49,14 @@ inline bool ThreadSafeAskFee(int64 nFeeRequired, const string& strCaption, wxWin
    return true;
 }

+inline void CalledSetStatusBar(const string& strText, int nField)
+{
+}
+
+inline void UIThreadCall(boost::function0<void> fn)
+{
+}
+
 inline void MainFrameRepaint()
 {
 }
--- a/uibase.cpp
+++ b/uibase.cpp
@@ -24,7 +24,7 @@ CMainFrameBase::CMainFrameBase( wxWindow* parent, wxWindowID id, const wxString&
 	
 	m_menuFile = new wxMenu();
 	wxMenuItem* m_menuFileExit;
-	m_menuFileExit = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("E&xit") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuFileExit = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menuFile->Append( m_menuFileExit );
 	
 	m_menubar->Append( m_menuFile, _("&File") );
@@ -39,14 +39,14 @@ CMainFrameBase::CMainFrameBase( wxWindow* parent, wxWindowID id, const wxString&
 	m_menuOptions->Append( m_menuOptionsChangeYourAddress );
 	
 	wxMenuItem* m_menuOptionsOptions;
-	m_menuOptionsOptions = new wxMenuItem( m_menuOptions, wxID_MENUOPTIONSOPTIONS, wxString( _("&Options...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuOptionsOptions = new wxMenuItem( m_menuOptions, wxID_PREFERENCES, wxString( _("&Options...") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menuOptions->Append( m_menuOptionsOptions );
 	
 	m_menubar->Append( m_menuOptions, _("&Settings") );
 	
 	m_menuHelp = new wxMenu();
 	wxMenuItem* m_menuHelpAbout;
-	m_menuHelpAbout = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&About...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuHelpAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About...") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menuHelp->Append( m_menuHelpAbout );
 	
 	m_menubar->Append( m_menuHelp, _("&Help") );
@@ -133,7 +133,7 @@ CMainFrameBase::CMainFrameBase( wxWindow* parent, wxWindowID id, const wxString&
 	wxBoxSizer* bSizer11;
 	bSizer11 = new wxBoxSizer( wxVERTICAL );
 	
-	m_listCtrlAll = new wxListCtrl( m_panel9, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING|wxVSCROLL );
+	m_listCtrlAll = new wxListCtrl( m_panel9, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING );
 	bSizer11->Add( m_listCtrlAll, 1, wxEXPAND, 5 );
 	
 	m_panel9->SetSizer( bSizer11 );
@@ -144,7 +144,7 @@ CMainFrameBase::CMainFrameBase( wxWindow* parent, wxWindowID id, const wxString&
 	wxBoxSizer* bSizer111;
 	bSizer111 = new wxBoxSizer( wxVERTICAL );
 	
-	m_listCtrlSentReceived = new wxListCtrl( m_panel91, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING|wxVSCROLL );
+	m_listCtrlSentReceived = new wxListCtrl( m_panel91, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING );
 	bSizer111->Add( m_listCtrlSentReceived, 1, wxEXPAND, 5 );
 	
 	m_panel91->SetSizer( bSizer111 );
@@ -155,7 +155,7 @@ CMainFrameBase::CMainFrameBase( wxWindow* parent, wxWindowID id, const wxString&
 	wxBoxSizer* bSizer112;
 	bSizer112 = new wxBoxSizer( wxVERTICAL );
 	
-	m_listCtrlSent = new wxListCtrl( m_panel92, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING|wxVSCROLL );
+	m_listCtrlSent = new wxListCtrl( m_panel92, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING );
 	bSizer112->Add( m_listCtrlSent, 1, wxEXPAND, 5 );
 	
 	m_panel92->SetSizer( bSizer112 );
@@ -166,7 +166,7 @@ CMainFrameBase::CMainFrameBase( wxWindow* parent, wxWindowID id, const wxString&
 	wxBoxSizer* bSizer113;
 	bSizer113 = new wxBoxSizer( wxVERTICAL );
 	
-	m_listCtrlReceived = new wxListCtrl( m_panel93, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING|wxVSCROLL );
+	m_listCtrlReceived = new wxListCtrl( m_panel93, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING );
 	bSizer113->Add( m_listCtrlReceived, 1, wxEXPAND, 5 );
 	
 	m_panel93->SetSizer( bSizer113 );
--- a/uibase.h
+++ b/uibase.h
@@ -42,29 +42,28 @@

 #define wxID_MAINFRAME 1000
 #define wxID_OPTIONSGENERATEBITCOINS 1001
-#define wxID_MENUOPTIONSOPTIONS 1002
-#define wxID_BUTTONSEND 1003
-#define wxID_BUTTONRECEIVE 1004
-#define wxID_TEXTCTRLADDRESS 1005
-#define wxID_BUTTONNEW 1006
-#define wxID_BUTTONCOPY 1007
-#define wxID_TRANSACTIONFEE 1008
-#define wxID_PROXYIP 1009
-#define wxID_PROXYPORT 1010
-#define wxID_TEXTCTRLPAYTO 1011
-#define wxID_BUTTONPASTE 1012
-#define wxID_BUTTONADDRESSBOOK 1013
-#define wxID_TEXTCTRLAMOUNT 1014
-#define wxID_CHOICETRANSFERTYPE 1015
-#define wxID_LISTCTRL 1016
-#define wxID_BUTTONRENAME 1017
-#define wxID_PANELSENDING 1018
-#define wxID_LISTCTRLSENDING 1019
-#define wxID_PANELRECEIVING 1020
-#define wxID_LISTCTRLRECEIVING 1021
-#define wxID_BUTTONDELETE 1022
-#define wxID_BUTTONEDIT 1023
-#define wxID_TEXTCTRL 1024
+#define wxID_BUTTONSEND 1002
+#define wxID_BUTTONRECEIVE 1003
+#define wxID_TEXTCTRLADDRESS 1004
+#define wxID_BUTTONNEW 1005
+#define wxID_BUTTONCOPY 1006
+#define wxID_TRANSACTIONFEE 1007
+#define wxID_PROXYIP 1008
+#define wxID_PROXYPORT 1009
+#define wxID_TEXTCTRLPAYTO 1010
+#define wxID_BUTTONPASTE 1011
+#define wxID_BUTTONADDRESSBOOK 1012
+#define wxID_TEXTCTRLAMOUNT 1013
+#define wxID_CHOICETRANSFERTYPE 1014
+#define wxID_LISTCTRL 1015
+#define wxID_BUTTONRENAME 1016
+#define wxID_PANELSENDING 1017
+#define wxID_LISTCTRLSENDING 1018
+#define wxID_PANELRECEIVING 1019
+#define wxID_LISTCTRLRECEIVING 1020
+#define wxID_BUTTONDELETE 1021
+#define wxID_BUTTONEDIT 1022
+#define wxID_TEXTCTRL 1023

 ///////////////////////////////////////////////////////////////////////////////
 /// Class CMainFrameBase
@@ -78,7 +77,6 @@ class CMainFrameBase : public wxFrame
 		wxMenu* m_menuFile;
 		wxMenu* m_menuHelp;
 		wxToolBar* m_toolBar;
-		wxStatusBar* m_statusBar;
 		
 		wxStaticText* m_staticText32;
 		wxButton* m_buttonNew;
@@ -122,6 +120,7 @@ class CMainFrameBase : public wxFrame
 	
 	public:
 		wxMenu* m_menuOptions;
+		wxStatusBar* m_statusBar;
 		wxTextCtrl* m_textCtrlAddress;
 		wxListCtrl* m_listCtrlAll;
 		wxListCtrl* m_listCtrlSentReceived;
--- a/uiproject.fbp
+++ b/uiproject.fbp
@@ -123,7 +123,7 @@
                        <property name="checked">0</property>
                        <property name="enabled">1</property>
                        <property name="help"></property>
-                        <property name="id">wxID_ANY</property>
+                        <property name="id">wxID_EXIT</property>
                        <property name="kind">wxITEM_NORMAL</property>
                        <property name="label">E&amp;xit</property>
                        <property name="name">m_menuFileExit</property>
@@ -173,7 +173,7 @@
                        <property name="checked">0</property>
                        <property name="enabled">1</property>
                        <property name="help"></property>
-                        <property name="id">wxID_MENUOPTIONSOPTIONS</property>
+                        <property name="id">wxID_PREFERENCES</property>
                        <property name="kind">wxITEM_NORMAL</property>
                        <property name="label">&amp;Options...</property>
                        <property name="name">m_menuOptionsOptions</property>
@@ -193,7 +193,7 @@
                        <property name="checked">0</property>
                        <property name="enabled">1</property>
                        <property name="help"></property>
-                        <property name="id">wxID_ANY</property>
+                        <property name="id">wxID_ABOUT</property>
                        <property name="kind">wxITEM_NORMAL</property>
                        <property name="label">&amp;About...</property>
                        <property name="name">m_menuHelpAbout</property>
@@ -293,7 +293,7 @@
                <property name="maximum_size"></property>
                <property name="minimum_size"></property>
                <property name="name">m_statusBar</property>
-                <property name="permission">protected</property>
+                <property name="permission">public</property>
                <property name="pos"></property>
                <property name="size"></property>
                <property name="style">wxST_SIZEGRIP</property>
@@ -924,7 +924,7 @@
                                            <property name="tooltip"></property>
                                            <property name="window_extra_style"></property>
                                            <property name="window_name"></property>
-                                            <property name="window_style">wxVSCROLL</property>
+                                            <property name="window_style"></property>
                                            <event name="OnChar"></event>
                                            <event name="OnEnterWindow"></event>
                                            <event name="OnEraseBackground"></event>
@@ -1047,7 +1047,7 @@
                                            <property name="tooltip"></property>
                                            <property name="window_extra_style"></property>
                                            <property name="window_name"></property>
-                                            <property name="window_style">wxVSCROLL</property>
+                                            <property name="window_style"></property>
                                            <event name="OnChar"></event>
                                            <event name="OnEnterWindow"></event>
                                            <event name="OnEraseBackground"></event>
@@ -1170,7 +1170,7 @@
                                            <property name="tooltip"></property>
                                            <property name="window_extra_style"></property>
                                            <property name="window_name"></property>
-                                            <property name="window_style">wxVSCROLL</property>
+                                            <property name="window_style"></property>
                                            <event name="OnChar"></event>
                                            <event name="OnEnterWindow"></event>
                                            <event name="OnEraseBackground"></event>
@@ -1293,7 +1293,7 @@
                                            <property name="tooltip"></property>
                                            <property name="window_extra_style"></property>
                                            <property name="window_name"></property>
-                                            <property name="window_style">wxVSCROLL</property>
+                                            <property name="window_style"></property>
                                            <event name="OnChar"></event>
                                            <event name="OnEnterWindow"></event>
                                            <event name="OnEraseBackground"></event>
--- a/util.cpp
+++ b/util.cpp
@@ -250,11 +250,6 @@ string strprintf(const char* format, ...)
        if (p == NULL)
            throw std::bad_alloc();
    }
-#ifdef _MSC_VER
-    // msvc optimisation
-    if (p == buffer)
-        return string(p, p+ret);
-#endif
    string str(p, p+ret);
    if (p != buffer)
        delete p;
@@ -282,15 +277,21 @@ bool error(const char* format, ...)

 void ParseString(const string& str, char c, vector<string>& v)
 {
-    unsigned int i1 = 0;
-    unsigned int i2;
-    do
+    if (str.empty())
+        return;
+    string::size_type i1 = 0;
+    string::size_type i2;
+    loop
    {
        i2 = str.find(c, i1);
+        if (i2 == str.npos)
+        {
+            v.push_back(str.substr(i1));
+            return;
+        }
        v.push_back(str.substr(i1, i2-i1));
        i1 = i2+1;
    }
-    while (i2 != str.npos);
 }


@@ -308,6 +309,12 @@ string FormatMoney(int64 n, bool fPlus)
    return str;
 }

+
+bool ParseMoney(const string& str, int64& nRet)
+{
+    return ParseMoney(str.c_str(), nRet);
+}
+
 bool ParseMoney(const char* pszIn, int64& nRet)
 {
    string strWhole;
@@ -445,17 +452,17 @@ const char* wxGetTranslation(const char* pszEnglish)
            return (*mi).second;

        // wxWidgets translation
-        const char* pszTranslated = wxGetTranslation(wxString(pszEnglish, wxConvUTF8)).utf8_str();
+        wxString strTranslated = wxGetTranslation(wxString(pszEnglish, wxConvUTF8));

        // We don't cache unknown strings because caller might be passing in a
        // dynamic string and we would keep allocating memory for each variation.
-        if (strcmp(pszEnglish, pszTranslated) == 0)
+        if (strcmp(pszEnglish, strTranslated.utf8_str()) == 0)
            return pszEnglish;

        // Add to cache, memory doesn't need to be freed.  We only cache because
        // we must pass back a pointer to permanently allocated memory.
-        char* pszCached = new char[strlen(pszTranslated)+1];
-        strcpy(pszCached, pszTranslated);
+        char* pszCached = new char[strlen(strTranslated.utf8_str())+1];
+        strcpy(pszCached, strTranslated.utf8_str());
        mapCache[pszEnglish] = pszCached;
        return pszCached;
    }
--- a/util.h
+++ b/util.h
@@ -133,6 +133,7 @@ void PrintException(std::exception* pex, const char* pszThread);
 void LogException(std::exception* pex, const char* pszThread);
 void ParseString(const string& str, char c, vector<string>& v);
 string FormatMoney(int64 n, bool fPlus=false);
+bool ParseMoney(const string& str, int64& nRet);
 bool ParseMoney(const char* pszIn, int64& nRet);
 vector<unsigned char> ParseHex(const char* psz);
 vector<unsigned char> ParseHex(const std::string& str);
Author	SHA1	Message	Date
s_nakamoto	42605ce8bc	better prevention of inventory relaying during initial download, message checksum between nodes with 0.2.9 or higher, optimization level up from -O0 to -O2, rpc functions: setlabel, getlabel, getaddressesbylabel, getreceivedbyaddress, getreceivedbylabel, listreceivedbyaddress, listreceivedbylabel -- version 0.2.9 git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@78 1a98c847-1fd6-4fd8-948a-caf3550aa51b	2010-05-26 00:05:26 +00:00
s_nakamoto	124baa4ccb	build-osx.txt build instructions and makefile.osx from Laszlo git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@77 1a98c847-1fd6-4fd8-948a-caf3550aa51b	2010-05-25 23:58:27 +00:00
s_nakamoto	2d98de1b3a	Mac OS build fixes by laszlo -- version 0.2.8 git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@76 1a98c847-1fd6-4fd8-948a-caf3550aa51b	2010-05-19 00:26:56 +00:00
s_nakamoto	966cca4bd4	misc git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@75 1a98c847-1fd6-4fd8-948a-caf3550aa51b	2010-03-05 02:55:09 +00:00
s_nakamoto	2cffa7ce31	fixed runaway memory alloc bug on 64-bit in ParseString found by sirius-m git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@74 1a98c847-1fd6-4fd8-948a-caf3550aa51b	2010-03-05 01:13:27 +00:00
s_nakamoto	d7d80a74d5	fix unsafe string handling in wxGetTranslation git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@73 1a98c847-1fd6-4fd8-948a-caf3550aa51b	2010-02-28 15:00:32 +00:00
s_nakamoto	6557910ccf	wx/utils.h and wx/clipbrd.h not needed on bitcoind wxbase build git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@72 1a98c847-1fd6-4fd8-948a-caf3550aa51b	2010-02-26 16:09:43 +00:00