Commit graph

2741 commits

Author SHA1 Message Date
Luke Dashjr fbf99a9cdc Merge branch 'checknewblock_0.6.0' into checknewblock
Conflicts:
	src/main.cpp
2012-07-11 04:24:58 +00:00
Wladimir J. van der Laan 232393e3bd Merge pull request #1569 from Diapolo/addressbookpage
replace some ugly code in addressbookpage.cpp
2012-07-10 05:38:31 -07:00
Gavin Andresen 4060d64fc9 Fix Qt build on OSX
Compiling boost::interprocess::message_queue against
boost 1.50 macports with -arch i386 (how releases are built,
for minimum download size and maximum compatibility) is failing:

src/qt/qtipcserver.cpp:37: error: no matching function for call to ‘boost::interprocess::message_queue_t<boost::interprocess::offset_ptr<void, int, long unsigned int, 0u> >::timed_receive(char (*)[257], long unsigned int, size_t&, unsigned int&, boost::posix_time::ptime&)’

This is probably a boost or macports bug, but since interprocess::message_queue
is only used for URI support, which isn't implemented on OSX anyway, I fixed
the build by #ifdef'ing out that code.
2012-07-09 11:03:38 -04:00
Philip Kaufmann ddadf791f1 replace some ugly code in addressbookpage.cpp
- add signals signMessage() and verifyMessage() in addressbookpage.cpp
- connect to them in bitcoingui.cpp to switch to the corresponding tab in the Sign/Verify Message dialog
- make gotoSignMessageTab() and gotoVerifyMessageTab() private slots
2012-07-08 18:49:07 +02:00
Wladimir J. van der Laan ea53f183fc Merge pull request #1464 from Diapolo/GUI_showSSLVersion
GUI: show used OpenSSL library version in debug window
2012-07-08 01:19:32 -07:00
Philip Kaufmann c7441658da show used OpenSSL library version in debug window 2012-07-07 16:43:46 +02:00
Pieter Wuille 9af3c3c824 Merge pull request #1566 from Diapolo/typo
fix typo in optionsmodel.cpp
2012-07-07 07:41:51 -07:00
Philip Kaufmann 0e3947ef32 fix typo in optionsmodel.cpp 2012-07-07 16:35:29 +02:00
Pieter Wuille 0ba5bacd0c Merge pull request #1565 from jrmithdobbs/socks5-fix
Fix OBO in socks5 auth proposal.
2012-07-07 07:19:53 -07:00
Douglas Huff b19811d5f4 Fix OBO in socks5 auth proposal. This fixes compatibility with openssh's socks5 proxy and tor's .2.3.x branch. 2012-07-07 09:11:54 -05:00
Wladimir J. van der Laan 249856d557 Merge pull request #1469 from Diapolo/signverifymessagedialog
GUI: merge sign/verify message into a single window with tabbed UI
2012-07-07 04:59:04 -07:00
Wladimir J. van der Laan 520198138a Merge pull request #1518 from Diapolo/qrcodedialog
update QRCodeDialog
2012-07-07 04:46:03 -07:00
Wladimir J. van der Laan 08492c952b Merge pull request #1552 from Diapolo/txdesc
GUI: enhance translation possibilities in TransactionDesc / misc other changes
2012-07-07 04:44:50 -07:00
Wladimir J. van der Laan 9502ee3b5f Merge pull request #1559 from sje397/BalanceSignalFix
Add a timer to check for changes in immature or unconfirmed balances,
2012-07-07 04:37:03 -07:00
Philip Kaufmann 5c83f797c5 update QRCodeDialog
- remove unused #include <QDebug> and lblBTC label
- update Bitcoin input field to a BitcoinAmountField to allow Bitcoin unit selection
- use BitcoinUnits::format for the resulting amount parameter in the generated URI (always use BTC as per BIP21)
- move MAX_URI_LENGTH and EXPORT_IMAGE_SIZE to guiconstants.h
- add OptionsModel in AddressBookPage and use it in on_showQRCode_clicked() to pass it to QRCodeDialog
- add OptionsModel in QRCodeDialog to enable display unit updates
- add updateDisplayUnit() slot to be able to imediately update currently set bitcoin unit
- make all labels in the UI-file plain text
- resize dialog to match for an updated layout (fields are now stacked and new field)
- remove unused parameters from private slots
- only enable save button, when QR Code was generated
- show message when entered amound is invalid
- add read-only QPlainTextEdit field to output generated URI
2012-07-06 18:51:30 +02:00
Gavin Andresen 2a919e396d Warn if blockchain majority doesn't match CBlock::CURRENT_VERSION
This adds a warning "this version is obsolete, upgrade required" if
more than 50 of the previous 100 blocks in the blockchain are
a new version.
2012-07-06 11:37:01 -04:00
Gavin Andresen dae3e10a5a Treat non-version-1 transactions as non-standard
Adds CBlock::CURRENT_VERSION and CTransaction::CURRENT_VERSION
constants, and makes non-CURRENT_VERSION transactions nonstandard.
This will help make future upgrades smoother.
2012-07-06 11:37:01 -04:00
Philip Kaufmann 47894585ae GUI: merge sign/verify message into a single window with tabbed UI
- add UI-feedback via QValidatedLineEdit
- copy button for generated signature was moved to the signature output field
- add an addressbook button to verify message tab
- input fields are now evenly ordered for sign and verify tabs
- update FIRST_CLASS_MESSAGING support to ensure a good UX
- add a button and context menu entry in addressbook for verify message (to be consistent with sign message)
- focus is now only set/changed, when clearing input fields or adding an address via addressbook
- re-work / update some strings
- ensure model gets initialized in the SignVerifyMessageDialog constructor
- add checks for a valid model to both addressbook buttons
- remove unneeded includes for Qt GUI elements that are listed in ui_signverifymessagedialog.h anyway
2012-07-06 11:31:27 +02:00
Jeff Garzik 6e3a1a3742 Merge pull request #1304 from rebroad/ShowBlockTimestamp
Show block timestamp
2012-07-05 15:28:42 -07:00
Jeff Garzik 698b9f3095 bitcoinrpc.cpp: Removed outdated comment
Fixes #1373
2012-07-05 18:18:15 -04:00
Gavin Andresen 50fc02d063 Merge branch 'uri' of https://github.com/TheBlueMatt/bitcoin 2012-07-05 16:38:12 -04:00
Gavin Andresen dab9fa7f91 Use unsigned ints to fix signed/unsigned warnings 2012-07-05 13:26:27 -04:00
Jeff Garzik b47d2bc164 Merge pull request #1554 from jgarzik/dup-gethash
Remove duplicate GetHash() in ConnectBlock
2012-07-05 10:06:55 -07:00
Scott Ellis 6c83a8419b Add a timer to check for changes in immature or unconfirmed balances,
when these are non-zero. Fixed a minor mem leak.
2012-07-06 03:05:35 +10:00
Gavin Andresen a2709fad7f Implement raw transaction RPC calls
Implement listunspent / getrawtransaction / createrawtransaction /
signrawtransaction, to support creation and
signing-on-multiple-device multisignature transactions.
2012-07-05 12:50:09 -04:00
Gavin Andresen 899d373b3c RPCTypeCheck method to make type-checking JSON Arrays easier. 2012-07-05 12:42:25 -04:00
Gavin Andresen 34420d655d Refactor: SignSignature/VerifyScript
Minor refactor to support signrawtx signing/verifying transactions
when it might only have the previous transaction's txid and
txOut.
2012-07-05 12:42:25 -04:00
Gavin Andresen 9a6ab7f142 Rework gettransaction / getblock RPC calls
This PULL reworks new (post-0.6.*) features of the
gettransaction/getblock RPC calls as follows:

It removes the 'decompositions' object argument from getblock,
replacing it just a list of transaction hashes; equivalent
(I believe) of passing the {"tx":"hash"} decomposition.

It replaces the 'decompositions' object argument of
gettransaction with a boolean flag; if true, returns
the same stuff that the {"script":"obj"} decomposition
would return (txins/txouts as hex, disassembled, and bitcoin
addresses).

It adds a "rawtx" field to the output of gettransaction,
that is the entire transaction serialized and hex-encoded.

It removes the "size" field from gettransaction, since the size
is trivial to compute from the "rawtx" field (either take the
length after hex-decoding, or just compute it as hex-length/2).
2012-07-05 12:42:25 -04:00
Jeff Garzik fe70b09c42 Merge pull request #1555 from TheBlueMatt/warnings
Fix remaining compile warnings.
2012-07-04 08:34:11 -07:00
Gavin Andresen 8a05341cf5 Merge branch 'buildupdates' of https://github.com/TheBlueMatt/bitcoin 2012-07-04 10:46:44 -04:00
Matt Corallo 24154ed64b Fix remaining warnings. 2012-07-04 16:40:16 +02:00
Jeff Garzik f77654a0e9 CTxMemPool: eliminate redundant lock, GetHash() call
::addUnchecked()'s only caller already takes the necessary lock,
and has already calculated the TX's hash.
2012-07-04 01:12:44 -04:00
Matt Corallo 96929a5515 Remove duplicate GetHash() in ConnectBlock 2012-07-04 00:04:57 -04:00
Jeff Garzik c729dbb6d2 Merge pull request #1512 from jgarzik/json-batch
Support JSON-RPC 2.0 request batches
2012-07-03 20:08:36 -07:00
Jeff Garzik 613389019e RPC: add support for JSON-RPC 2.0-style request batching
If the top-level object is an array, it is assumed to be an array of
JSON-RPC requests.  An array is returned, containing one response (error or
not) per request, in the order submitted.

In a slight change in semantics, batched requests -always- return
an HTTP 200 OK status, even ones full of invalid or incorrect requests.
2012-07-03 22:53:57 -04:00
Jeff Garzik c6494d82fa RPC: break out high level JSON-RPC req/resp into their own functions
This prepares for JSON-RPC 2.0 batches.
2012-07-03 22:53:30 -04:00
Jeff Garzik 3898609304 Merge pull request #1546 from gmaxwell/allowsamenetinbound
Do not consider inbound peers for outbound network group exclusion.
2012-07-03 19:51:08 -07:00
Jeff Garzik 3ee48ba20a Merge pull request #1548 from TheBlueMatt/warnings
Fix signed/unsigned warnings in {script,serialize}.h (fixes #1541)
2012-07-03 19:50:06 -07:00
Matt Corallo 4d9c55da72 Work around a distcc bug where -MMD output isn't copied. 2012-07-03 17:50:35 +02:00
Philip Kaufmann b7506b302d enhance translation possibilities in TransactionDesc / misc other changes
- remove "#include <QString>" as this is included in the header
- add some missing plural forms that can be translated
- change "yours" into "own address", which is easier to understand and translate in that context
- cleanup translatable strings to not include HTML or unneeded chars (e.g. ":")
- resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:38:03 +02:00
Matt Corallo 467b79391f Fix signed/unsigned warnings in {script,serialize}.h (fixes #1541) 2012-07-02 16:29:14 +02:00
Jeff Garzik da1103f4f8 Merge pull request #1545 from TheBlueMatt/diffsendbuffer
Minor send buffer changes
2012-07-01 18:17:34 -07:00
Gregory Maxwell 19521acfa4 Do not consider inbound peers for outbound network group exclusion.
Bitcoin will not make an outbound connection to a network group
(/16 for IPv4) that it is already connected to. This means that
if an attacker wants good odds of capturing all a nodes outbound
connections he must have hosts on a a large number of distinct
groups.

Previously both inbound and outbound connections were used to
feed this exclusion. The use of inbound connections, which can be
controlled by the attacker, actually has the potential of making
sibyl attacks _easier_: An attacker can start up hosts in groups
which house many honest nodes and make outbound connections to
the victim to exclude big swaths of honest nodes. Because the
attacker chooses to make the outbound connection he can always
beat out honest nodes for the consumption of inbound slots.

At _best_ the old behavior increases attacker costs by a single
group (e.g. one distinct group to use to fill up all your inbound
slots), but at worst it allows the attacker to select whole
networks you won't connect to.

This commit makes the nodes use only outbound links to exclude
network groups for outbound connections. Fancier things could
be done, like weaker exclusion for inbound groups... but
simplicity is good and I don't believe more complexity is
currently needed.
2012-07-01 20:42:47 -04:00
Jeff Garzik 18e8e43715 RPC getpeerinfo: s/height/startingheight/ for returned nStartingHeight value 2012-06-30 23:40:26 -04:00
Matt Corallo 6d6c2afb2b Change default send buffer to 1Mb. 2012-07-01 04:17:26 +02:00
Matt Corallo 3c3cb60a90 Remove useless high-volume printf (fixes #1544). 2012-07-01 04:13:00 +02:00
Jeff Garzik eca96d7118 Merge pull request #1540 from fanquake/master
Fix a Couple Typos
2012-06-30 07:25:32 -07:00
fanquake 7790f391ab Fix a couple more typos 2012-06-30 17:05:28 +08:00
Wladimir J. van der Laan b5ec1da9e9 Merge pull request #1539 from cardpuncher/patch-3
Fix a typo in TransactionDesc
2012-06-30 01:56:29 -07:00
cardpuncher eb9a21afed Fix a typo in TransactionDesc 2012-06-30 11:31:09 +03:00