highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-11 01:33:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,726 Commits 8 Branches 348 Tags
367f2873bc14f57afa7b0f1b43d8b6fc3d404e2e
Commit Graph

111 Commits

Author SHA1 Message Date
Luke Dashjr
92dfcea0e9 Merge branch '0.6.0.x' into 0.6.x 2012-08-12 17:22:59 +00:00
Luke Dashjr
cafa8f2879 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/key.h
	src/keystore.h
	src/net.h
	src/protocol.cpp
	src/qt/guiutil.h
	src/test/DoS_tests.cpp
 2012-08-12 17:19:48 +00:00
Luke Dashjr
797d0b231b Merge branch '0.4.x' into 0.5.x 
Conflicts:
	src/net.cpp
 2012-08-12 17:02:38 +00:00
Luke Dashjr
9e98fe6f58 Bugfix: Fix a variety of misspellings 
(PARTIAL: Left out anything changing debug.log)
 2012-08-12 17:00:02 +00:00
Gavin Andresen
0ce74bfaa5 Use std::numeric_limits<> for typesafe INT_MAX/etc 
(this fixes a Mac OS X gitian build error for 0.5.x)
 2012-06-14 20:38:25 +00:00
Gavin Andresen
5cd2a640a5 Use std::numeric_limits<> for typesafe INT_MAX/etc 
(this fixes a Mac OS X gitian build error for 0.5.x)
 2012-06-14 19:52:31 +00:00
Luke Dashjr
a49927a46d Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/bitcoinrpc.h
	src/db.h
	src/headers.h
	src/init.cpp
	src/main.cpp
	src/main.h
	src/noui.h
	src/qt/bitcoin.cpp
	src/qt/locale/bitcoin_en.ts
	src/qt/walletmodel.cpp
	src/script.cpp
	src/ui_interface.h
	src/util.cpp
 2012-05-22 23:07:46 +00:00
Luke Dashjr
3b36da6d27 Merge branch '0.4.x' into 0.5.x 
Conflicts:
	src/ui.cpp
	src/ui.h
	src/uibase.cpp
	src/xpm/about.xpm
 2012-05-22 22:55:49 +00:00
Fordy
58ac600b2c Update License in File Headers 
I originally created a pull to replace the "COPYING" in crypter.cpp and
crypter.h, but it turned out that COPYING was actually the correct
file.
 2012-05-20 20:15:41 +00:00
Fordy
b2de28c740 Update License in File Headers 
I originally created a pull to replace the "COPYING" in crypter.cpp and
crypter.h, but it turned out that COPYING was actually the correct
file.
 2012-05-20 20:10:24 +00:00
Fordy
d11488abd0 Update License in File Headers 
I originally created a pull to replace the "COPYING" in crypter.cpp and
crypter.h, but it turned out that COPYING was actually the correct
file.
 2012-05-20 20:06:11 +00:00
Fordy
e10622d129 Update License in File Headers 
I originally created a pull to replace the "COPYING" in crypter.cpp and
crypter.h, but it turned out that COPYING was actually the correct
file.
 2012-05-20 20:00:26 +00:00
Jeff Garzik
3a05f1d2ce Always check return values of TxnBegin() and TxnCommit() 2012-05-18 00:04:18 +00:00
Jeff Garzik
738592a002 Always check return values of TxnBegin() and TxnCommit() 
PARTIAL, since d68dcf7 isn't backported (yet)
 2012-05-18 00:03:32 +00: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
Luke Dashjr
a93ab87787 Merge branch '0.4.x' into 0.5.x 
Conflicts:
	src/main.cpp
 2012-04-22 10:05:43 -04:00
Jeff Garzik
0c3aa881e2 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-17 14:59:32 -04:00
Jeff Garzik
774e9b6dbb 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-17 14:57:42 -04:00
Pieter Wuille
6b6aaa1698 Further reduce header dependencies 
This commit removes the dependency of serialize.h on PROTOCOL_VERSION,
and makes this parameter required instead of implicit. This is much saner,
as it makes the places where changing a version number can have an
influence obvious.
 2012-04-17 20:03:42 +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
Pieter Wuille
ed6d0b5f85 Remove headers.h 2012-04-17 20:00:55 +02:00
Luke Dashjr
79fc752b61 Merge branch '0.4.x' into 0.5.0.x 
Conflicts:
	src/keystore.h
 2012-04-15 21:05:54 -04:00
Wladimir J. van der Laan
1bdfa94a01 fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses] 2012-04-15 19:43:45 -04:00
Wladimir J. van der Laan
8460185dec fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses] 2012-04-15 19:43:41 -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
Wladimir J. van der Laan
da7bbd9dfd fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses] 2012-04-15 13:40:14 +02:00
Pieter Wuille
f8dcd5ca6f Use scoped locks instead of CRITICAL_BLOCK 2012-04-09 01:59:46 +02:00
Wladimir J. van der Laan
7cfbe1fee4 qtui.h/noui.h interface cleanup 
- rename wxMessageBox, remove redundant arguments to noui/qtui calls
- also, add flag to force blocking, modal dialog box for disk space warning etc
- clarify function naming
- no more special MessageBox needed from AppInit2, as window object is created before calling AppInit2
 2012-04-04 09:37:25 +02:00
Wladimir J. van der Laan
98e6175874 Update UI through async calls MainFrameRepaint and AddressBookRepaint instead of a timer. 
- Overall, this is better design
- This fixes problems with the address book UI not updating when the address book is changed through RPC
- Move Statusbar change detection responsibility to ClientModel
 2012-04-04 09:35:01 +02:00
Pieter Wuille
439e1497e1 Introduce explicit -walletupgrade option 
Do not automatically change the wallet format unless the user takes an
explicit action that implies an upgrade (encrypting, for now), or uses
-walletupgrade.

-walletupgrade optionally takes an integer argument: the client version
up to which upgrading is allowed. Without an argument, it is upgraded
to latest supported version. If an argument to -walletupgrade is
provided at the time the wallet is created, the new wallet will initially
not use features beyond that version.

Third, the current wallet version number is reported in getinfo.
 2012-03-22 23:47:29 +01:00
Luke Dashjr
7013cc3d97 Merge branch '0.4.x' into 0.5.0.x 2012-03-03 13:59:19 -05:00
Pieter Wuille
caad1add4f Free pwalletdbEncryption after encryping wallet 
Fixes a memory leak.
 2012-02-27 12:36:56 -05:00
Pieter Wuille
3a4d81724e Merge pull request #864 from sipa/fix_856 
Make compressed pubkeys require client >=0.5.99
 2012-02-19 18:21:19 -08:00
Pieter Wuille
fcfd7ff8f8 Free pwalletdbEncryption after encryping wallet 
Fixes a memory leak.
 2012-02-18 15:44:34 +01:00
Pieter Wuille
38067c18f8 Make compressed pubkeys require 0.6.0 2012-02-18 15:42:38 +01:00
Pieter Wuille
9976cf070f Move GenerateNewKey back to CWallet 2012-02-18 15:42:38 +01:00
Pieter Wuille
0b807a417f Add SetMinVersion to CWallet 2012-02-18 15:42:29 +01:00
Gavin Andresen
882164196e Update all copyrights to 2012 2012-02-07 11:28:30 -05:00
Gavin Andresen
922e8e2929 Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). 2012-01-13 10:22:23 -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
Wladimir J. van der Laan
bde280b9a4 Revert "Use standard C99 (and Qt) types for 64-bit integers" 
This reverts commit 21d9f36781.
 2011-12-21 22:33:19 +01:00
Dylan Noblesmith
96f1723bb1 Implement an mlock()'d string class for storing passphrases 
SecureString is identical to std::string except with secure_allocator
substituting for std::allocator. This makes casting between them
impossible, so converting between the two at API boundaries requires
calling ::c_str() for now.
 2011-12-20 18:42:30 -05:00
Luke Dashjr
21d9f36781 Use standard C99 (and Qt) types for 64-bit integers 2011-12-20 16:52:59 -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
26ce92b352 Use std::numeric_limits<> for typesafe INT_MAX/etc 2011-12-19 19:10:34 -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
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
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