DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
2,336 Commits 6 Branches 7 Tags
a6cd0b08f6ef2af86fdff01154fe647e40b95424
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Garzik d960a335f8 Merge pull request #1266 from Diapolo/tab_to_space 
convert 4 tabs into 4 x 4 spaces in bitcoinrpc.cpp
 2012-05-12 08:02:57 -07:00
Jeff Garzik b34c5f3c0f Merge pull request #1101 from jgarzik/http11 
Multithreaded JSON-RPC with HTTP 1.1 Keep-Alive support
 2012-05-11 09:57:08 -07:00
Jeff Garzik 271f9faf9e Merge pull request #1254 from jgarzik/mempool-logging 
CTxMemPool: consolidate two frequently-printed debug.log lines into one
 2012-05-11 07:53:08 -07:00
Jeff Garzik 33a53bc13b CTxMemPool::accept(): do not log FetchInputs failure redundantly 
FetchInputs already logs failures internally.  This commit makes the logging
more consistent with other FetchInputs callsites also.

Prior to this commit, two log lines were logged for one condition:

     ERROR: FetchInputs() : de15fde415 mempool Tx prev not found a2c75da227
     ERROR: CTxMemPool::accept() : FetchInputs failed de15fde415

After this commit, only one line is logged:

     ERROR: FetchInputs() : e0507ab2c7 mempool Tx prev not found 9a620262cd
 2012-05-10 20:31:46 -04:00
Jeff Garzik 133dce6a37 CTxMemPool: consolidate two frequently-printed debug.log lines into one 
Previously, a single TX would trigger two log lines in quick succession,

        addUnchecked(): size 152
        CTxMemPool::accept() : accepted c4cfdd48b7

After this change, only one log line is used:

        CTxMemPool::accept() : accepted 98885e65db (poolsz 26)
 2012-05-10 20:20:31 -04:00
Jeff Garzik 9d9aae0396 Merge pull request #1237 from gmaxwell/master 
Kill warning from unavoidable signed/unsigned comparison in bitcoinrpc.cpp.
 2012-05-09 07:59:13 -07:00
Jeff Garzik 11b729d8a2 Merge pull request #1134 from Diapolo/util-updates 
small util.cpp/h changes
 2012-05-09 07:54:25 -07:00
Jeff Garzik d54e6e8359 Merge pull request #1225 from Diapolo/net_cpp_if_clause 
fix an incorrect if-clause in net.cpp
 2012-05-09 07:50:27 -07:00
Jeff Garzik 1302257e5d makefile.unix: add -Wall to default CXXFLAGS 
Additionally, remove -Wno-sign-compare from alt CXXFLAGS, as
that is no longer a problem.
 2012-05-08 21:02:28 -04:00
Jeff Garzik ab89d75daf Merge pull request #1226 from Diapolo/init_h_rem_obsolete 
remove 2 obsolete functions from init.h that moved to util.h
 2012-05-08 15:18:08 -07:00
Jeff Garzik a2ea797593 Merge pull request #1180 from jgarzik/sign-compare 
Fix final sign comparison warnings
 2012-05-08 13:50:27 -07:00
Jeff Garzik 28bddf4590 Merge pull request #1214 from TheBlueMatt/debian 
Update changelog to match reality.
 2012-05-06 18:35:42 -07:00
Jeff Garzik ca97bde8ff Merge pull request #1171 from Diapolo/fix_compiler_warn 
fix 2 compiler warnings
 2012-05-01 15:02:41 -07:00
Jeff Garzik 024fa1cb44 EvalScript(): cast to avoid signed/unsigned warning 2012-05-01 17:57:12 -04:00
Jeff Garzik 061a001590 ThreadSocketHandler2(): cast to avoid signed/unsigned warning 2012-05-01 17:54:52 -04:00
Jeff Garzik 24de922636 CDiskTxPos, CInPoint, COutPoint: cast null value (-1) to unsigned int 
to eliminate signed/unsigned comparison warnings
 2012-05-01 17:49:17 -04:00
Jeff Garzik e19ccfa657 Merge pull request #1177 from laanwj/2012_05_remove_duplicate_securestring 
remove duplicate definition of SecureString in util.h
 2012-05-01 10:05:00 -07:00
Jeff Garzik bd51e8ef8a Merge pull request #1173 from Diapolo/init_cpp_comment_upd 
remove references to bitcoin-wx from comment in init.cpp
 2012-05-01 08:29:10 -07:00
Jeff Garzik c2e8c8acd8 Merge pull request #1140 from jgarzik/sign-compare 
Address many more sign comparison warnings
 2012-04-23 21:33:29 -07:00
Jeff Garzik 735a60698c Change signed->unsigned at 3 code sites 
This resolves signed/unsigned comparison warnings.
 2012-04-23 14:14:36 -04:00
Jeff Garzik 5aa0b23825 CBlock::WriteToDisk() properly checks ftell(3) for error return 
Rather than storing ftell(3)'s return value -- a long -- in an
unsigned int, we store and check a properly typed temp.  Then, assured a
non-negative value, we store in nBlockPosRet.
 2012-04-23 14:14:36 -04:00
Jeff Garzik 1d8c7a9557 Add casts for unavoidable signed/unsigned comparisons 
At these code sites, it is preferable to cast rather than change
a variable's type.
 2012-04-23 14:14:36 -04:00
Jeff Garzik c0a0a93d02 Test ScriptSigArgsExpected() for error, before accumulating return value 2012-04-23 14:14:36 -04:00
Jeff Garzik faf705a42a Prefer 'unsigned int' for loop index variables tested against ::size() 
C++ STL ::size() generally returns unsigned, which implies that "int idx"
style of loop variable will generate a signed-vs-unsigned comparison warning
when testing the loop exit condition "idx < blah.size()"

Update areas of the bitcoin code where loop variables may be more properly and
correctly defined as unsigned.
 2012-04-22 13:22:39 -04:00
Jeff Garzik dd21ce5f1b Merge pull request #1094 from jgarzik/already-have-locking 
Locking fix for AlreadyHave()
 2012-04-17 09:23:49 -07:00
Jeff Garzik 865a0c1674 Merge pull request #1081 from jgarzik/pong 
BIP 0031: pong message
 2012-04-17 08:51:17 -07:00
Jeff Garzik 5a701eb7ea Merge pull request #1104 from laanwj/2012_04_clang 
Enable and fix most compilation warnings
 2012-04-15 11:39:15 -07:00
Jeff Garzik fced2231f8 Merge pull request #1084 from dooglus/validate_secret 
importprivkey doesn't check that it is given a private key
 2012-04-15 09:25:29 -07:00
Jeff Garzik c99ddfaa22 Merge pull request #1100 from luke-jr/qrcode_errchk 
Bugfix: Check that QRcode_encodeString didn't return NULL (error)
 2012-04-15 08:31:22 -07:00
Jeff Garzik 22014c31e5 Merge pull request #1093 from jgarzik/tx-opt 
Database micro-optimization for "tx" network message
 2012-04-14 08:50:43 -07:00
Jeff Garzik 93e447b631 BIP 0031: pong message 
Add a pong message that is sent in reply to a ping. It echoes back a nonce
field that is now added to the ping message. Send a nonce of zero in ping
messages.

Original author: Mike Hearn @ Google

Modified Mike's change to introduce a mild form of protocol documentation in
version.h.
 2012-04-12 12:11:56 -04:00
Jeff Garzik 4dcad1d294 Merge pull request #536 from TheBlueMatt/build-updates 
Update release-process.txt with gitian release instructions.
 2011-09-28 09:27:25 -07:00
Jeff Garzik ab1bbe5492 Merge pull request #533 from alexwaters/readme 
Updated readme file with timers.
 2011-09-27 20:47:06 -07:00
Jeff Garzik f8937b2d3b Merge pull request #528 from TheBlueMatt/gitian-downloader 
Add win32 gitian download config.
 2011-09-23 10:56:25 -07:00
Jeff Garzik 864e49a12c Merge pull request #525 from TheBlueMatt/master 
Update binary mo to match latest po translation.
 2011-09-22 09:48:02 -07:00
Jeff Garzik 700f942692 Merge pull request #522 from sipa/minorfix 
SocketHandler thread can be detached
 2011-09-20 11:47:02 -07:00
Jeff Garzik 7337b343cd Merge pull request #519 from dabaopku/master 
Chinese Simp translation update
 2011-09-17 09:24:54 -07:00
Jeff Garzik 53c6c12886 Merge pull request #512 from paraipanakos/master 
Spanish translation update
 2011-09-13 13:21:09 -07:00
Jeff Garzik 38fd861fff Merge pull request #511 from mibe/translation-de 
Updated German translation
 2011-09-11 18:45:00 -07:00
Jeff Garzik ff4bd3977a Merge pull request #503 from TheBlueMatt/translatefix 
Add binary mo for new translation.
 2011-09-06 12:03:08 -07:00
Jeff Garzik 074653973e Merge pull request #502 from vsrinivas/master 
Define MSG_NOSIGNAL to 0 when it is not defined.  Gets OpenBSD building.
 2011-09-06 11:58:42 -07:00
Jeff Garzik 04f9a37c71 Merge pull request #501 from paraipanakos/master 
Added Romanian translation
 2011-09-06 11:50:56 -07:00
Jeff Garzik 3a7c4d89de Merge pull request #495 from alexwaters/readme 
Updated readme file
 2011-09-05 20:01:55 -07:00
Jeff Garzik 712077a760 Merge pull request #486 from TheBlueMatt/translatefix 
Update binary mos to latest translations.
 2011-09-02 10:12:20 -07:00
Jeff Garzik 21189a42a7 Merge pull request #463 from TheBlueMatt/encreadme 
Encryption readme update and minor rpc.cpp fixes
 2011-08-31 09:32:42 -07:00
Jeff Garzik ce39dfe425 Merge pull request #475 from ovdeathiam/patch-1 
Edited locale/pl/LC_MESSAGES/bitcoin.po via GitHub
 2011-08-31 09:23:30 -07:00
Jeff Garzik 8af99d1893 Merge pull request #464 from TheBlueMatt/upnp1.6 
Upgrade dependancies and tweak build process.
 2011-08-31 09:16:56 -07:00
Jeff Garzik eb20f3c8f5 Merge pull request #448 from sipa/cbitcoinaddress 
avoid strAddress + validity checks
 2011-08-04 11:47:15 -07:00
Jeff Garzik 95699e1730 Merge pull request #446 from WakiMiko/upnp-desc 
Identify as "Bitcoin + version number" when mapping UPnP port
 2011-08-04 11:40:44 -07:00
Jeff Garzik 32de8cd062 Merge pull request #451 from TheBlueMatt/tornolisten 
Don't listen if on TOR (resolves #441).
 2011-08-04 11:40:06 -07:00
Jeff Garzik a9ba47101a Merge pull request #403 from sipa/cbitcoinaddress 
keys indexed by address + introduced CBitcoinaddress
 2011-07-24 15:38:38 -07:00
Jeff Garzik c2da35319d Merge pull request #423 from TheBlueMatt/mapalreadyaskedforfix 
Actually use mapAlreadyAskedFor.
 2011-07-21 19:05:38 -07:00
Jeff Garzik 133ccbe408 Merge pull request #418 from EricJ2190/master 
Update makefile.vc for wallet encryptions.
 2011-07-15 21:11:34 -07:00
Jeff Garzik 5b0fc31b1c Merge pull request #414 from spiechu/polish-translation 
added polish wallet encryption messages
 2011-07-14 20:43:22 -07:00
Jeff Garzik 065d743019 Merge pull request #413 from TheBlueMatt/loadwalletret 
Fix bad return values in LoadWallet.
 2011-07-14 09:37:50 -07:00
Jeff Garzik 60d2f8662c Merge pull request #409 from TheBlueMatt/master 
Fix crashes when a wallet is locked and GetReservedKey() is called
 2011-07-13 18:22:19 -07:00
Jeff Garzik 9cd22ab862 Merge pull request #406 from muggenhor/warning-fixes 
Warning fixes
 2011-07-13 08:55:49 -07:00
Jeff Garzik b8cbbc2c28 Merge pull request #405 from sipa/syncdefault 
Bugfix: add autogenerated addresses to address book
 2011-07-13 08:53:57 -07:00
Jeff Garzik 4ea952d5c0 Merge pull request #399 from muggenhor/warning-fixes 
Warning fixes
 2011-07-12 20:22:38 -07:00
Jeff Garzik 0fa89d8e81 Merge pull request #381 from TheBlueMatt/nminversion 
Add minversion to wallet.
 2011-07-12 19:34:30 -07:00
Jeff Garzik 61e3c011f5 Merge pull request #402 from jayschwa/hirez-icon 
High resolution Windows icon
 2011-07-12 19:18:52 -07:00
Jeff Garzik 696d34069a Merge pull request #396 from jayschwa/nsis-branding 
Add bitcoin.org logos/branding to NSIS installer.
 2011-07-12 19:18:21 -07:00
Jeff Garzik 0bad8e4237 Merge pull request #352 from TheBlueMatt/newenc 
Wallet Private Key Encryption (on CWallet)
 2011-07-12 19:10:12 -07:00
Jeff Garzik 354f2dd094 Merge pull request #392 from laanwj/antimagic 
Remove another magic number: change threshold for nLockTime to constant
 2011-07-09 10:09:13 -07:00
Jeff Garzik c05d011fba Merge pull request #376 from codler/translate 
Minor translation changes for latest build (Swedish)
 2011-07-08 10:36:49 -07:00
Jeff Garzik e94010b239 Merge pull request #383 from sipa/syncdefault 
Fix synchronization of default key
 2011-07-05 11:52:13 -07:00
Jeff Garzik bb0d9ce226 Merge pull request #384 from TheBlueMatt/upnp 
Fix UPnP building, entirely my fault.
 2011-07-05 10:10:26 -07:00
Jeff Garzik 06c903b26c Merge pull request #380 from TheBlueMatt/buildupdates 
Added a couple minor things to match newer build process.
 2011-07-04 16:34:18 -07:00
Jeff Garzik 1a19fc17b2 Merge pull request #374 from TheBlueMatt/neterror 
Give more detailed error messages for connection failure.
 2011-07-02 12:04:09 -07:00
Jeff Garzik 9cd1dfe898 Merge pull request #372 from TheBlueMatt/upnp 
Make UPnP default on Bitcoin but not on Bitcoind.
 2011-07-01 19:39:05 -07:00
Jeff Garzik cfbcb1de66 Merge pull request #373 from EricJ2190/master 
Another Visual C++ Makefile Update
 2011-07-01 17:38:24 -07:00
Jeff Garzik c4286dc6ee Merge pull request #343 from muggenhor/proper-http-server-rejection 
rpc server: send '403 Forbidden' to rejected clients
 2011-07-01 16:34:49 -07:00
Jeff Garzik b73ab2d885 Merge pull request #368 from TheBlueMatt/dnsseed 
Only use dnsseeds when not on testnet.
 2011-07-01 16:33:28 -07:00
Jeff Garzik 056d2ad312 Merge pull request #371 from EricJ2190/master 
Updated Visual C++ Makefile
 2011-07-01 16:31:33 -07:00
Jeff Garzik 7fbeca05c9 Merge pull request #369 from sipa/limitblocksend 
Limit size of response to getblocks
 2011-07-01 14:51:48 -07:00
Jeff Garzik 44d16327c1 Merge pull request #367 from TheBlueMatt/dnsseed 
Add new DNSSeed dnsseed.bluematt.me.
 2011-06-30 14:51:55 -07:00
Jeff Garzik 77ba3ab99c Merge pull request #342 from jburkle/datadir_check 
Edited init.cpp to include a check that -datadir exists
 2011-06-23 21:43:30 -07:00
Jeff Garzik 04e442070d Merge pull request #332 from shanew/master 
Include missing Boost header
 2011-06-19 20:04:24 -07:00
Jeff Garzik 2207f5e201 Merge pull request #331 from TheBlueMatt/translatefix 
Update translations and remove obsolete translations.
 2011-06-19 20:03:08 -07:00
Jeff Garzik 19ea44208f Merge pull request #226 from jordanlewis/betterheaders 
Optimize header dependencies; improve Makefile dependency graph
 2011-06-14 02:05:57 -07:00
Jeff Garzik 6f460bace6 Merge pull request #314 from codler/translate 
Update swedish translation
 2011-06-14 01:33:04 -07:00
Jeff Garzik 40dc7e6e1d Merge pull request #315 from codler/consistent-address 
Consistent Bitcoin example address
 2011-06-14 01:32:40 -07:00
Jeff Garzik ce148944c7 Merge pull request #300 from sipa/connecttimeout 
non-blocking connect (by phantomcircuit)
 2011-06-11 16:17:13 -07:00
Jeff Garzik e051f1b510 Merge pull request #312 from codler/patch-1 
Remove unused variable
 2011-06-11 09:58:02 -07:00
Jeff Garzik 18e39300e6 Merge pull request #311 from codler/master 
Added Swedish translation
 2011-06-11 00:27:16 -07:00
Jeff Garzik 65ee333ae0 Merge pull request #304 from TheBlueMatt/cpufix 
Fix CPU Usage bug when using -nolisten and have no connections.
 2011-06-09 22:42:25 -07:00
Jeff Garzik 2661f2f7c4 Merge pull request #310 from xslidian/master 
Updated Chinese Simp translation
 2011-06-09 12:11:07 -07:00
Jeff Garzik 04bc3f0a63 Merge pull request #303 from jrmithdobbs/demystify-magic-numbers 
Demystify a few magic numbers.
 2011-06-06 11:17:39 -07:00
Jeff Garzik 09d1484b22 Merge pull request #264 from sipa/mintxfeefix 
Fix for small change outputs
 2011-06-05 07:32:58 -07:00
Jeff Garzik e3d884479a Merge pull request #291 from jrmithdobbs/ignore-vim-swp-files 
Add common temp files to .gitignore.
 2011-06-05 07:31:09 -07:00
Jeff Garzik 7a234cdae5 Merge pull request #255 from sipa/rescanupdate 
Update transactions already in the wallet when rescanning.
 2011-06-05 07:30:47 -07:00
Jeff Garzik 39105dac1b Merge pull request #290 from jrmithdobbs/ip-filter-rfc1918-rfc3927 
Fix rfc1918 and rfc3927 compliance for ignoring non-internet-routable hosts
 2011-06-05 07:30:05 -07:00
Jeff Garzik 1d418728b0 Merge pull request #277 from TheBlueMatt/dpifix 
Handle high DPI a bit more gracefully on Win32.
 2011-05-26 17:24:56 -07:00
Jeff Garzik 20d28e6031 Merge pull request #268 from TheBlueMatt/deletefix 
Fixes #240 and #244 - delete delete[] mismatch.
 2011-05-26 13:25:58 -07:00
Jeff Garzik 54c465f25d Merge pull request #250 from TheBlueMatt/macbuildfix 
Revert "OSX build tweaks (laszlo)"
 2011-05-24 16:31:15 -07:00
Jeff Garzik 32a1753e61 Merge pull request #249 from TheBlueMatt/nsisfix 
Update NSIS Installer file to support the new directory structure.
 2011-05-24 16:21:45 -07:00
Jeff Garzik 1fcf6f038e Merge pull request #251 from TheBlueMatt/itfix 
Update Italian translation to latest git.
 2011-05-24 16:21:23 -07:00
Jeff Garzik ec39b59a03 Merge pull request #259 from TheBlueMatt/rufix 
Update russian translation to latest git.
 2011-05-24 16:20:38 -07:00
Jeff Garzik 95f748c54e Merge pull request #260 from TheBlueMatt/eotranslation 
Add esperanto translation.
 2011-05-24 16:20:08 -07:00
Jeff Garzik 813a3b438f Merge pull request #229 from TheBlueMatt/esfix 
Update spanish translation to newest git.
 2011-05-18 10:37:11 -07:00