cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-18 11:29:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,786 Commits 8 Branches 349 Tags
Commit Graph

56 Commits

Author SHA1 Message Date
Luke Dashjr
c195ef0b5c Merge branch '0.6.0.x' into 0.6.x 2012-08-12 17:36:55 +00:00
Luke Dashjr
4fb6e53968 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	doc/unit-tests.txt
 2012-08-12 17:35:44 +00:00
Luke Dashjr
8ddc257a4b Merge branch '0.4.x' into 0.5.x 2012-08-12 17:33:03 +00:00
Luke Dashjr
448f6b3d9b Bugfix: Correct English grammar regarding "'s" 2012-08-12 17:30:36 +00:00
Luke Dashjr
92dfcea0e9 Merge branch '0.6.0.x' into 0.6.x 2012-08-12 17:22:59 +00:00
Luke Dashjr
3171daef6c Bugfix: Fix a variety of misspellings 2012-08-12 17:22:48 +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
23e7583a8c Merge branch '0.6.x' of git://gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable into 0.6.3 2012-06-19 16:34:10 -04:00
Gavin Andresen
fcbeaff8d0 Move signature cache from CKey::Verify to CheckSig in script.cpp 
More than doubles the speed of verifying already-cached signatures
that use compressed pubkeys:
Before: ~200 microseconds
After:  ~80 microseconds
(no caching at all: ~3,300 microseconds per signature)

Also encapsulates the signature cache code in a class
and fixes a signed/unsigned comparison warning.
 2012-06-19 15:36:34 -04: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
Gavin Andresen
08e663d7e2 Undo part of c2e8c8ac to fix issue#1148 2012-04-26 10:18:35 -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
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
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
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
Pieter Wuille
ed6d0b5f85 Remove headers.h 2012-04-17 20:00:55 +02:00
Wladimir J. van der Laan
0aa0bb1ead fix warnings: unused variable 'XX' [-Wunused-variable] 2012-04-15 19:40:58 -04:00
Wladimir J. van der Laan
11cd416525 fix warnings: unused variable 'XX' [-Wunused-variable] 2012-04-15 13:40:14 +02:00
Luke Dashjr
2ac8af4534 Merge branch '0.4.x' into 0.5.0.x 
Conflicts:
	src/main.cpp
 2012-03-21 13:49:00 -04:00
Luke Dashjr
2f2ac3fece Minimal support for validating BIP16 pay-to-script-hash transactions 
Note this does NOT include accepting them in blocks (making them standard)
 2012-03-20 15:34:43 -04:00
Gavin Andresen
882164196e Update all copyrights to 2012 2012-02-07 11:28:30 -05:00
Gavin Andresen
39f0d96860 Make transactions with extra data in their scriptSig's non-standard. 2012-01-19 13:30:54 -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
d11a58a2d3 Remove not-used-anywhere scriptPrereq from SignSignature() 2012-01-13 10:20:42 -05:00
coderrr
6ec76ca09e make sure IsMine only returns true when we own all keys 2012-01-03 06:24:52 +07:00
Wladimir J. van der Laan
89772f932a Fix OP_EVAL recursion depth counting 2011-12-27 10:02:28 +01: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
9e470585b3 Update bitcoin address numbers for latest luke-jr/sipa scheme 2011-12-19 13:24:51 -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
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
Gavin Andresen
7e55c1ab65 Collapse no-op ExtractAddress/ExtractAddressInner 2011-12-19 12:39:47 -05:00
Wladimir J. van der Laan
7a15d4ff67 Merge branch 'master' of https://github.com/bitcoin/bitcoin 
Conflicts:
	src/main.cpp
 2011-09-02 17:35:30 +02:00
Gavin Andresen
6cc4a62c0e Fix rpc-hanging deadlocks 
Collapsed multiple wallet mutexes to a single cs_wallet, to avoid deadlocks with wallet methods that acquired locks in different order.
Also change master RPC call handler to acquire cs_main and cs_wallet locks before executing RPC calls; requiring each RPC call to acquire the right set of locks in the right order was too error-prone.
 2011-08-31 12:55:16 -04:00
Wladimir J. van der Laan
b90c9ecb13 Merge branch 'master' of https://github.com/bitcoin/bitcoin 2011-08-16 10:28:24 +02:00
Matt Corallo
b2120e223a Unify copyright notices. 
To a variation on:
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2011 The Bitcoin developers
 2011-08-09 13:32:52 +02:00
Wladimir J. van der Laan
b5b1d1a66b Merge branch 'master' of https://github.com/bitcoin/bitcoin 
Conflicts:
	src/script.cpp
 2011-07-27 21:44:55 +02:00
Pieter Wuille
b63241d451 Bugfix: don't overuse limited ExtractAddress 
ExtractAddress was called with the keystore as argument in RPC and
UI, limiting results to own keys. This caused empty "address"
fields.
 2011-07-26 19:41:47 +02:00
Wladimir J. van der Laan
491ad6db50 Merge remote branch 'upstream/master' 
Conflicts:
	src/bitcoinrpc.cpp
 2011-07-26 16:47:23 +02:00
Pieter Wuille
cb61b8dc4c split off CBase58Data from CBitcoinAddress 
Split off features unrelated to addresses from CBitcoinAddress to
CBase58Data, so they can be reused.
 2011-07-17 12:09:17 +02:00
Pieter Wuille
2ffba736e9 Use CBitcoinAddress instead of string/uint160 
Instead of conversion functions between pubkey/uint160/address in
base58.h, have a fully fledged class CBitcoinAddress (CAddress was
already taken) to represent addresses.
 2011-07-17 12:09:14 +02:00
Pieter Wuille
03fbd79049 get rid of mapPubKeys 
Make CKeyStore's interface work on uint160's instead of pubkeys, so
no separate global mapPubKeys is necessary anymore.
 2011-07-17 12:07:59 +02:00
Giel van Schijndel
225f222c9f fix warning: X enumeration values not handled in switch [-Wswitch-enum] 
Add default cases to opcode switches to assert that they should never
occur.

Signed-off-by: Giel van Schijndel <me@mortis.eu>
 2011-07-13 05:10:15 +02:00
Pieter Wuille
0efda1a79e Do not use obsolete CPrivKey for passing keys around 2011-07-13 02:11:25 +02:00