DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
18,660 Commits 5 Branches 7 Tags
33f4e4925cdf9d048fc92c4748a94552af940dac
Commit Graph
81 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Garzik 8146591a53 Merge branch 'http-improvements' 
The base bits of pull req #1982.
 2012-11-09 17:34:25 -05:00
Jeff Garzik b855abb8db Revert "Send 'mempool' P2P command at the start of each P2P session" 
Fat-fingered on github, and merged this too early.

This reverts commit 22f9b06903.
 2012-10-08 18:14:15 -04:00
Jeff Garzik 8e154e4d74 Merge branch 'merge2' into merge 2012-05-24 11:57:51 -04:00
Jeff Garzik 0134a1c08c Merge branch 'dbenv' into tmp 
Conflicts:
	src/db.cpp
 2012-05-22 17:45:00 -04:00
Jeff Garzik f9dd136a09 Revert "use _strnicmp (ISO C++) instead of deprecated strnicmp (POSIX) and add missing "#define strncasecmp _strnicmp" in init.cpp" 
This reverts commit f4ac41806a.

Reason: breaks build.
 2012-05-17 20:14:24 -04:00
Jeff Garzik 781fc2c8c0 Revert part of 1302257e: don't update CXXFLAGS, only xCXXFLAGS 2012-05-08 21:18:35 -04:00
Jeff Garzik 203f9e6c00 Merge branch 'tmp-ipv6' into merge-ipv6 2012-05-08 19:43:17 -04:00
Jeff Garzik 10ab9c2f42 OpenBlockFile(): cast to eliminate signed/unsigned comparison warning 
nFile's null value is -1.  Cast that to unsigned int, to avoid warning.

Additionally, avoid nFile==0 because the first valid value is 1.
 2012-05-01 17:50:33 -04:00
Jeff Garzik 7bd9c3a3cf SigOp and orphan-tx constants and counts are always unsigned. 
Fixes several sign-comparison warnings.
 2012-04-23 14:14:03 -04:00
Jeff Garzik dc42bf52c1 Encapsulate RPC command dispatch in an array of CRPCCommand's 2012-04-21 01:20:05 +02:00
Jeff Garzik ccd65d4261 Move proto version to version.h. Reduce header deps a bit more. 2012-04-17 20:02:38 +02:00
Jeff Garzik 9eace6b113 Move CWalletDB code to new walletdb module. 
In addition to standard code separation, this change opens the door
to fixing several include inter-dependencies.
 2012-04-17 20:00:55 +02:00
Jeff Garzik ce8c93498a main.cpp: replace tabs with spaces 
Sometimes they sneak in through the 'vi' door
 2012-04-17 12:31:51 -04:00
Jeff Garzik 8bff8ac079 AlreadyHave(): only hold lock during mapTransactions access 2012-04-17 12:30:00 -04:00
Jeff Garzik ea9627979e Bump PROTOCOL_VERSION to 60001, thereby enabling BIP31 2012-04-17 12:16:46 -04:00
Jeff Garzik 9fb89c26f3 Fix misc. minor sign-comparison warnings 2012-04-15 17:00:20 -04:00
Jeff Garzik 0dd710acb6 CNode's nHeaderStart may be negative, so change its type 2012-04-15 16:59:48 -04:00
Jeff Garzik c3fad8350b serialize.h: CAutoFile's read and write may take size_t nSize 2012-04-15 16:59:09 -04:00
Jeff Garzik 3a78f82a78 Fix sign-compare warnings: netbase's Lookup* max-solutions may be unsigned 2012-04-15 16:58:32 -04:00
Jeff Garzik c376ac359e Fix loop index var types, fixing many minor sign comparison warnings 
foo.size() typically returns an unsigned integral type; make loop variables
match those types' signedness.
 2012-04-15 16:52:09 -04:00
Jeff Garzik ab9dc75a18 The string class returns string::npos, when find() fails. 
Noticed when sign-comparison warnings were enabled.
 2012-04-15 16:47:24 -04:00
Jeff Garzik ca4c4c53a8 CTxMemPool: add helper methods, to reduce global mempool.mapTx accesses 2012-04-15 14:43:19 -04:00
Jeff Garzik d01903e751 CTxMemPool: encapsulate AcceptToMemoryPool 2012-04-15 14:43:19 -04:00
Jeff Garzik 8e45ed66dd CTxMemPool: encapsulate AddToMemoryPoolUnchecked(), RemoveFromMemoryPool(), 
and nPooledTx
 2012-04-15 14:42:52 -04:00
Jeff Garzik 235507ae48 New class CTxMemPool, encapsulating TX memory pool data members 2012-04-15 14:41:27 -04:00
Jeff Garzik 8deb9822e4 Locking fix for AlreadyHave() 
Access to mapTransactions[] must be guarded by cs_mapTransactions lock.

Also, reformat long lines to make the switch statement more readable.
 2012-04-13 18:24:55 -04:00
Jeff Garzik 9925d34a49 Database micro-optimization for "tx" network message 
Open database once per "tx" message, rather than multiple times,
in the case of orphan transaction presence.

As a side effect, a now-unused CTransaction::AcceptToMemoryPool()
variant is removed.
 2012-04-13 17:48:15 -04:00
Jeff Garzik 8b09cd3a4d Replace several network protocol version numbers with named constants 
stored in version.h.

Also, a minor CAddress code reformat while we're in there, fixing
some incorrect indentation.
 2012-04-12 20:07:49 -04:00
Jeff Garzik 460b66b14b Remove obsolete Win32 AffinityBugWorkaround() 
Reference miner exists for testnet-in-a-box type situations, and as a
reference.  We don't care enough about highly optimized internal
mining to keep workarounds like this.
 2012-04-12 13:24:00 -04:00
Jeff Garzik b87c0fc440 version.h: separate client, net sections. Move more constants to this file. 
* move PROTOCOL_VERSION to version.h

* move CLIENT_VERSION* to version.h, make available past cpp stage

* clearly separate client, network version portions of version.h
 2012-04-12 12:23:58 -04:00
Jeff Garzik 02d630c37f Remove vladimir's DNS seed, at his request. 2011-10-31 12:42:01 -04:00
Jeff Garzik 0535644b30 Merge branch 'master' of git://github.com/bitcoin/bitcoin 2011-09-06 16:20:24 -04:00
Jeff Garzik cbd959c473 Revert "Define MSG_NOSIGNAL to 0 on platforms where it is unavailable." 
This reverts commit 6a0296791d.

The change breaks build on Fedora Linux.
 2011-09-06 16:19:54 -04:00
Jeff Garzik cc558f0603 README.md: word wrap text file 2011-09-05 23:02:35 -04:00
Jeff Garzik 927aaa0f27 Add reference python miner, in contrib/pyminer/ 2011-08-31 12:27:41 -04:00
Jeff Garzik b2fd0ca1cb src/makefile.unix: remove -DFOURWAYSSE2 
Spotted by Venkatesh Srinivas <me@endeavour.zapto.org>
 2011-08-16 10:10:39 -04:00
Jeff Garzik bd1e54bc0b Merge branch 'tmp2' 2011-08-04 15:22:05 -04:00
Jeff Garzik a139ed74f2 CAddrDB::LoadAddresses: properly initialize CAddress 
Fixes issue #424
 2011-07-26 15:15:55 -04:00
Jeff Garzik e9fd7d9fad doc/README: word wrap into something readable 2011-07-13 01:21:49 -04:00
Jeff Garzik 24a0def8cd Bump version to 0.3.25 
Yes, we might release as v0.4, but let's just do a simple increment
for now.
 2011-07-13 01:19:26 -04:00
Jeff Garzik 116df55e21 Update CWallet::LoadWallet for proper return type. 2011-07-13 01:07:49 -04:00
Jeff Garzik f08736405e Compile 'sv' translation 2011-07-08 13:38:24 -04:00
Jeff Garzik fc27eb188f Bump OSX version to 0.3.24 (missed in previous commit) 2011-07-02 16:57:45 -04:00
Jeff Garzik b4b536d782 Bump version to 0.3.24. 2011-07-02 16:55:11 -04:00
Jeff Garzik a76899624a Merge branch 'tmp2' into tmp3 2011-07-02 16:46:07 -04:00
Jeff Garzik 362efb24c1 Enable DNS seeding by default. 2011-07-01 17:58:03 -04:00
Jeff Garzik aa0c5e87e8 CWalletTx::GetAmounts(): pass NULL for CKeyStore*, rather than false 
to fix warning.
 2011-06-18 21:50:05 -04:00
Jeff Garzik eeac8727bc doc/release-process.txt: minor updates 2011-06-16 17:52:38 -04:00
Jeff Garzik c02ec54269 FormatFullVersion: build fix related to recent translation improvement 2011-06-14 04:50:51 -04:00
Jeff Garzik 6854a2ade6 Add minimal release process docs. 2011-06-10 02:14:56 -04:00
Jeff Garzik 6de1326ba4 Lower minimum relay TX fee to 0.0001 (from 0.0005) BTC. 2011-06-10 02:07:13 -04:00
Jeff Garzik 352b4ea5b9 Reduce minimum TX fee for new transactions, to 0.0005. 2011-06-05 14:28:14 -04:00
Jeff Garzik 6f07e22210 Bump version to 0.3.23. 2011-06-05 10:39:01 -04:00
Jeff Garzik d21876cdb8 Merge branch 'chfix' of https://github.com/TheBlueMatt/bitcoin into tmp 2011-05-24 19:41:01 -04:00
Jeff Garzik 69a27a4ec6 irc: #bitcoin is overflowing. split up into 100 randomly-joined channels. 
From laszlo
 2011-05-20 20:54:51 -04:00
Jeff Garzik 69ae372b51 OSX build tweaks (laszlo) 2011-05-20 20:48:44 -04:00
Jeff Garzik 0c97aa9e14 Merge branch 'master' of git://github.com/bitcoin/bitcoin 2011-05-17 01:38:15 -04:00
Jeff Garzik 270e944e30 doc/README: bump version to 0.3.22 2011-05-17 01:36:31 -04:00
Jeff Garzik 73eb306cfd Merge branch 'fUseUPnPfix' of https://github.com/TheBlueMatt/bitcoin into tmp 2011-05-12 17:36:42 -04:00
Jeff Garzik 2a2487514a Decrease minimum TX fee to 0.0005 BTC. 2011-05-11 16:50:09 -04:00
Jeff Garzik a630da6400 Replace CENT with new constant MIN_TX_FEE, where appropriate. 
MIN_TX_FEE==CENT remains true (until next commit).
 2011-05-11 16:48:51 -04:00
Jeff Garzik d9068ad5a1 Add settxfee RPC, to permit setting default TX fee at runtime. 2011-05-09 14:35:30 -04:00
Jeff Garzik b17be7e14b Manual merge of jaromil's source tree reorg commit. 
Conflicts:
	src/sha256.cpp
 2011-05-09 14:00:14 -04:00
Jeff Garzik 2fb1124b0f Merge branch 'remove-4way' of github.com:jgarzik/bitcoin into tmp 
Conflicts:
	makefile.unix
 2011-05-06 08:04:50 -04:00
Jeff Garzik e93e5349cb Remove GUI's "Generate Coins" option from the menu. 
CPU mining remains available via command line option [until/unless
the community decides to remove that completely].
 2011-04-18 15:10:27 -04:00
Jeff Garzik 17616eac17 Send/return full bitcoin version string in Server and User-Agent HTTP headers 2011-04-15 03:58:42 -04:00
Jeff Garzik a584320357 Ensure version number->string conversion is consistent 2011-04-15 03:58:28 -04:00
Jeff Garzik d98beea894 rfc1123Time: increase buffer size for time string 
Make sure we can accomodate all possibilities.
 2011-04-08 22:50:14 -04:00
Jeff Garzik 6f074b71bb RPC sendmany must acquire cs_main lock 2011-04-05 15:15:20 -04:00
Jeff Garzik f5f1878ba1 Fix deadlocks in setaccount, sendfrom RPC calls 
SendMoney*() now requires caller to acquire cs_main.
GetAccountAddress() now requires caller to acquire cs_main, cs_mapWallet.

Ordering is intended to match these two callchains[1]:

1. CRITICAL_BLOCK(cs_main)
    ProcessMessage(pfrom, strCommand, vMsg)
        AddToWalletIfMine()
              AddToWallet(wtx)
                  CRITICAL_BLOCK(cs_mapWallet)

2. CRITICAL_BLOCK(cs_main)
    ProcessMessage(pfrom, strCommand, vMsg)
        AddToWalletIfMine()
              AddToWallet(wtx)
                  CRITICAL_BLOCK(cs_mapWallet)
                      walletdb.WriteName(PubKeyToAddress(vchDefaultKey), "")
                          CRITICAL_BLOCK(cs_mapAddressBook)

Spotted by ArtForz.  Additional deadlock fixes by Gavin.

[1] http://www.bitcoin.org/smf/index.php?topic=4904.msg71897#msg71897
 2011-04-04 22:24:35 -04:00
Jeff Garzik b26141e2c5 Remove 4way SSE2 scanhash implementation. 2011-04-03 14:21:52 -04:00
Jeff Garzik a2b6c1930d Update DNS seed list 2011-04-01 11:33:35 -04:00
Jeff Garzik 3a47bf7265 Merge branch 'master' of git://github.com/bitcoin/bitcoin 2011-03-23 18:28:50 -04:00
Jeff Garzik 8203ec4b11 [locale] Regenerate es, nl binary message catalogs 2011-03-23 18:27:09 -04:00
Jeff Garzik 0b8e4738f9 Merge branch 'master' of https://github.com/smola/bitcoin into tmp 2011-03-23 18:21:22 -04:00
Jeff Garzik d38e683a6f Merge branch 'dutchloc' of https://github.com/sipa/bitcoin into tmp 2011-03-23 18:21:10 -04:00
Jeff Garzik e2e5f5cd9d Fix -logtimestamps to only print time prefix once per output line 
Incorporate BlueMatt's fix to only timestamp upon new line, and
move -logtimestamp checking outside OutputDebugPrintF() to better
future-proof it.
 2011-03-16 15:42:04 -04:00
Jeff Garzik 8f58d0dbc8 Merge branch 'smalltxfix' of https://github.com/gavinandresen/bitcoin-git into tmp 2011-03-10 14:32:19 -05:00
Jeff Garzik 12e091842f Merge branch 'master' of https://github.com/devrandom/bitcoin into tmp 2011-03-10 12:58:49 -05:00
Jeff Garzik 448b4516ff dnsseed: fix printf 2011-03-08 22:55:29 -05:00
Jeff Garzik f684aec4f3 DNS seeding 2011-03-08 22:40:50 -05:00