aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* test: Fix warning about integer signedness in P2SH testsWladimir J. van der Laan2014-06-301-1/+1
|
* Merge pull request #4415Wladimir J. van der Laan2014-06-301-79/+104
|\ | | | | | | e35b37b RPC client: Simplify command line string-to-JSON-value conversion code (Jeff Garzik)
| * RPC client: Simplify command line string-to-JSON-value conversion codeJeff Garzik2014-06-261-79/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | By default, all command line parameters are converted into JSON string values. There is no need to manually specify the incoming type. A binary decision "parse as string or JSON?" is all that's necessary. Convert to a simple class, initialized at runtime startup, which offers a quick lookup to answer "parse as JSON?" conversion question. Future parameter conversions need only to indicate the method name and zero-based index of the parameter needing JSON parsing.
* | Fix the build for Qt5Wladimir J. van der Laan2014-06-301-1/+1
| | | | | | | | | | Merging #3883 broke the Qt5 build, define the color in the standard way.
* | Merge pull request #3883 from dgenr8/first_double_spendGavin Andresen2014-06-3021-38/+296
|\ \ | | | | | | Relay and alert user to double spends
| * | Formatting, spelling, comment fixes.Tom Harding2014-06-276-18/+23
| | |
| * | Add release notes entryTom Harding2014-06-271-0/+46
| | |
| * | Add -respendnotify option and new RPC dataTom Harding2014-06-274-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -respendnotify=<cmd> Execute command when a network tx respends wallet tx input (%s=respend TxID, %t=wallet TxID) Add respendsobserved array to gettransaction, listtransactions, and listsinceblock RPCs. This omits the malleated clones that are included in the walletconflicts array. Add RPC help for respendsobserved and walletconflicts (help was missing for the latter).
| * | UI to alert of respend attempt affecting wallet.Tom Harding2014-06-279-21/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Respend transactions that conflict with transactions already in the wallet are added to it. They are not displayed unless they also involve the wallet, or get into a block. If they do not involve the wallet, they continue not to affect balance. Transactions that involve the wallet, and have conflicting non-equivalent transactions, are highlighted in red. When the conflict first occurs, a modal dialog is thrown. CWallet::SyncMetaData is changed to sync only to equivalent transactions. When a conflict is added to the wallet, counter nConflictsReceived is incremented. This acts like a change in active block height for the purpose of triggering UI updates.
| * | Relay double-spends, subject to anti-DOSTom Harding2014-06-276-15/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows network wallets and other clients to see transactions that respend a prevout already spent in an unconfirmed transaction in this node's mempool. Knowledge of an attempted double-spend is of interest to recipients of the first spend. In some cases, it will allow these recipients to withhold goods or services upon being alerted of a double-spend that deprives them of payment. As before, respends are not added to the mempool. Anti-Denial-of-Service-Attack provisions: - Use a bloom filter to relay only one respend per mempool prevout - Rate-limit respend relays to a default of 100 thousand bytes/minute - Define tx2.IsEquivalentTo(tx1): equality when scriptSigs are not considered - Do not relay these equivalent transactions Remove an unused variable declaration in txmempool.cpp.
| * | CBloomFilter::clear() methodTom Harding2014-06-273-0/+13
| | |
* | | Merge pull request #4420 from sipa/skiplistGavin Andresen2014-06-305-2/+163
|\ \ \ | | | | | | | | Add a skiplist to the CBlockIndex structure.
| * | | Add skiplist unit testsPieter Wuille2014-06-292-0/+46
| | | |
| * | | Add a skiplist to the CBlockIndex structure.Pieter Wuille2014-06-292-2/+69
| | | | | | | | | | | | | | | | | | | | This allows fast (O(log n)) access to far predecessor blocks. Use it to speed up CChain::FindFork and CChain::GetLocator.
| * | | Track peers' available blocksPieter Wuille2014-06-293-0/+48
| | | |
* | | | Merge pull request #4437Wladimir J. van der Laan2014-06-305-245/+316
|\ \ \ \ | | | | | | | | | | | | | | | de79aaa Move non-trivial uint256.h methods to uint256.cpp (Pieter Wuille)
| * | | | Move non-trivial uint256.h methods to uint256.cppPieter Wuille2014-06-285-245/+316
| | |_|/ | |/| |
* | | | Merge pull request #4440Wladimir J. van der Laan2014-06-303-23/+29
|\ \ \ \ | |_|/ / |/| | | | | | | 16f33f1 fix RPC error replies (kazcw)
| * | | fix RPC error replieskazcw2014-06-283-23/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After pull #4288, RPC messages indicating errors have a Content-Length unrelated to their actual contents, rendering bitcoin-cli and curl unable to decode the reply. This patch sets the Content-Length field based on the actual content returned. Additionally, pull #4288 clobbered the error descriptions provided in ErrorReply, which bitcoin-cli relies upon; this patch moves #4288 http-error descriptions to an HTTPError method, allowing HTTPReply to pass content on unchanged.
* | | | Merge pull request #4441Wladimir J. van der Laan2014-06-292-5/+5
|\ \ \ \ | |/ / / |/| | | | | | | ffebc1b Update verify.sh script to point to bitcoin.org (Michael Ford)
| * | | Update verify.sh script to point to bitcoin.orgMichael Ford2014-06-292-5/+5
|/ / / | | | | | | | | | | | | Now that downloads are no longer hosted on Sourceforge, update the script to retrieve the binaries and signature file from bitcoin.org.
* | | Merge pull request #4436Wladimir J. van der Laan2014-06-281-2/+2
|\ \ \ | | | | | | | | | | | | 675bcd5 Correct comment for 15-of-15 p2sh script size (Michael Ford)
| * | | Correct comment for 15-of-15 p2sh script sizeMichael Ford2014-06-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original comment forgets to account for the script push which will need an OP_PUSHDATA2 + 2-bytes for the 513 script bytes. props davecgh fixes #4224
* | | | Merge pull request #4425Wladimir J. van der Laan2014-06-281-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | 6ecf3ed Display unknown commands received. (R E Broadley)
| * | | | Display unknown commands received.R E Broadley2014-06-281-0/+1
| | |_|/ | |/| |
* | | | Merge pull request #4398Wladimir J. van der Laan2014-06-2810-46/+74
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 86fe1b8 update coding.md to reflect changes by pull (Philip Kaufmann) e10dcf2 ensure clean and consistent "namespace" usage (Philip Kaufmann)
| * | | | update coding.md to reflect changes by pullPhilip Kaufmann2014-06-261-27/+48
| | | | | | | | | | | | | | | | | | | | - also mention alphabetical include ordering
| * | | | ensure clean and consistent "namespace" usagePhilip Kaufmann2014-06-269-19/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove some missplaced ; - ensure end of a namespace is clearly visible - use same formatting when using namespace
* | | | | Merge pull request #4418Wladimir J. van der Laan2014-06-281-7/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d618965 Add note about PPA to build instructions (Drak) e5f0247 Simplify build instructions (Drak)
| * | | | | Add note about PPA to build instructionsDrak2014-06-281-1/+1
| | | | | |
| * | | | | Simplify build instructionsDrak2014-06-261-6/+3
| | | | | |
* | | | | | Merge pull request #4422Wladimir J. van der Laan2014-06-284-13/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 645d497 Replace HexBits with strprintf (jtimon)
| * | | | | | Replace HexBits with strprintfjtimon2014-06-284-13/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #4435Wladimir J. van der Laan2014-06-281-12/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | 92ddf2c Update OS X build instructions (Michael Ford)
| * | | | | Update OS X build instructionsMichael Ford2014-06-281-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update OpenSSL version Homebrew is now the preferred dependancy manager
* | | | | | Merge pull request #3990Wladimir J. van der Laan2014-06-281-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | 0dd5d3a Show only one zero instead of many when getblocks request received with a hashStop of uint256(0) (R E Broadley)
| * | | | | Show only one zero instead of many when getblocks request received with a ↵R E Broadley2014-06-281-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | hashStop of uint256(0)
* | | | | Merge pull request #4434Wladimir J. van der Laan2014-06-282-0/+414
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 3f1ea91 doc: Add historical release notes for 0.9.2 (Michael Ford)
| * | | | | doc: Add historical release notes for 0.9.2Michael Ford2014-06-282-0/+414
|/ / / / / | | | | | | | | | | | | | | | Also includes 0.9.2.1
* | | | | Merge pull request #4430Wladimir J. van der Laan2014-06-271-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | 33c62c9 set shutdown title to main window title (Philip Kaufmann)
| * | | | set shutdown title to main window titlePhilip Kaufmann2014-06-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - this ensures we don't show Bitcoin-Qt as that is still our internal application name - fixes #4427
* | | | | Merge pull request #4365 from gavinandresen/relax_isstandardGavin Andresen2014-06-273-66/+97
|\ \ \ \ \ | |/ / / / |/| | | | Relax IsStandard rules for pay-to-script-hash transactions
| * | | | Relax IsStandard rules for pay-to-script-hash transactionsGavin Andresen2014-06-233-66/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relax the AreInputsStandard() tests for P2SH transactions -- allow any Script in a P2SH transaction to be relayed/mined, as long as it has 15 or fewer signature operations. Rationale: https://gist.github.com/gavinandresen/88be40c141bc67acb247 I don't have an easy way to test this, but the code changes are straightforward and I've updated the AreInputsStandard unit tests.
* | | | | Merge pull request #4208Wladimir J. van der Laan2014-06-274-5/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 6a5c124 [Qt] don't allow translation of our example btc address (Philip Kaufmann)
| * | | | | [Qt] don't allow translation of our example btc addressPhilip Kaufmann2014-06-234-5/+6
| | | | | |
* | | | | | Merge pull request #4426Wladimir J. van der Laan2014-06-272-5/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 40a158e minor code format fix in rpc-related files (Philip Kaufmann)
| * | | | | | minor code format fix in rpc-related filesPhilip Kaufmann2014-06-272-5/+3
|/ / / / / /
* | | | | | rpc-tests: Fix rpcbind_test after 0193fb8Wladimir J. van der Laan2014-06-271-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port number for RPC is no longer static as multiple tests could be running at once.
* | | | | | Merge pull request #4288Wladimir J. van der Laan2014-06-274-71/+99
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed5769f Move AcceptedConnection class to rpcserver.h. (Jeff Garzik) 854d013 RPC code movement: separate out JSON-RPC execution logic from HTTP server logic (Jeff Garzik) c912e22 RPC cleanup: Improve HTTP server replies (Jeff Garzik)
| * | | | | | Move AcceptedConnection class to rpcserver.h.Jeff Garzik2014-06-273-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, add parens to HTTPReply() to assist readability.