aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5554Wladimir J. van der Laan2014-12-291-1/+1
|\ | | | | | | 244fdc7 Fix typo (Julian Yap)
| * Fix typoJulian Yap2014-12-281-1/+1
| |
* | Merge pull request #5558Wladimir J. van der Laan2014-12-291-1/+1
|\ \ | |/ |/| | | 99913f0 Fix reference. (Thomas Zander)
| * Fix reference.Thomas Zander2014-12-281-1/+1
|/ | | | The text talked about "Quit" while Bitcoin uses "Exit" in its menu.
* Merge pull request #5493Wladimir J. van der Laan2014-12-2718-37/+198
|\ | | | | | | 9b7d3fb Adopt style colour for button icons (Luke Dashjr)
| * Adopt style colour for button iconsLuke Dashjr2014-12-2718-37/+198
|/
* Merge pull request #5547Wladimir J. van der Laan2014-12-271-0/+0
|\ | | | | | | de779b3 [Qt] new icon for the debug window (Jonas Schnelli)
| * [Qt] new icon for the debug windowJonas Schnelli2014-12-271-0/+0
|/
* Merge pull request #5272Wladimir J. van der Laan2014-12-271-15/+20
|\ | | | | | | 13f9031 init: minor parameter interaction updates (Philip Kaufmann)
| * init: minor parameter interaction updatesPhilip Kaufmann2014-11-131-15/+20
| | | | | | | | | | | | | | | | - use __func__ instead of hard-coded function name for logging - update -discover help message to reflect newly added parameter interaction - use DEFAULT_LISTEN in a parameter interaction check instead a hard coded value
* | Merge pull request #5533Wladimir J. van der Laan2014-12-272-3/+3
|\ \ | | | | | | | | | a15dba5 en: Avoid ambiguous language regarding when transactions confirm (Luke Dashjr)
| * | en: Avoid ambiguous language regarding when transactions confirmLuke Dashjr2014-12-232-3/+3
| | |
* | | Merge pull request #5536Wladimir J. van der Laan2014-12-273-6/+6
|\ \ \ | | | | | | | | | | | | 566c6cb gitian: attempt to fix tarball determinisim (Cory Fields)
| * | | gitian: attempt to fix tarball determinisimCory Fields2014-12-233-6/+6
| |/ /
* | | Merge pull request #5541Wladimir J. van der Laan2014-12-271-1/+1
|\ \ \ | |/ / |/| | | | | d78f0da Fix CScriptID(const CScript& in) in empty script case (Peter Todd)
| * | Fix CScriptID(const CScript& in) in empty script casePeter Todd2014-12-251-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously an empty script wouldn't be hashed, and CScriptID would be assigned the incorrect value of 0 instead. This bug can be seen in the RPC decodescript command: $ btc decodescript "" { "asm" : "", "type" : "nonstandard", "p2sh" : "31h1vYVSYuKP6AhS86fbRdMw9XHieotbST" } Correct output: $ btc decodescript "" { "asm" : "", "type" : "nonstandard", "p2sh" : "3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy" }
* | Merge pull request #5512Wladimir J. van der Laan2014-12-231-24/+12
|\ \ | | | | | | | | | dd14a0e docs: update gitian building docs (Cory Fields)
| * | docs: update gitian building docsCory Fields2014-12-191-24/+12
| | |
* | | Merge pull request #5507Wladimir J. van der Laan2014-12-231-1/+3
|\ \ \ | | | | | | | | | | | | c907704 DOS: Respect max per-peer blocks in flight limit (Adam Weiss)
| * | | DOS: Respect max per-peer blocks in flight limitAdam Weiss2014-12-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow immediate inv driven block downloads if a peer already has MAX_BLOCKS_IN_TRANSIT_PER_PEER active downloads. Prevents bogus inv spam from blowing up block transfer tracking data structures.
* | | | Merge pull request #5481Wladimir J. van der Laan2014-12-231-8/+18
|\ \ \ \ | | | | | | | | | | | | | | | 6484930 Apply AreSane() checks to the fees from the network. (Gregory Maxwell)
| * | | | Apply AreSane() checks to the fees from the network.Gregory Maxwell2014-12-151-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'Sane' was already defined by this code as: fee.GetFeePerK() > minRelayFee.GetFeePerK() * 10000 But sanity was only enforced for data loaded from disk. Note that this is a pretty expansive definition of 'sane': A 10 BTC fee is still passes the test if its on a 100kb transaction. This prevents a single insane fee on the network from making us reject our stored fee data at start. We still may reject valid saved fee state if minRelayFee is changed between executions. This also reduces the risk and limits the damage from a cascading failure where one party pays a bunch of insane fees which cases others to pay insane fees.
* | | | | Merge pull request #5485Wladimir J. van der Laan2014-12-233-19/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | aa279d6 Enforce minRelayTxFee on wallet created tx and add a maxtxfee option. (Gregory Maxwell)
| * | | | | Enforce minRelayTxFee on wallet created tx and add a maxtxfee option.Gregory Maxwell2014-12-193-19/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the minRelayTxFee was only enforced on user specified values. It was possible for smartfee to produce a fee below minRelayTxFee which would just result in the transaction getting stuck because it can't be relayed. This also introduces a maxtxfee option which sets an absolute maximum for any fee created by the wallet, with an intention of increasing user confidence that the automatic fees won't burn them. This was frequently a concern even before smartfees. If the configured fee policy won't even allow the wallet to meet the relay fee the transaction creation may be aborted.
* | | | | | Merge pull request #5459Wladimir J. van der Laan2014-12-231-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 3497022 Reject headers that build on an invalid parent (Pieter Wuille)
| * | | | | | Reject headers that build on an invalid parentPieter Wuille2014-12-221-0/+6
| | | | | | |
* | | | | | | Merge pull request #5517Wladimir J. van der Laan2014-12-231-2/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 39c8099 contrib: make github-merge require signing (Wladimir J. van der Laan)
| * | | | | | | contrib: make github-merge require signingWladimir J. van der Laan2014-12-201-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Exit when there is no signing key configured - Exit when user does not want to sign off
* | | | | | | | Merge pull request #5518Wladimir J. van der Laan2014-12-221-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e22d45 Add libbitcoinconsensus.pc to .gitignore (Michael Ford)
| * | | | | | | | Add libbitcoinconsensus.pc to .gitignoreMichael Ford2014-12-201-0/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #5523Wladimir J. van der Laan2014-12-222-3/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | 4bc95c4 remove max orphan blocks config parameter since it is no longer functional (Jameson Lopp)
| * | | | | | | remove max orphan blocks config parameter since it is no longer functionalJameson Lopp2014-12-212-3/+0
| |/ / / / / /
* | | | | | | Merge pull request #5253Wladimir J. van der Laan2014-12-221-0/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | 7c041b3 Check against MANDATORY flags prior to accepting to mempool (Peter Todd)
| * | | | | | Check against MANDATORY flags prior to accepting to mempoolPeter Todd2014-11-101-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously transactions were only tested again the STANDARD_SCRIPT_VERIFY_FLAGS prior to mempool acceptance, so any bugs in those flags that allowed actually-invalid transactions to pass would result in allowing invalid transactions into the mempool. Fortunately there is a second check in CreateNewBlock() that would prevent those transactions from being mined, resulting in an invalid block, however this could still be exploited as a DoS attack.
* | | | | | | Added "Core" to copyright headerssandakersmann2014-12-19262-264/+264
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Github-Pull: #5494 Rebased-From: 15de949bb9277e442302bdd8dee299a8d6deee60
* | | | | | Merge pull request #5470Wladimir J. van der Laan2014-12-19189-189/+189
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 78253fc Remove references to X11 licence (Michael Ford)
| * | | | | | Remove references to X11 licenceMichael Ford2014-12-16189-189/+189
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2340Wladimir J. van der Laan2014-12-191-1/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | ba7fcc8 Discourage fee sniping with nLockTime (Peter Todd)
| * | | | | | Discourage fee sniping with nLockTimePeter Todd2014-10-131-1/+27
| | | | | | |
* | | | | | | add missing CAutoFile::IsNull() check in mainPhilip Kaufmann2014-12-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rebased-From: ccd056a30db0ba5e04b858a682907b378e464d34 Github-Pull: #5437
* | | | | | | Merge pull request #5334Wladimir J. van der Laan2014-12-193-0/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | eef747b libbitcoinconsensus: Add pkg-config support (Luke Dashjr)
| * | | | | | | libbitcoinconsensus: Add pkg-config supportLuke Dashjr2014-11-203-0/+17
| | | | | | | |
* | | | | | | | Merge pull request #5341Wladimir J. van der Laan2014-12-197-9/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4709160 [Qt] fix a translation that occurs 2 times but was a little different (Philip Kaufmann) 50db7d9 [Qt] change some strings to reflect name change to Bitcoin Core (Philip Kaufmann) 2747f7c [Qt] fix missing plural form for a string in sendcoinsdialog (Philip Kaufmann)
| * | | | | | | | [Qt] fix a translation that occurs 2 times but was a little differentPhilip Kaufmann2014-12-021-1/+1
| | | | | | | | |
| * | | | | | | | [Qt] change some strings to reflect name change to Bitcoin CorePhilip Kaufmann2014-12-025-7/+7
| | | | | | | | |
| * | | | | | | | [Qt] fix missing plural form for a string in sendcoinsdialogPhilip Kaufmann2014-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - this was reported on Transifex by pryds (Thank you!)
* | | | | | | | | Merge pull request #5413Wladimir J. van der Laan2014-12-191-57/+79
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88eb44d Revised translation process doc (Blake Jakopovic)
| * | | | | | | | | Revised translation process docBlake Jakopovic2014-12-071-57/+79
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5421Wladimir J. van der Laan2014-12-192-0/+21
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cac15be Test unexecuted OP_CODESEPARATOR (Peter Todd)
| * | | | | | | | | | Test unexecuted OP_CODESEPARATORPeter Todd2014-12-042-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OP_CODESEPARATOR is an actual executed instruction, not a declarative thing, so if it's wrapped in an OP_IF it can be turned off. Using this to implement Rivest's Paywords is left as an exercise for the reader.