Gavin Andresen
625b56de64
Merge branch 'opevalcountfix' of https://github.com/laanwj/bitcoin
2011-12-27 16:42:29 -05:00
Gavin Andresen
6d6d392b22
Fixed OP_EVAL recursion unit test, checks for both infinite and exactly-3-deep recursion
2011-12-27 16:41:56 -05:00
Gavin Andresen
61977f956c
Check all prevout.n if one transaction provides multiple inputs
2011-12-25 10:32:05 -05:00
Gavin Andresen
60835d9627
assert condition in previous commit was backwards
2011-12-25 10:08:01 -05:00
Gavin Andresen
6996a9d713
Check for valid prevout.n in FetchInputs.
...
IsStandardInputs could crash if given invalid input index.
2011-12-25 08:45:09 -05:00
Gavin Andresen
fe358165e3
Be more conservative: check all transactions in blocks after last checkpoint.
2011-12-23 17:13:10 -05:00
Gavin Andresen
2e17ac83c6
Fix broken ExtractAddress (refactored, made callers check for addresses in keystore if they care)
2011-12-22 15:57:31 -05:00
Gavin Andresen
ce336fdc21
Back out testnet default address change, it breaks accounts on old wallets.
2011-12-22 15:56:45 -05:00
Gavin Andresen
781c06c0f5
Merge pull request #677 from luke-jr/minfee_modes
...
API: GetMinFee modes
2011-12-20 13:09:18 -08:00
Gavin Andresen
595925592d
Merge branch 'op_eval'
2011-12-20 14:43:31 -05:00
Gavin Andresen
f06e3e0ea6
Merge pull request #717 from TheBlueMatt/installerqtupgrade
...
Implement "Start on window system startup" on Win32 + Linux.
2011-12-20 11:42:53 -08:00
Gavin Andresen
77f21f1583
include util.h to get SecureString definition.
2011-12-20 12:21:47 -05:00
Gavin Andresen
0e87f34bed
Include limits, not climints (using std::numeric_limits now)
2011-12-20 12:04:33 -05:00
Gavin Andresen
387c8e3c5b
Merge pull request #673 from mndrix/less-time-data
...
Store fewer time samples
2011-12-20 08:55:55 -08:00
Gavin Andresen
74f5435e10
Merge pull request #716 from gavinandresen/cleanup
...
Cleanups suggested by genjix
2011-12-20 08:52:22 -08:00
Gavin Andresen
9ef7fa3447
Code cleanup: use ECDSA_size() instead of fixed 10,000 byte sig buffer, and explicity init static var
2011-12-19 19:10:34 -05:00
Gavin Andresen
26ce92b352
Use std::numeric_limits<> for typesafe INT_MAX/etc
2011-12-19 19:10:34 -05:00
Gavin Andresen
bd846c0e56
Cleanup: removed dead code, and use C99 typedefs for int64 (supported by all modern c++ compilers)
2011-12-19 19:10:34 -05:00
Gavin Andresen
3528650560
Merge pull request #690 from runeksvendsen/qt-cmdline-options-parsing
...
When using Qt GUI, move parameter-parsing to start of qt/bitcoin.cpp:main()
2011-12-19 12:23:00 -08:00
Gavin Andresen
bafb43d6c1
Merge branch 'txn_block_info' of https://github.com/luke-jr/bitcoin
2011-12-19 15:14:22 -05:00
Gavin Andresen
9e470585b3
Update bitcoin address numbers for latest luke-jr/sipa scheme
2011-12-19 13:24:51 -05:00
Gavin Andresen
be237c119e
Fix logic for IsChange() for send-to-self transactions.
2011-12-19 13:24:49 -05:00
Gavin Andresen
2a45a494b0
Use block times for 'hard' OP_EVAL switchover, and refactored EvalScript
...
so it takes a flag for how to interpret OP_EVAL.
Also increased IsStandard size of scriptSigs to 500 bytes, so
a 3-of-3 multisig transaction IsStandard.
2011-12-19 13:24:48 -05:00
Gavin Andresen
a0871afb2b
Interpret OP_EVAL as OP_NOP until Feb 1, 2012
2011-12-19 13:24:48 -05:00
Gavin Andresen
fae3e2aab6
Disable addmultisigaddress if not testnet
2011-12-19 13:24:48 -05:00
Gavin Andresen
d7062ef1bd
Put OP_EVAL string in coinbase of generated blocks
2011-12-19 13:24:48 -05:00
Gavin Andresen
e679ec969c
OP_EVAL implementation
...
OP_EVAL is a new opcode that evaluates an item on the stack as a script.
It enables a new type of bitcoin address that needs an arbitrarily
complex script to redeem.
2011-12-19 12:40:19 -05:00
Gavin Andresen
cc40ba2151
Global fixture to send output to console instead of debug.log
2011-12-19 12:40:19 -05:00
Gavin Andresen
bf798734db
Support 3 new multisignature IsStandard transactions
...
Initial support for (a and b), (a or b), and 2-of-3 escrow
transactions (where a, b, and c are keys).
2011-12-19 12:40:19 -05:00
Gavin Andresen
1466b8b78a
Rework unit tests so test_bitcoin.cpp does not #include them all
2011-12-19 12:39:47 -05:00
Gavin Andresen
7e55c1ab65
Collapse no-op ExtractAddress/ExtractAddressInner
2011-12-19 12:39:47 -05:00
Gavin Andresen
99a289f531
Merge pull request #574 from sipa/dumpprivkey
...
Dumpprivkey
2011-12-19 07:27:25 -08:00
Gavin Andresen
fc90967876
Merge pull request #699 from laanwj/about_qt
...
Add "About Qt" menu option to show built-in Qt About dialog
2011-12-19 07:26:14 -08:00
Gavin Andresen
1f3bc1c239
Merge pull request #707 from gavinandresen/BIP14
...
Implement BIP 14 : separate protocol version from client version
2011-12-19 07:25:16 -08:00
Gavin Andresen
f8ded588a2
Implement BIP 14 : separate protocol version from client version
2011-12-19 10:24:23 -05:00
Gavin Andresen
cd2b8832fd
Merge pull request #709 from luke-jr/newdnsseeds
...
New DNS seeds
2011-12-19 07:12:30 -08:00
Gavin Andresen
8214620178
Merge pull request #704 from TheBlueMatt/master
...
Update debian changelog to 0.5.1.
2011-12-16 14:19:32 -08:00
Gavin Andresen
f0a70570fe
Merge pull request #706 from TheBlueMatt/gitian
...
Add laanwj to gitian download scripts.
2011-12-16 14:15:28 -08:00
Gavin Andresen
6e39e7c9b3
Move more newlines out of strings, and fix translations.
2011-12-16 17:13:45 -05:00
Gavin Andresen
ab6c45372c
Merge branch 'fix-help-translations' of https://github.com/tcatm/bitcoin
2011-12-16 16:37:24 -05:00
Gavin Andresen
8896c2d9d6
Bump version 0.5.99 (prep for pulling for version 0.6)
2011-12-16 12:31:59 -05:00
Gavin Andresen
b12fc3e112
Merge pull request #700 from TheBlueMatt/qtalertfix
...
Fix status bar not displaying Alerts.
2011-12-13 12:56:26 -08:00
Gavin Andresen
5491c310a6
Merge commit '7298ebb'
2011-12-12 15:03:16 -05:00
Gavin Andresen
93e92d3f44
Merge pull request #687 from TheBlueMatt/gitianssl
...
Re-enable RPCSSL in gitian builds.
2011-12-12 11:33:17 -08:00
Gavin Andresen
ca287d66f2
Merge pull request #694 from luke-jr/restore_old_miniupnp_compat
...
Restore compatibility with miniupnpc 1.5 (without breaking miniupnp 1.6)
2011-12-12 11:32:48 -08:00
Gavin Andresen
8848a70ba1
Merge pull request #679 from laanwj/cmdline_minimize
...
Implement -min option to start minimized
2011-12-05 07:53:15 -08:00
Gavin Andresen
f66eabd281
Merge pull request #682 from TheBlueMatt/gdicrypto
...
Move -lgdi32 after -lcrypto (fixes #681 )
2011-12-05 07:53:00 -08:00
Gavin Andresen
43ae68b5ef
Merge pull request #654 from TheBlueMatt/dnsseed-thread
...
Move DNS Seed lookup to a new thread.
2011-12-02 07:09:41 -08:00
Gavin Andresen
173efb1865
Merge pull request #670 from gavinandresen/rpcauth_speedup
...
Speed up RPC authentication (reworked pull from Joel Katz)
2011-12-01 13:01:59 -08:00
Gavin Andresen
f81ce5bd6d
Speed up RPC authentication (reworked pull from Joel Katz)
2011-12-01 15:55:25 -05:00
Gavin Andresen
43f20bb3c2
Merge pull request #534 from gavinandresen/DoSorphans
...
Denial-of-service prevention: low-difficulty blocks
2011-12-01 12:42:02 -08:00
Gavin Andresen
10fd7f6689
Orphan block fill-up-memory attack prevention
2011-12-01 13:53:38 -05:00
Gavin Andresen
eb5fff9e16
Moved checkpoints out of main, to prep for using them to help prevent DoS attacks
2011-12-01 12:18:50 -05:00
Gavin Andresen
a7120a3647
Merge pull request #666 from nobled/secstrings
...
Implement an mlock()'d string class for storing passphrases
2011-11-30 17:30:54 -08:00
Gavin Andresen
0305f60cad
Merge pull request #667 from laanwj/homeaddricons
...
Make home and addressbook icon more consistent with other toolbar icons
2011-11-30 17:28:13 -08:00
Gavin Andresen
e1b1055b46
Add missing command-line arguments to --help/-? output
2011-11-27 14:53:30 -05:00
Gavin Andresen
605ca141c7
Don't forget to bump release numbers in READMEs next time
2011-11-21 14:38:47 -05:00
Gavin Andresen
795faa595c
Bump version numbers to 0.5.1
2011-11-21 14:37:59 -05:00
Gavin Andresen
42eb76a054
Merge pull request #602 from wowus/master
...
Cleaned up critical section code.
2011-11-21 11:33:14 -08:00
Gavin Andresen
92979f8288
Merge pull request #634 from laanwj/doxygen
...
Add doxygen documentation
2011-11-21 11:31:57 -08:00
Gavin Andresen
0310cd6403
Merge pull request #632 from mndrix/deprecate-getblocknumber
...
Deprecate RPC getblocknumber
2011-11-21 11:31:42 -08:00
Gavin Andresen
4ad4f66327
Merge pull request #652 from TheBlueMatt/master
...
Update contrib/debian/ for 0.5.0 release and fix copyright file.
2011-11-21 11:27:26 -08:00
Gavin Andresen
e6389c3229
Update release process instructions
2011-11-21 14:13:22 -05:00
Gavin Andresen
67c454c67c
Bump version to 0.5.1
2011-11-21 13:38:38 -05:00
Gavin Andresen
b2d3b2d65d
Never remove database files on shutdown, it caused unreadable wallets on some testers' machines.
2011-11-20 10:39:01 -05:00
Gavin Andresen
1c15f88653
Only remove database log files on shutdown after wallet encryption/rewrite
2011-11-17 14:21:32 -05:00
Gavin Andresen
37971fcc76
Create new keypool for newly encrypted wallets.
2011-11-17 14:01:25 -05:00
Gavin Andresen
1b93ea0e31
Merge pull request #636 from gavinandresen/master
...
Fix crash-on-wallet-upgrade bug on OSX
2011-11-15 13:48:12 -08:00
Gavin Andresen
c4de918478
Tweak handling of boost filesystem versions
2011-11-15 14:30:24 -05:00
Gavin Andresen
8d0923109d
Fix crash-on-osx-on-shutdown bug. And cleanup CDB handling in Rewrite.
2011-11-15 14:30:24 -05:00
Gavin Andresen
709c1b267f
Fix boost filesystem incompatibility problem
2011-11-15 09:47:29 -05:00
Gavin Andresen
b6d11a3018
Merge pull request #635 from gavinandresen/encryptionbug
...
Prevent unencrypted private keys from being written to wallet.dat
2011-11-15 06:38:43 -08:00
Gavin Andresen
d764d9161e
Obsolete keypool and make sure database removes log files on shutdown.
2011-11-15 09:30:16 -05:00
Gavin Andresen
e6a729d2d8
Merge pull request #631 from luke-jr/free_icons
...
Free icons
2011-11-14 06:57:46 -08:00
Gavin Andresen
88a1b89452
Merge pull request #633 from laanwj/qtrpcconflict
...
RPC: do not launch Shutdown in a new thread in case we are running the UI
2011-11-14 06:56:57 -08:00
Gavin Andresen
6be6be2ed9
Tool/process for including correct qt translations in mac .App
2011-11-10 13:01:40 -05:00
Gavin Andresen
ba1fce94b5
Merge branch 'nullmodels' of https://github.com/laanwj/bitcoin
2011-11-10 10:30:24 -05:00
Gavin Andresen
5efee7da86
Release process doc fixes
2011-11-10 10:29:24 -05:00
Gavin Andresen
145b2d078e
Merge pull request #608 from TheBlueMatt/debian-build
...
Debian build
2011-11-10 07:27:46 -08:00
Gavin Andresen
d6245ca5d9
Mention Qt4 runtime dependencies
2011-11-07 12:11:11 -05:00
Gavin Andresen
a5f07cbea0
Static link on Linux. And better document release process on OSX.
2011-11-07 10:17:30 -05:00
Gavin Andresen
ab15ebaae8
Merge branch 'master' of github.com:bitcoin/bitcoin
2011-11-04 11:30:05 -04:00
Gavin Andresen
f6aacbfe6d
Mac releases use macdeployqtplus
2011-11-04 10:22:55 -04:00
Gavin Andresen
25e6573317
Merge pull request #604 from laanwj/winqt_deterministic
...
Make qt-win32 gitian build deterministic
2011-11-03 13:37:47 -07:00
Gavin Andresen
8c69b6621c
Merge git://github.com/p2k/bitcoin-qt
2011-11-03 11:06:57 -04:00
Gavin Andresen
434a483d50
Update documentation to reflect 0.5 reality. And removed leading $ from shell commands, so it is easier to copy and paste from release-process.txt.
2011-11-01 17:59:33 -04:00
Gavin Andresen
383ad8b8a6
Add notes on getting gitian builds going
2011-10-25 12:27:09 -04:00
Gavin Andresen
7ec064b88e
Update documentation to reflect reality (no win32 gitian builds, new Mac process)
2011-10-25 12:09:08 -04:00
Gavin Andresen
20601f3477
Merge pull request #592 from dooglus/qt-at-spi-bug
...
Warn about the qt-at-spi bug in Ubuntu 11.10.
2011-10-25 05:49:26 -07:00
Gavin Andresen
f9f289aba5
Merge pull request #584 from kwaaak/master
...
Make build work on Mac OS X 10.7 Lion
2011-10-24 11:29:57 -07:00
Gavin Andresen
d760b5c979
Merge pull request #586 from cjdelisle/hardening-bug-workaround
...
Added a workaround for an Ubuntu bug which causes -fstack-protector-all t
2011-10-24 11:29:32 -07:00
Gavin Andresen
cf908574cf
Merge pull request #591 from laanwj/translation_lookup_logic
...
Translation look-up logic improvements for Qt UI
2011-10-24 11:28:23 -07:00
Gavin Andresen
755e2819b0
Merge pull request #578 from luke-jr/bitcoind_build_improvements
...
Allow users to customize CXX, CXXFLAGS, and LDFLAGS normally
2011-10-10 13:57:47 -07:00
Gavin Andresen
e44a00ae0d
bitcoind does not need to link with gthread-2.0
2011-10-10 16:03:14 -04:00
Gavin Andresen
ef49d8a6ca
Add spanish translation to TRANSLATIONS
2011-10-10 11:25:51 -04:00
Gavin Andresen
e99b8eae65
Merge pull request #577 from paraipanakos/master
...
Spanish translation for new qt gui
2011-10-10 08:20:53 -07:00
Gavin Andresen
ab877a2dde
Merge pull request #576 from luke-jr/bitcoind_build_improvements
...
bitcoind build improvements
2011-10-10 08:20:28 -07:00
Gavin Andresen
b50ac8f73e
Mac OSX release process changes
...
Rename App Bundle "Bitcoin-Qt.app" instead of "Bitcoin Qt" for
consistency with Windows/Linux.
Update create_osx_dmg.sh script to use macdeployqt tool.
Add ifdef STATIC to makefile.osx to build bitcoind static or dynamic.
2011-10-10 11:13:32 -04:00
Gavin Andresen
eab61cd0b2
Merge branch 'master' of github.com:bitcoin/bitcoin
2011-10-09 13:36:10 -04:00
Gavin Andresen
4db9705dd8
Merge pull request #573 from luke-jr/bugfix_bits_string
...
Bugfix: getmemorypool "bits" should be a hex-string
2011-10-09 10:32:22 -07:00