Commit graph

7643 commits

Author SHA1 Message Date
Wladimir J. van der Laan
f8c48589cf
Merge pull request #5558
99913f0 Fix reference. (Thomas Zander)
2014-12-29 09:16:25 +01:00
Thomas Zander
99913f0f70 Fix reference.
The text talked about "Quit" while Bitcoin uses "Exit" in its menu.
2014-12-28 22:57:39 +01:00
Wladimir J. van der Laan
e5153095ea
Merge pull request #5493
9b7d3fb Adopt style colour for button icons (Luke Dashjr)
2014-12-27 19:16:03 +01:00
Luke Dashjr
9b7d3fb165 Adopt style colour for button icons 2014-12-27 19:04:49 +01:00
Wladimir J. van der Laan
a39aa74a8d
Merge pull request #5547
de779b3 [Qt] new icon for the debug window (Jonas Schnelli)
2014-12-27 16:21:33 +01:00
Jonas Schnelli
de779b307b [Qt] new icon for the debug window 2014-12-27 12:35:38 +01:00
Wladimir J. van der Laan
0f2308cf7c
Merge pull request #5272
13f9031 init: minor parameter interaction updates (Philip Kaufmann)
2014-12-27 05:41:13 +01:00
Wladimir J. van der Laan
a3bd5d7d82
Merge pull request #5533
a15dba5 en: Avoid ambiguous language regarding when transactions confirm (Luke Dashjr)
2014-12-27 05:01:09 +01:00
Wladimir J. van der Laan
a992d600c5
Merge pull request #5536
566c6cb gitian: attempt to fix tarball determinisim (Cory Fields)
2014-12-27 04:11:18 +01:00
Wladimir J. van der Laan
3c9daa2f24
Merge pull request #5541
d78f0da Fix CScriptID(const CScript& in) in empty script case (Peter Todd)
2014-12-27 04:06:48 +01:00
Peter Todd
d78f0dafd5
Fix CScriptID(const CScript& in) in empty script case
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"
    }
2014-12-25 03:18:40 -05:00
Cory Fields
566c6cb8a2 gitian: attempt to fix tarball determinisim 2014-12-23 19:43:27 -05:00
Luke Dashjr
a15dba5dff en: Avoid ambiguous language regarding when transactions confirm 2014-12-23 22:07:10 +00:00
Wladimir J. van der Laan
4312c8fc18
Merge pull request #5512
dd14a0e docs: update gitian building docs (Cory Fields)
2014-12-23 14:16:38 +01:00
Wladimir J. van der Laan
844ace95de
Merge pull request #5507
c907704 DOS: Respect max per-peer blocks in flight limit (Adam Weiss)
2014-12-23 12:32:47 +01:00
Wladimir J. van der Laan
055f3ae9aa
Merge pull request #5481
6484930 Apply AreSane() checks to the fees from the network. (Gregory Maxwell)
2014-12-23 12:29:33 +01:00
Wladimir J. van der Laan
d01bcc446e
Merge pull request #5485
aa279d6 Enforce minRelayTxFee on wallet created tx and add a maxtxfee option. (Gregory Maxwell)
2014-12-23 12:12:05 +01:00
Wladimir J. van der Laan
4406c3e0f4
Merge pull request #5459
3497022 Reject headers that build on an invalid parent (Pieter Wuille)
2014-12-23 11:54:07 +01:00
Wladimir J. van der Laan
66ef824a9f
Merge pull request #5517
39c8099 contrib: make github-merge require signing (Wladimir J. van der Laan)
2014-12-23 11:28:08 +01:00
Adam Weiss
c90770430d DOS: Respect max per-peer blocks in flight limit
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.
2014-12-23 02:19:34 -05:00
Wladimir J. van der Laan
146e68059c
Merge pull request #5518
1e22d45 Add libbitcoinconsensus.pc to .gitignore (Michael Ford)
2014-12-22 15:13:31 +01:00
Pieter Wuille
3497022347 Reject headers that build on an invalid parent 2014-12-22 15:10:56 +01:00
Wladimir J. van der Laan
fcbc8bfa6d
Merge pull request #5523
4bc95c4 remove max orphan blocks config parameter since it is no longer functional (Jameson Lopp)
2014-12-22 15:02:42 +01:00
Wladimir J. van der Laan
203632d20b
Merge pull request #5253
7c041b3 Check against MANDATORY flags prior to accepting to mempool (Peter Todd)
2014-12-22 12:41:40 +01:00
Jameson Lopp
4bc95c4387 remove max orphan blocks config parameter since it is no longer functional 2014-12-21 09:10:43 -05:00
Michael Ford
1e22d4594f Add libbitcoinconsensus.pc to .gitignore 2014-12-20 21:26:31 +08:00
Wladimir J. van der Laan
39c809942d contrib: make github-merge require signing
- Exit when there is no signing key configured
- Exit when user does not want to sign off
2014-12-20 13:58:51 +01:00
Gregory Maxwell
aa279d6131 Enforce minRelayTxFee on wallet created tx and add a maxtxfee option.
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.
2014-12-19 12:05:10 -08:00
Cory Fields
dd14a0e799 docs: update gitian building docs 2014-12-19 14:44:23 -05:00
sandakersmann
f914f1a746
Added "Core" to copyright headers
Github-Pull: #5494
Rebased-From: 15de949bb9277e442302bdd8dee299a8d6deee60
2014-12-19 19:55:32 +01:00
Wladimir J. van der Laan
111a7d45f1
Merge pull request #5470
78253fc Remove references to X11 licence (Michael Ford)
2014-12-19 19:23:23 +01:00
Wladimir J. van der Laan
811c71d287
Merge pull request #2340
ba7fcc8 Discourage fee sniping with nLockTime (Peter Todd)
2014-12-19 18:54:51 +01:00
Philip Kaufmann
84857e87e4
add missing CAutoFile::IsNull() check in main
Rebased-From: ccd056a30db0ba5e04b858a682907b378e464d34
Github-Pull: #5437
2014-12-19 18:47:00 +01:00
Wladimir J. van der Laan
cf875367d2
Merge pull request #5334
eef747b libbitcoinconsensus: Add pkg-config support (Luke Dashjr)
2014-12-19 18:05:04 +01:00
Wladimir J. van der Laan
c63b47df11
Merge pull request #5341
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)
2014-12-19 18:02:24 +01:00
Wladimir J. van der Laan
87a5270d58
Merge pull request #5413
88eb44d Revised translation process doc (Blake Jakopovic)
2014-12-19 17:55:46 +01:00
Wladimir J. van der Laan
886eb57507
Merge pull request #5421
cac15be Test unexecuted OP_CODESEPARATOR (Peter Todd)
2014-12-19 17:54:21 +01:00
Wladimir J. van der Laan
07c31466c9
Merge pull request #5500
e85855f Drop beta suffixes from readmes (Michael Ford)
2014-12-19 17:49:40 +01:00
Wladimir J. van der Laan
94736e312e
Merge pull request #5504
7a3b832 [QA] fix httpbasics RPC test typo (Jonas Schnelli)
2014-12-19 17:48:39 +01:00
Wladimir J. van der Laan
6e718f9435
Remove outdated comment about NTP
The comment has been around since 0.1, but NTP inside the client
isn't deemed necessary so remove the comment to avoid confusion.
2014-12-19 16:26:27 +01:00
Wladimir J. van der Laan
c76c9d2e7f
Merge pull request #5501
e36e619 Add mips, mipsel and aarch64 to depends platforms (Wladimir J. van der Laan)
2014-12-19 12:01:54 +01:00
Jonas Schnelli
7a3b83269e [QA] fix httpbasics RPC test typo 2014-12-17 22:40:20 +01:00
Wladimir J. van der Laan
4444b879bc
Merge pull request #5484
7c8e4c5 Make pass-by-ref arguments const. (Daniel Kraft)
2014-12-17 19:21:48 +01:00
Wladimir J. van der Laan
89802fe3ee
Merge pull request #5438
27df412 make all catch() arguments const (Philip Kaufmann)
2014-12-17 18:13:28 +01:00
Wladimir J. van der Laan
e36e619886 Add mips, mipsel and aarch64 to depends platforms 2014-12-17 13:20:11 +01:00
Michael Ford
e85855fa55 Drop beta suffixes from readmes 2014-12-17 19:36:20 +08:00
Philip Kaufmann
27df4123c4 make all catch() arguments const
- I saw this on http://en.cppreference.com/w/cpp/language/try_catch and
  thought it would be a good idea
- also unify used format to better be able to search for exception
  uses in our codebase
2014-12-17 09:39:24 +01:00
Wladimir J. van der Laan
851dfc7f88
Merge pull request #5488
ff63801 [Qt] light blue icon color for regtest (Jonas Schnelli)
2014-12-16 14:16:38 +01:00
Daniel Kraft
7c8e4c5cfb Make pass-by-ref arguments const.
Make some of the arguments in rest.cpp, that are passed by
reference but never modified, const to emphasise that.
2014-12-16 13:45:27 +01:00
Jonas Schnelli
ff63801bc0 [Qt] light blue icon color for regtest
Changing the icons color for regtest in now lightweight.
2014-12-16 13:37:44 +01:00