DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
2,026 Commits 6 Branches 7 Tags
962e2fcdb6aa43c9998b2be2ff96a679ff9db660
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gavin Andresen 1044391135 Merge branch 'filesystem' of https://github.com/Diapolo/bitcoin 2012-04-09 10:41:59 -04:00
Gavin Andresen 3acee27b14 Merge pull request #1047 from luke-jr/strlcpy_attribute 
Document strlcpy.h in assets-attribution.txt since it isn't MIT-licensed
 2012-04-05 16:41:20 -07:00
Gavin Andresen 399ff1fe05 Merge pull request #1043 from Diapolo/misc 
removed obsolete boost workaround (boost ticket #4258)
 2012-04-05 07:36:23 -07:00
Gavin Andresen 895c12943b Merge pull request #1042 from gavinandresen/use_ssl_cleanup 
Remove USE_SSL #define
 2012-04-05 07:34:45 -07:00
Gavin Andresen ea2cc8fc4a Merge pull request #1037 from gavinandresen/addmultisigenable 
Enable addmultisigaddress RPC call for main network
 2012-04-05 07:34:19 -07:00
Gavin Andresen c7fa55bb87 Merge pull request #1036 from gavinandresen/pubsubcleanup 
Remove half-implemented publish/subscribe system
 2012-04-05 07:33:54 -07:00
Gavin Andresen 78494ffecc Merge pull request #1035 from gavinandresen/osxbuild 
Add ifdef RELEASE to makefile.osx as the compile-for-older-macs flags
 2012-04-05 07:33:00 -07:00
Gavin Andresen 5ce4c2a23a Remove USE_SSL #define 2012-04-04 21:19:27 -04:00
Gavin Andresen ea8c55cfd7 Enable addmultisigaddress RPC call for main network 2012-04-04 16:01:27 -04:00
Gavin Andresen f487746ded Remove half-implemented publish/subscribe system 2012-04-04 15:56:00 -04:00
Gavin Andresen 3a8ca61bd0 Add ifdef RELEASE to makefile.osx as the compile-for-older-macs flags 2012-04-04 15:45:31 -04:00
Gavin Andresen 85ea8b4f43 Merge pull request #951 from TheBlueMatt/headerslimit 
Limit getheaders to a hard 2000.
 2012-04-02 11:22:11 -07:00
Gavin Andresen f3da2a88c9 Bump version to 0.6.0.99 for 0.6.1 merge window 2012-04-02 10:03:26 -04:00
Gavin Andresen a1c3d8f14d Merge branch 'master' of github.com:bitcoin/bitcoin 2012-03-29 15:11:04 -04:00
Gavin Andresen f146061d24 Merge pull request #1010 from sipa/fastblocks2 
Use transactions-updated as flush condition
 2012-03-29 12:10:30 -07:00
Gavin Andresen dac1888c18 Merge pull request #1008 from gavinandresen/addrworkaround 
Workaround hangs when upgrading old addr.dat files
 2012-03-29 12:10:08 -07:00
Gavin Andresen f3f9da868e Bump version to 0.6.0rc6 2012-03-29 13:58:22 -04:00
Gavin Andresen 6293a9f87f Workaround hangs when upgrading old addr.dat files 2012-03-29 13:34:07 -04:00
Gavin Andresen 83e914c1d5 Merge pull request #1007 from gavinandresen/log_auto_remove 
Auto-remove logs, and decrease logfile size to 10M
 2012-03-29 10:13:42 -07:00
Gavin Andresen 94b5960ef3 Merge pull request #996 from Diapolo/tx-lang-upd 
update translations from transifex
 2012-03-29 06:48:01 -07:00
Gavin Andresen 9f18347034 Auto-remove logs, and decrease logfile size to 10M 2012-03-29 09:03:11 -04:00
Gavin Andresen 8d29329f93 Update version to 60005 (0.6.0rc5) 2012-03-26 15:42:06 -04:00
Gavin Andresen 0ccb2c4f66 Merge branch 'master' of github.com:bitcoin/bitcoin 2012-03-26 15:37:40 -04:00
Gavin Andresen 84560c41c7 Merge pull request #994 from sipa/deladdr 
Use erase instead of rewrite to remove old addr entries
 2012-03-26 12:35:04 -07:00
Gavin Andresen dd675e01c4 Merge branch 'master' of github.com:bitcoin/bitcoin 2012-03-26 15:34:13 -04:00
Gavin Andresen be4502968e Merge pull request #992 from gavinandresen/remove_wxBitcoin 
Remove wxWidgets .exe during setup
 2012-03-26 12:33:02 -07:00
Gavin Andresen c698633447 Merge branch 'master' of github.com:bitcoin/bitcoin 2012-03-26 15:31:32 -04:00
Gavin Andresen c289d95d6b Merge pull request #991 from gavinandresen/disableWinURI 
Disable bitcoin: URI handling on Windows for the 0.6 release
 2012-03-26 12:31:06 -07:00
Gavin Andresen bf5b80a8ae Merge branch 'deladdr' of https://github.com/sipa/bitcoin 2012-03-26 14:32:26 -04:00
Gavin Andresen a56881b005 Remove wxWidgets .exe and locales during setup 2012-03-26 14:14:45 -04:00
Gavin Andresen 7b90edb5a6 Disable bitcoin: URI handling on Windows for the 0.6 release 2012-03-26 12:18:24 -04:00
Gavin Andresen 4a17e3e6b9 Merge pull request #946 from luke-jr/bugfix_rm_mingw 
Move QMAKE_LIBS_QT_ENTRY adjustment to bitcoin side of build
 2012-03-22 11:14:02 -07:00
Gavin Andresen 958fe01c32 Merge branch 'checklevel' of https://github.com/sipa/bitcoin 2012-03-22 12:18:56 -04:00
Gavin Andresen e12d131734 Merge pull request #975 from sipa/versioncheck 
Check minversion before loading the rest of the wallet
 2012-03-22 09:18:11 -07:00
Gavin Andresen a6b4a11385 Merge branch 'addrman' of https://github.com/sipa/bitcoin 2012-03-22 09:19:01 -04:00
Gavin Andresen 0e894be626 Merge pull request #964 from sipa/fastblocks 
Speed up block downloading
 2012-03-22 06:17:44 -07:00
Gavin Andresen e53f03172a Merge branch 'master' of github.com:bitcoin/bitcoin 2012-03-22 08:51:37 -04:00
Gavin Andresen 8f188ece3c Remove -bip16 and -paytoscripthashtime command-line arguments 2012-03-21 15:45:58 -04:00
Gavin Andresen 2e2c04e250 Merge pull request #947 from ali1234/master 
When disconnecting a node, the receive buffer should be cleared
 2012-03-21 12:24:57 -07:00
Gavin Andresen b2fe3a5ca6 Merge pull request #948 from sipa/unstuck 
Prevent stuck block download in large reorganisations
 2012-03-21 12:16:28 -07:00
Gavin Andresen c2b1ab072c Merge pull request #965 from khorben/master 
The generic UNIX Makefile builds with lots of warnings
 2012-03-21 07:45:49 -07:00
Gavin Andresen eae82d8ee5 Use last checkpoint instead of hard-coded 140,700. Fixes #913. 2012-03-20 13:45:45 -04:00
Gavin Andresen e318b99d99 Bump CLIENT_VERSION for rc3 release 2012-03-13 09:31:37 -04:00
Gavin Andresen f2e81bad33 Merge pull request #915 from sipa/nooverwritetx 
Do not allow overwriting unspent transactions
 2012-03-03 09:41:41 -08:00
Gavin Andresen 50abb5516d Updated Mac build process 2012-02-29 21:04:56 -05:00
Gavin Andresen 038fedccab Merge pull request #912 from TheBlueMatt/master 
Fix release-process.txt for new deps zip.
 2012-02-29 13:17:19 -08:00
Gavin Andresen 142e604184 DoS fix for mapOrphanTransactions 2012-02-29 11:46:46 -05:00
Gavin Andresen 722d9387be Merge branch 'mruinventory' of https://github.com/sipa/bitcoin 2012-02-28 11:48:44 -05:00
Gavin Andresen 6dd5ae41ac Merge branch '2012_02_getspecialfolderpath_overflow' of https://github.com/laanwj/bitcoin 2012-02-28 11:45:14 -05:00
Gavin Andresen 07ed49a472 Do not start bitcoin: thread on OSX. fixes #889 2012-02-27 16:08:08 -05:00
Gavin Andresen 21503e4556 Merge branch 'nodosbip16' of https://github.com/sipa/bitcoin 2012-02-27 15:47:27 -05:00
Gavin Andresen 46aa2a6bdd Move BIP16 switchover time to April 1 2012-02-27 11:41:20 -05:00
Gavin Andresen 90d78142c0 Merge branch 'nooptionsinwallet+fixproxysetting' of https://github.com/sipa/bitcoin 2012-02-27 11:30:05 -05:00
Gavin Andresen 3f8cb2c565 Reworked QT settings 2012-02-26 23:38:28 +01:00
Gavin Andresen 972060ce0e bitcoind changes to stop storing settings in wallet.dat. 2012-02-26 23:21:33 +01:00
Gavin Andresen 8c12851ed4 Checkpoint block 168,000 2012-02-23 13:33:30 -05:00
Gavin Andresen fc4f4c2e9a Merge branch 'getblock_cleanup' of https://github.com/luke-jr/bitcoin 2012-02-23 12:41:26 -05:00
Gavin Andresen 5c03282521 Merge branch 'testnetirc' of https://github.com/sipa/bitcoin 2012-02-22 11:26:19 -05:00
Gavin Andresen 6fe8c45375 Merge branch 'fixnullpfrom' of https://github.com/sipa/bitcoin 2012-02-22 11:25:08 -05:00
Gavin Andresen e7e6ae2104 Merge branch 'postfeb20' of https://github.com/sipa/bitcoin 2012-02-22 11:06:44 -05:00
Gavin Andresen 8c7358e1dd Merge branch 'reorginfo' of https://github.com/sipa/bitcoin 2012-02-22 11:03:19 -05:00
Gavin Andresen e1bad25fee Merge branch 'fix_616' of https://github.com/sipa/bitcoin 2012-02-22 11:00:38 -05:00
Gavin Andresen de737806b5 Merge branch 'fix_626' of https://github.com/sipa/bitcoin 2012-02-22 10:52:14 -05:00
Gavin Andresen 1af97c95f3 Merge branch 'bugfix_bip14_ez' of https://github.com/luke-jr/bitcoin 2012-02-22 10:44:44 -05:00
Gavin Andresen f246fc648a Merge branch '201202_guiaddsuffix' of https://github.com/laanwj/bitcoin 2012-02-22 10:41:11 -05:00
Gavin Andresen d3a4b85670 Merge branch 'nolisten_bitcoin_conf_2' of https://github.com/dooglus/bitcoin 2012-02-17 13:50:40 -05:00
Gavin Andresen 0a6b081cca Merge branch 'testnetmining' of github.com:gavinandresen/bitcoin-git 2012-02-17 13:48:01 -05:00
Gavin Andresen 25bc37f8a2 Merge branch 'threadid' of https://github.com/sipa/bitcoin 2012-02-17 13:40:42 -05:00
Gavin Andresen 0f8cb5db73 Fix issue #848 : broken mining on testnet 2012-02-16 11:37:54 -05:00
Gavin Andresen b25474d1be Merge pull request #825 from sipa/fix_822 
Fix #822: use free instead of delete
 2012-02-11 09:12:00 -08:00
Gavin Andresen b0cfef3214 Merge pull request #813 from dooglus/master 
Fix #794. Only remove transactions from memory pool when they're actually in the memory pool.
 2012-02-10 09:04:19 -08:00
Gavin Andresen a15bc17632 Merge pull request #805 from luke-jr/gitian_deps 
Split dependencies into deps-gitian.yml
 2012-02-07 09:23:34 -08:00
Gavin Andresen 882164196e Update all copyrights to 2012 2012-02-07 11:28:30 -05:00
Gavin Andresen 6bf4253a68 Increase client version to 0.6 2012-02-07 11:22:09 -05:00
Gavin Andresen 9d952d17bb Look for flushwallet/listen/irc/dnsseed/upnp instead of noflushwallet/etc. And switch default for irc to 0. 2012-02-07 09:14:31 -05:00
Gavin Andresen 3ad9f8a70f New GetArg features: allow --, and booleans can be -foo or -nofoo 2012-02-07 09:14:31 -05:00
Gavin Andresen 3ae0735553 Unit tests for the GetArg() methods 2012-02-07 09:14:31 -05:00
Gavin Andresen 0b452dff5e Merge branch 'standardScriptSigs' of github.com:gavinandresen/bitcoin-git 2012-02-07 09:04:56 -05:00
Gavin Andresen 7bf8b7c25c -bip16 option (default: 1) to support / not support BIP 16. And bumped default BIP16 switchover date from Feb 15 to Mar 1 2012-02-06 16:27:05 -05:00
Gavin Andresen 0b9a05a2bc Merge branch 'rpcpassword' of https://github.com/gmaxwell/bitcoin 2012-02-06 15:10:30 -05:00
Gavin Andresen 30999ec6f9 Merge branch 'decomposetransfix' of https://github.com/laanwj/bitcoin 2012-02-06 14:50:59 -05:00
Gavin Andresen aad945f9b1 Merge branch 'translation-fixes' of https://github.com/tcatm/bitcoin 2012-02-06 09:35:20 -05:00
Gavin Andresen 0104e36d4b Mac deploy tool: make dylibs writeable when copying into app bundle, so they can be stripped/nametool'ed 2012-02-06 09:33:13 -05:00
Gavin Andresen 8beb917c6c Allow -upnp to override setting in wallet (and simplify logic a bit) 2012-02-01 13:24:15 -05:00
Gavin Andresen c52296a73e Testnet difficulty calculation changes, to take effect Feb 15 2012 
Allow mining of min-difficulty blocks if 20 minutes have gone by without mining a regular-difficulty block.
Normal rules apply every 2016 blocks, though, so there may be a very-slow-to-confirm block at the difficulty-adjustment blocks.
 2012-01-31 13:20:01 -05:00
Gavin Andresen 4477b17f15 Merge branch 'checkkeys' of https://github.com/sipa/bitcoin 2012-01-31 12:19:26 -05:00
Gavin Andresen 68649bef93 CreateNewBlock was not adding in transaction fees. 2012-01-28 10:16:21 -05:00
Gavin Andresen 4c932cca6f Merge pull request #782 from sipa/checkkeys 
Check consistency of private keys
 2012-01-25 05:43:44 -08:00
Gavin Andresen b6a35d2d52 Merge pull request #773 from gavinandresen/p2shSigOpCount 
Simplify counting of P2SH sigops to match BIP 16
 2012-01-25 05:21:20 -08:00
Gavin Andresen 341519523f Support makefile.osx building test_bitcoin with dynamic boost 2012-01-23 15:58:06 -05:00
Gavin Andresen 2a9b46cf4b Merge branch 'bugfix_shared_boost_test' of https://github.com/luke-jr/bitcoin 2012-01-23 15:16:59 -05:00
Gavin Andresen a702ceaafc Merge branch 'lockcontention' of https://github.com/TheBlueMatt/bitcoin 2012-01-23 13:15:43 -05:00
Gavin Andresen 9ef59797af Merge branch 'master' of github.com:bitcoin/bitcoin 2012-01-23 13:14:49 -05:00
Gavin Andresen b8056dc5d0 Merge branch 'bugfix_areinpstd' of https://github.com/luke-jr/bitcoin 2012-01-23 13:09:34 -05:00
Gavin Andresen 5e437f05c7 Merge pull request #764 from luke-jr/update_release_process 
Various updates to the release process
 2012-01-23 09:59:38 -08:00
Gavin Andresen 149f580c82 Only store transactions with missing inputs in the orphan pool. 
All previous versions of bitcoin could store some types of
invalid transactions in the orphan-transaction list.
 2012-01-23 12:54:32 -05:00
Gavin Andresen dc77dce07c Fixed addmultisigaddress if looking up public keys from locked wallets. 2012-01-23 12:04:34 -05:00
Gavin Andresen 137d0685a4 Simplify counting of P2SH sigops to match BIP 16 (thanks to Matt Corallo for prompting this). 
This also removes an un-needed sigops-per-byte check when accepting transactions to the memory pool (un-needed assuming only standard transactions are being accepted). And it only counts P2SH sigops after the switchover date.
 2012-01-20 17:07:40 -05:00
Gavin Andresen 1240a1b0a8 Back out spacing changes to json spirit code 2012-01-19 14:32:45 -05:00
Gavin Andresen 7012b124bc Merge branch 'updateseednodes' of https://github.com/nanotube/bitcoin 2012-01-19 14:23:49 -05:00