Gavin Andresen
783c636c73
Merge pull request #467 from gavinandresen/keypoolzero
...
Logic running with -keypool=0 was wrong (empty keys were being returned).
2011-09-01 12:01:29 -07:00
Gavin Andresen
dd7868364d
Merge branch 'code-cleanup' of git://github.com/muggenhor/bitcoin
2011-09-01 11:52:07 -04:00
Gavin Andresen
ed02c95d50
obtain cs_wallet mutex to protect vchDefaultKey
2011-09-01 10:58:08 -04:00
Gavin Andresen
123e5bd998
Fix RPC call name in error message.
2011-09-01 10:12:59 -04:00
Gavin Andresen
7db3b75b3e
Logic running with -keypool=0 was wrong (empty keys were being returned). Fixes #445
...
Renames GetOrReuseKeyFromKeyPool to GetKeyFromPool, with fAllowReuse arg and bool result.
2011-09-01 10:12:59 -04:00
Gavin Andresen
f662cefd85
Merge pull request #470 from fabianhjr/master
...
Checkpoints
2011-09-01 06:58:14 -07:00
Gavin Andresen
e3c26b2573
SetCrypted() obtains keystore lock, to be safe.
2011-08-31 14:00:41 -04:00
Gavin Andresen
471426fb3b
Fixed potential deadlocks in GUI code.
...
Also changed semantics of CWalletTx::GetTxTime(); now always returns the time the transaction was received by this node, not the average block time.
And added information about -DDEBUG_LOCKORDER to coding.txt.
2011-08-31 12:55:16 -04: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
Gavin Andresen
b0243da77c
Highlight mis-matching locks
2011-08-31 12:53:57 -04: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
8af99d1893
Merge pull request #464 from TheBlueMatt/upnp1.6
...
Upgrade dependancies and tweak build process.
2011-08-31 09:16:56 -07:00
Wladimir J. van der Laan
f43f46c175
Merge branch 'master' of https://github.com/bitcoin/bitcoin
2011-08-31 17:06:38 +02:00
Wladimir J. van der Laan
6c85cbecf1
comments and readme update
2011-08-31 16:08:31 +02:00
Wladimir J. van der Laan
b7bcaf940d
Wallet encryption part 2: ask passphrase when needed, add menu options
2011-08-31 14:19:43 +02:00
Misbakh-Soloviev Vadim A
3f0816e3d9
add russian translation and add unicode compatibility (merges pull request #20 )
2011-08-28 14:14:29 +02:00
Gavin Andresen
829e21733b
CHECKMULTISIG unit tests.
2011-08-26 18:43:58 -04:00
Wladimir J. van der Laan
ae8adeb90a
Wallet encryption part 1: show wallet encryption status
2011-08-23 20:08:42 +02:00
Matt Corallo
b4ada906c0
Upgrade dependancies and tweak build process.
...
* Upgrade to use miniupnpc 1.6
* Upgrade to wxWidgets 2.9.2
* Upgrade to Bost 1.47 for Win32 Builds
2011-08-23 13:00:34 -04:00
Wladimir J. van der Laan
adce862c27
Merge branch 'master' of https://github.com/bitcoin/bitcoin
2011-08-22 14:43:37 +02:00
Giel van Schijndel
e4dde849ae
Move CInv to protocol.[ch]pp
...
This commit does *not* and should not modify *any* code, it only moves
it from net.h and splits it across protocol.cpp and protocol.hpp.
Signed-off-by: Giel van Schijndel <me@mortis.eu>
2011-08-19 07:24:38 +02:00
Giel van Schijndel
33e28c9948
Move CAddress to protocol.[ch]pp
...
This commit does *not* and should not modify *any* code, it only moves
it from net.h and splits it across protocol.cpp and protocol.hpp.
Signed-off-by: Giel van Schijndel <me@mortis.eu>
2011-08-19 07:24:38 +02:00
Giel van Schijndel
507fd9d15b
Start moving protocol-specific code to protocol.[ch]pp
...
Move CMessageHeader from net.h to protocol.[ch]pp, with the
implementation in the .cpp compilation unit (compiling once is enough).
This commit does *not* and should not modify *any* code, it only moves
it from net.h and splits it across protocol.cpp and protocol.hpp.
Indentation changes aside the closest thing to a modification of code is
the addition of the 'TODO' comment (the execution of which requires code
modifications and thus doesn't belong in this commit).
Signed-off-by: Giel van Schijndel <me@mortis.eu>
2011-08-19 07:24:38 +02:00
Giel van Schijndel
82dc6426b4
Move func 'REF' from util.h to serialize.h
...
util.h doesn't use REF, serialize.h does, creating a dependency of
serialize.h on util.h, but util.h already depends on serialize.h. To
resolve this circular dependency the function 'REF' has now been moved
closer to one of its two points of use.
Signed-off-by: Giel van Schijndel <me@mortis.eu>
2011-08-19 07:24:38 +02:00
Giel van Schijndel
e49b83bb12
Cleanup makefiles such that diffs to them are smaller
...
Signed-off-by: Giel van Schijndel <me@mortis.eu>
2011-08-19 07:24:37 +02:00
Giel van Schijndel
99860de3c9
Make some global variables less-global (static)
...
Explicitly make these global variables less-global to reduce the maximum
scope of this global state.
In my experience global variables tend to be a major source of bugs. As
such the less accessible they are the less likely they are to be the
source of a bug.
Signed-off-by: Giel van Schijndel <me@mortis.eu>
2011-08-19 07:24:37 +02:00
Gavin Andresen
865ed8a1e5
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
2011-08-17 10:22:28 -04:00
Wladimir J. van der Laan
317c733572
add russian translation by msva
2011-08-16 17:30:58 +02:00
Gavin Andresen
c7286112ef
Remove unused ScanMessageStart function
2011-08-16 11:20:56 -04:00
Jeff Garzik
b2fd0ca1cb
src/makefile.unix: remove -DFOURWAYSSE2
...
Spotted by Venkatesh Srinivas <me@endeavour.zapto.org>
2011-08-16 10:10:39 -04:00
Wladimir J. van der Laan
8c4738d5a7
fix issue #13
2011-08-16 11:18:27 +02:00
Wladimir J. van der Laan
b90c9ecb13
Merge branch 'master' of https://github.com/bitcoin/bitcoin
2011-08-16 10:28:24 +02:00
Fabian H jr.
d0d9486f44
Updated checkpoints, maybe Tx fee should be reduced to 0.0001 from 0.0005 and maximum minimum tx should be 0.0010.
2011-08-15 21:33:00 -03:00
Gavin Andresen
eb72eae304
Don't std::advance past beginning of transactions array. Fixes #465
2011-08-12 15:39:12 -04:00
Matt Corallo
8acb491eef
Fix incorrect RPC error messages
2011-08-11 19:41:21 +02:00
Gavin Andresen
498a2c9b16
Merge pull request #458 from TheBlueMatt/copyright
...
Unify copyright notices.
2011-08-11 10:34:29 -07:00
Wladimir J. van der Laan
0a76546ae9
Merge branch 'master' of https://github.com/bitcoin/bitcoin
2011-08-11 10:17:21 +02:00
Gavin Andresen
c648b589be
Merge pull request #459 from jgarzik/char-msgstart
...
Use 'unsigned char' rather than 'char' for pchMessageStart.
2011-08-10 20:01:37 -07:00
Gavin Andresen
72173ffaca
Merge pull request #460 from jgarzik/make-tuple
...
Qualify make_tuple with boost:: namespace.
2011-08-10 20:01:14 -07:00
Venkatesh Srinivas
25133bd74b
Use 'unsigned char' rather than 'char' for pchMessageStart.
...
Regarding https://bitcointalk.org/index.php?topic=28022.0
main.cpp has: "char pchMessageStart[4] = { 0xf9, 0xbe, 0xb4, 0xd9 };"
Per discussion on the thread linked, leaving the signedness of
pchMessageStart is unsafe for values > 0x80. This patch specifies
'unsigned char' in main.cpp and net.h.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2011-08-10 22:42:43 -04:00
Venkatesh Srinivas
7c3002bf27
Qualify make_tuple with boost:: namespace.
...
db.cpp has a number of uses of make_tuple and has 'using namespace
std' and 'using namespace boost'. Without qualifying make_tuple,
std::make_tuple is preferred, which is incorrect. This patch qualifies
make_tuple.
Signed-off-by: Jeff Garzik <jgarzik@exmulti.com>
2011-08-10 22:40:10 -04:00
Venkatesh Srinivas
ec93a0e219
Test for SO_NOSIGPIPE rather than assuming all BSDs support it.
...
Signed-off-by: Jeff Garzik <jgarzik@exmulti.com>
2011-08-10 22:36:20 -04:00
Gavin Andresen
9f0ac16942
Do-nothing MapPort() ifndef USE_UPNP. fixes #450
2011-08-09 12:38:17 -04: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
Matt Corallo
2c3691d53d
Cleanup test suite output to be more useful.
2011-08-08 14:31:08 -04:00
Matt Corallo
3c8cecda1f
Add file for transaction tests.
2011-08-08 14:31:08 -04:00
Vegard Nossum
a8330e0049
Add a file for script tests
2011-08-08 14:31:08 -04:00
Vegard Nossum
5f6a654d3e
Add prototype for EvalScript() to script.h
...
This is needed for the script unit tests.
2011-08-08 14:31:08 -04:00
Vegard Nossum
e707d29dd6
Fix testing setup
...
There were some problems with the existing testing setup:
- Makefile rules for test-file compilation used CFLAGS instead of
CXXFLAGS in makefile.unix
2011-08-08 14:31:08 -04:00
Matt Corallo
02962ba848
Add missing include to serialize.h
2011-08-08 14:31:08 -04:00
Vegard Nossum
8a62fec3ee
Add missing includes to net.h
2011-08-08 14:31:08 -04:00
Vegard Nossum
437173f430
Add missing include to script.h
2011-08-08 14:31:08 -04:00
Vegard Nossum
fcedd45c3c
Add missing includes to key.h
2011-08-08 14:31:07 -04:00
Gavin Andresen
4e5d88ce26
Merge pull request #443 from TheBlueMatt/dupin
...
Check for duplicate txins in CheckTransaction.
2011-08-08 11:16:40 -07:00
Wladimir J. van der Laan
b0849613bf
QtUI code cleanup / comment improvements
2011-08-08 17:38:17 +02:00
Wladimir J. van der Laan
fb390d3505
add TODOs in parseBitcoinURL
2011-08-07 17:07:04 +02:00
Wladimir J. van der Laan
c359ac9128
allow empty/missing amounts in URL
2011-08-07 16:17:02 +02:00
Wladimir J. van der Laan
856aacf388
don't include <QDebug>
2011-08-07 16:09:49 +02:00
Wladimir J. van der Laan
db7f023417
Accept "bitcoin:" URL drops from browsers
2011-08-07 16:04:48 +02:00
Wladimir J. van der Laan
330c190958
Merge branch 'master' of https://github.com/bitcoin/bitcoin
2011-08-06 18:45:15 +02:00
Wladimir J. van der Laan
e74e8a184a
reorganize transaction model data function, and transaction tooltip
2011-08-06 18:40:45 +02:00
Wladimir J. van der Laan
d4e3cb4c03
improve sync spinner
2011-08-05 20:32:26 +02:00
Wladimir J. van der Laan
00f4f8d54c
speling fix
2011-08-05 15:37:49 +02:00
Wladimir J. van der Laan
126185aaa7
improve tooltip over transactions
2011-08-05 15:35:52 +02:00
Wladimir J. van der Laan
ffccb56914
select new address immediately after creation
2011-08-04 21:36:14 +02:00
Jeff Garzik
bd1e54bc0b
Merge branch 'tmp2'
2011-08-04 15:22:05 -04: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
Wladimir J. van der Laan
2351a3fc9f
minimize amount of text in status bar; show only icons, if the user wants explanation they can view the tooltip
2011-08-04 19:04:42 +02:00
Wladimir J. van der Laan
1b39201966
when clicking a transaction on the overview page, send the user to the transactions page
2011-08-04 04:41:01 +02:00
Wladimir J. van der Laan
186f3e2f0c
Clarity: change definition of "confirmed" to "counts towards balance"
2011-08-04 04:40:01 +02:00
Matt Corallo
01a509fa26
Don't listen if on TOR ( resolves #441 ).
2011-08-03 22:16:29 +02:00
Wladimir J. van der Laan
2ccd47596b
fix drawing on gtk
2011-08-03 21:28:11 +02:00
Wladimir J. van der Laan
82303fc3ca
unconfirmed amount = grey
2011-08-03 21:04:15 +02:00
Matt Corallo
918150048a
Make it clear that setting proxy requires restart to fully apply.
2011-08-03 21:02:07 +02:00
Wladimir J. van der Laan
a99ac8d3f4
show last few transactions on overview page
2011-08-03 20:52:18 +02:00
Wladimir J. van der Laan
2566b30c38
make amount field the same width as decimals field
2011-08-03 14:06:13 +02:00
Pieter Wuille
4d2ef6e5b6
avoid strAddress + validity checks
...
Avoid references to addresses using strings, and use CBitcoinAddress
as much as possible. Also added some validity checks on addresses
entered using RPC.
2011-08-03 13:01:09 +02:00
Wladimir J. van der Laan
5762295ec3
update readme and splash screen text
2011-08-02 22:03:41 +02:00
Wladimir J. van der Laan
10d680cff4
add splash screen
2011-08-02 21:48:59 +02:00
Johannes Henninger
1565698169
Identify as "Bitcoin + version number" when mapping UPnP port
...
Makes Bitcoin identify itself as "Bitcoin + version number" instead of
the nondescript "libminiupnpc" when forwarding a port via UPnP.
2011-08-01 16:34:59 +02:00
Wladimir J. van der Laan
d8f5c59a59
show n/a for mined transactions (and send to self) instead of empty field
2011-07-31 17:43:46 +02:00
Wladimir J. van der Laan
05bcf7089e
address icons
2011-07-31 17:05:34 +02:00
Matt Corallo
33208fb557
Check for duplicate txins in CheckTransaction.
2011-07-31 14:20:10 +02:00
Wladimir J. van der Laan
dedf83a19b
Properly html-escape labels
2011-07-31 12:56:46 +02:00
Wladimir J. van der Laan
a5e1325879
comment update
2011-07-30 19:28:41 +02:00
Wladimir J. van der Laan
f0ec774d9c
make sure address book model is up to date after sending coins
2011-07-30 19:21:46 +02:00
Han Lin Yap
8c2143d4d8
Comment "deprecated"
2011-07-30 19:58:22 +03:00
Wladimir J. van der Laan
04f38adf73
Remove unused variable
2011-07-30 18:48:05 +02:00
Wladimir J. van der Laan
2f5d380943
Hide addresses in transaction overview by default, they can be re-shown as a configuration option
2011-07-30 17:42:02 +02:00
Wladimir J. van der Laan
1aafe34a08
Make dot in amount field more apparent
2011-07-30 17:01:31 +02:00
Wladimir J. van der Laan
19fba3cd24
Make debug info more interesting (show SHA160 addresses for inputs)
2011-07-29 23:11:40 +02:00
Wladimir J. van der Laan
3b59297b36
Remove no longer valid comment
2011-07-29 16:16:12 +02:00
Wladimir J. van der Laan
53d65b5500
Merge branch 'master' of https://github.com/bitcoin/bitcoin
2011-07-29 14:45:54 +02:00
Wladimir J. van der Laan
ee014e5b10
Full support for other units, add configuration option for default unit (used when displaying amounts)
2011-07-29 14:36:35 +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
Wladimir J. van der Laan
7df001be94
normalize SIGNAL/SLOT signatures ( http://marcmutz.wordpress.com/effective-qt/prefer-to-use-normalised-signalslot-signatures/ )
2011-07-27 20:54:10 +02:00
Wladimir J. van der Laan
384625c1a6
also accept numbers without dot/decimals for parsing, fixes transaction filter row
2011-07-27 20:52:00 +02:00
Matt Corallo
687c82558c
Fix EncryptKeys crash introduced by a9ba4710
, identified by TD.
2011-07-27 18:02:39 +02:00
Jeff Garzik
a139ed74f2
CAddrDB::LoadAddresses: properly initialize CAddress
...
Fixes issue #424
2011-07-26 15:15:55 -04: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
dd61035645
show amounts in <b>bold</b> in confirmation dialog
2011-07-26 17:37:26 +02:00
Wladimir J. van der Laan
690c723e5f
make SetHash160 return a value (as specified in the function signature)
2011-07-26 16:59:31 +02:00
Wladimir J. van der Laan
5326a31249
make SetHash160 return a value (as specified in the function signature)
2011-07-26 16:54:32 +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
Wladimir J. van der Laan
83c8d678aa
Reset unit to default when clearing the field, to prevent confusion
2011-07-26 13:31:59 +02:00
Wladimir J. van der Laan
f2b10f6469
refuse to format nor parse invalid units
2011-07-26 13:27:33 +02:00
Wladimir J. van der Laan
587e52855a
allow multiple units in bitcoin amount widget (for example, for sending) using a combobox
2011-07-26 13:08:34 +02:00
Wladimir J. van der Laan
ca1dbe10ed
Negative transaction color changed to red (was grey due to mistake)
2011-07-26 09:16:50 +02:00
JoelKatz
67ed7d9d49
Fix UNIX-specific thread handle leak.
2011-07-25 15:06:45 -07:00
Wladimir J. van der Laan
e780b94bd3
fix unit names (μBTC)
2011-07-25 22:28:12 +02:00
Wladimir J. van der Laan
e285ffcd05
preparations for multiple unit (uBTC, mBTC, BTC) support, fix amount entry issue
2011-07-25 21:38:54 +02:00
Wladimir J. van der Laan
bbae0fc9ef
put color constants in guiconstants.h
2011-07-25 18:39:52 +02: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
Wladimir J. van der Laan
daa1a7398f
better exit icon
2011-07-24 19:09:29 +02:00
Wladimir J. van der Laan
f5472574a7
make all tab icons blue/gray for more consistencyx
2011-07-24 18:32:21 +02:00
Wladimir J. van der Laan
591dcaf681
improve tooltip texts
2011-07-24 18:06:07 +02:00
Pieter Wuille
a7dd11c6da
Fix for small change outputs
...
With the separation of CENT and MIN_TX_FEE, it is now reasonable
to create change outputs between 0.01 and 0.0005, as these are
spendable according to the policy, even though they require a fee
to be paid.
Also, when enough fee was already present, everything can go into
a change output, without further increasing the fee.
2011-07-24 16:37:09 +02:00
Wladimir J. van der Laan
8a13456f3a
add windows program (.exe) icon
2011-07-24 15:53:27 +02:00
Wladimir J. van der Laan
1a925b8e60
Merge pull request #9 from celil-kj/master
...
allow decimals such as .05 for amount of bitcoins to send
2011-07-24 02:41:19 +02:00
Celil
2eac3a6dec
Allow ammount field to be empty so that one can specify .05 instead of
...
having to type the leading zero as in 0.05
2011-07-22 16:55:50 -07:00
Wladimir J. van der Laan
7beada58cd
Merge branch 'master' of https://github.com/bitcoin/bitcoin
2011-07-22 21:41:24 +02:00
Wladimir J. van der Laan
8b936b617f
Implement range... transaction filter
2011-07-22 18:30:25 +02:00
Wladimir J. van der Laan
73cd5e5212
fix clear() (clear red/invalid status)
2011-07-22 17:06:37 +02:00
Matt Corallo
643160f6e7
Actually use mapAlreadyAskedFor.
...
Previously, mapAlreadyAskedFor was read from, but never added to.
The original intent was to use mapAlreadyAskedFor to keep track
of the time an item was requested and "Each retry is 2 minutes
after the last".
This implements that intent.
2011-07-21 22:06:20 +02:00
Wladimir J. van der Laan
174b3eddc0
one remove/delete icon is enough and the red minus better matches the add icon
2011-07-18 21:02:17 +02:00
Wladimir J. van der Laan
8ea1c9a418
Merge branch 'notebook'
2011-07-18 18:50:35 +02:00
Wladimir J. van der Laan
68e327ae7b
move buttons to bottom of send coins tab, outside of scroll area
2011-07-18 18:39:49 +02:00
Wladimir J. van der Laan
24c835b0b6
windows build fix
2011-07-18 18:34:53 +02:00
Abraham Jewowich
03f8b54565
Fix bug with accessing vchData[0] when vchData is empty.
...
Fix typo in CBase58Data::CompareTo
2011-07-18 06:26:54 -07:00
Wladimir J. van der Laan
a75e1e3292
Fix "Last received block was generated Up to date"
2011-07-18 06:55:05 +02:00
Wladimir J. van der Laan
1907b96d69
put sendcoins entries in scroll area, so that window does not become bigger than screen with many recipients
2011-07-17 17:42:41 +02:00
Wladimir J. van der Laan
8dcffd4d07
show rotating spinner when block download out of date, tick otherwise
2011-07-17 17:31:37 +02:00
Wladimir J. van der Laan
5df0b03c95
make initial block download reporting somewhat better by tracking version responses
2011-07-17 14:17:13 +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
Wladimir J. van der Laan
9b9cd3dd20
add missing icon
2011-07-16 19:35:41 +02:00
Wladimir J. van der Laan
9958e09dbc
Revert "Now that send coins / receive coins etc are tabs, remove them from menu, and reorganize menu bar"
...
This reverts commit ea37fb9187
.
2011-07-16 19:28:15 +02:00
Wladimir J. van der Laan
a5e6d72339
add sendmany support
2011-07-16 19:25:02 +02:00
Eric Hosmer
88cab1e4a3
Added crypter to makefile.vc.
2011-07-15 23:38:46 -04:00
Wladimir J. van der Laan
d421117620
Merge branch 'master' of https://github.com/bitcoin/bitcoin
2011-07-15 16:42:44 +02:00
Wladimir J. van der Laan
19366be186
Merge remote-tracking branch 'satoshi/qtui'
...
Conflicts (resolved by copying files from remote branch):
.gitignore
src/cryptopp/cpu.cpp
src/cryptopp/cpu.h
src/cryptopp/cryptlib.h
src/cryptopp/iterhash.h
src/cryptopp/misc.h
src/cryptopp/secblock.h
src/cryptopp/sha.cpp
src/cryptopp/sha.h
src/cryptopp/smartptr.h
src/json/json_spirit_reader.cpp
src/json/json_spirit_value.cpp
src/json/json_spirit_writer.cpp
2011-07-15 15:12:17 +02:00
Wladimir J. van der Laan
a35ee96336
Add call to request unconfirmed balance
2011-07-15 15:09:49 +02:00
Wladimir J. van der Laan
ea37fb9187
Now that send coins / receive coins etc are tabs, remove them from menu, and reorganize menu bar
2011-07-15 14:55:21 +02:00
Celil
608810a3e7
Fix error when export is cancelled without specifying a filename.
2011-07-14 17:11:11 -07:00
Chris Howie
76aed0141c
listsinceblock now shows txns with 0 confirms, as well as allows the lastblock return property to be targeted to the block with the specified depth
2011-07-14 15:56:29 -04:00
Chris Howie
5b2f35167f
Add listsinceblock command for retrieving all wallet transactions in blocks after the specified block
2011-07-14 15:56:21 -04:00
Wladimir J. van der Laan
77b615ceba
solve warnings at startup
2011-07-14 21:21:17 +02:00