Commit graph

1434 commits

Author SHA1 Message Date
Andrew Poelstra
b93cc1efd2 Merge 65ec4d6fb2 into merged_master (Bitcoin PR #15887) 2020-10-28 22:35:44 +00:00
Andrew Poelstra
f648151dc4 Merge d1c2ed8dd7 into merged_master (Bitcoin PR #15821) 2020-10-28 20:51:27 +00:00
Andrew Poelstra
37147c876b Merge 2209b3ba25 into merged_master (Bitcoin PR #15799) 2020-10-28 16:39:45 +00:00
Andrew Poelstra
dc9c535435 Merge 2a191b4846 into merged_master (Bitcoin PR #15802) 2020-10-28 16:16:28 +00:00
Andrew Poelstra
c2ec91b31b Merge 9422e2c29f into merged_master (Bitcoin PR #15792) 2020-10-28 16:05:21 +00:00
Andrew Poelstra
228f1a27ee Merge 5392aee64f into merged_master (Bitcoin PR #15629) 2020-10-28 03:11:10 +00:00
Andrew Poelstra
0374822983 Merge 8088ff21e4 into merged_master (Bitcoin PR #15765) 2020-10-28 01:07:59 +00:00
Andrew Poelstra
c85c0c1473 Merge 79f73436a9 into merged_master (Bitcoin PR #15757) 2020-10-28 00:55:50 +00:00
Andrew Poelstra
2a125939bb Merge a238fccce8 into merged_master (Bitcoin PR #15763) 2020-10-28 00:55:43 +00:00
Andrew Poelstra
dd652858a0 Merge daef20fb50 into merged_master (Bitcoin PR #15596) 2020-10-28 00:53:40 +00:00
Andrew Poelstra
8e677306d0 Merge 32e0428e37 into merged_master (Bitcoin PR #15684) 2020-10-28 00:47:51 +00:00
Andrew Poelstra
0fe213a5d9 Merge 656a15e539 into merged_master (Bitcoin PR #15620) 2020-10-28 00:35:45 +00:00
Andrew Poelstra
56d472ec04 Merge e14cd04abb into merged_master (Bitcoin PR #15637) 2020-10-28 00:11:51 +00:00
Andrew Poelstra
bd76bc4151 Merge 8a8b03ecd2 into merged_master (Bitcoin PR #15603) 2020-10-28 00:11:44 +00:00
Andrew Poelstra
da079d831f Merge 7b13c64645 into merged_master (Bitcoin PR #15642) 2020-10-28 00:11:29 +00:00
Andrew Poelstra
e842fb8db8 Merge 165ea14efe into merged_master (Bitcoin PR #15604) 2020-10-27 23:50:01 +00:00
Andrew Poelstra
a3f5c90edf Merge b83c6f7940 into merged_master (Bitcoin PR #15444) 2020-10-27 23:48:03 +00:00
Andrew Poelstra
5ae23eb085 Merge 887f57eb72 into merged_master (Bitcoin PR #15566) 2020-10-27 23:22:22 +00:00
Andrew Poelstra
1d4e3120e0 Merge 257f750cd9 into merged_master (Bitcoin PR #15565) 2020-10-27 23:21:33 +00:00
Andrew Poelstra
3e54f0e4ee Merge 6b2ee268be into merged_master (Bitcoin PR #15562) 2020-10-27 23:21:24 +00:00
Andrew Poelstra
67d718b048 Merge a74d588f21 into merged_master (Bitcoin PR #14954) 2020-10-27 22:32:24 +00:00
Andrew Poelstra
bfee82348a Merge 4b57b7f0f0 into merged_master (Bitcoin PR #15527) 2020-10-27 21:55:20 +00:00
Andrew Poelstra
92cd9cfbc7 Merge 57acfcb9fd into merged_master (Bitcoin PR #15518) 2020-10-27 21:53:18 +00:00
Andrew Poelstra
b612189f3c Merge 9e3122de05 into merged_master (Bitcoin PR #15492) 2020-10-27 20:46:09 +00:00
Andrew Poelstra
13a63305d2 Merge e47d8a1b7c into merged_master (Bitcoin PR #15514) 2020-10-27 20:24:53 +00:00
Andrew Poelstra
77d4285f38 Merge 20268c6d76 into merged_master (Bitcoin PR #15489) 2020-10-27 19:40:35 +00:00
MarcoFalke
770d0f60b8
travis: Properly cache and error on timeout 2019-05-31 14:54:25 +01:00
Steven Roose
a39bad4a92
MERGE-FIX: manpage fixes 2019-05-21 12:17:13 +01:00
Steven Roose
f4889a5253
UPSTREAM MERGE BROKEN: Merge upstream commit '519b0bc5dc' into master 2019-05-17 16:17:09 +01:00
Steven Roose
7f894ae00b
UPSTREAM MERGE BROKEN: Merge commit 'f617e05c38' into master 2019-05-01 19:18:18 +01:00
Hennadii Stepanov
201393f932
Align code example with clang-format 2019-04-25 00:10:06 +03:00
MarcoFalke
d1c2ed8dd7
Merge #15821: doc: Remove upgrade note in release notes from EOL versions
fa346fe883 doc: Remove upgrade note in release notes from EOL versions (MarcoFalke)

Pull request description:

  Remove the bloat on how to upgrade from version that are EOL

ACKs for commit fa346f:
  fanquake:
    re-utACK fa346fe

Tree-SHA512: 201e8594ef13523a04c7546995462d15d19bb80dbbca8d5cbf439cfd04af290ffd44f00a2e52ca1b88f1f17bf8bb09e9c4384cf1183d744d5301633e9b9507c0
2019-04-18 16:09:15 -04:00
MarcoFalke
fa346fe883
doc: Remove upgrade note in release notes from EOL versions 2019-04-16 10:40:39 -04:00
MarcoFalke
2209b3ba25
Merge #15799: doc: Clarify RPC versioning
fa747498f7 doc: Clarify RPC versioning (MarcoFalke)

Pull request description:

ACKs for commit fa7474:

Tree-SHA512: 4d374cc9ae77a06423acc9c73fe29f706f4349c548b17cb2414f15f72e0fc8c6ef7783ce099e938db2ab949717a4ef29e1aebc6aa09a350853d7f875b192ccb5
2019-04-15 11:20:53 -04:00
MarcoFalke
fa747498f7
doc: Clarify RPC versioning 2019-04-15 11:20:16 -04:00
Wladimir J. van der Laan
2a191b4846
Merge #15802: doc: mention creating application support bitcoin folder on OSX
8dfbb5cf23 doc: mention creating application support bitcoin folder on OSX (Jack Mallers)

Pull request description:

  When setting up bitcoin core on my new MacBook via the [`macOS Build Instructions and Notes`](https://github.com/bitcoin/bitcoin/blob/master/doc/build-osx.md), running `touch "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf"` resulted in `No such file or directory` because my `/Users/${USER}/Library/Application Support/Bitcoin/` folder had not been created yet.

  This PR adds `mkdir "/Users/${USER}/Library/Application Support/Bitcoin"` to the documentation before creating the configuration file with `touch "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf"`

ACKs for commit 8dfbb5:
  fanquake:
    utACK 8dfbb5cf23

Tree-SHA512: c401dae0a681bed77b31939bd29f79837f66c8537da393871fc3596e8c10629b8817ece9c8d49b1b9de34e74e0fbff742a9116b02ce7a71af93f872b87539337
2019-04-15 14:42:15 +02:00
Jack Mallers
8dfbb5cf23 doc: mention creating application support bitcoin folder on OSX 2019-04-12 09:18:41 -05:00
Jon Atack
140bbeec45
doc: describe onlynet option in doc/tor.md
as per http://www.erisian.com.au/bitcoin-core-dev/log-2019-04-11.html#l-102.

Description adapted from https://github.com/bitcoin/bitcoin/blob/master/src/init.cpp#L429.

Also fixes a typo in doc/dependencies.md.
2019-04-11 14:05:02 +02:00
Gregory Sanders
027aeef83e QT: Remove ^M and trailing whitespace 2019-04-10 13:22:52 -04:00
Gregory Sanders
7108ab76e3 Add unix build notes for Elements-QT dependencies 2019-04-10 12:01:04 -04:00
MarcoFalke
5392aee64f
Merge #15629: init: Throw error when network specific config is ignored
fae38c3dc6 doc: Fix all typos reported by codespell (MarcoFalke)
fa9058f0ed doc: Add release notes for 15629 (MarcoFalke)
fa4a922d78 qa: Add test for missing testnet section in conf file (MarcoFalke)
dddd6f0f58 init: Throw error when network specific config is ignored (MarcoFalke)

Pull request description:

  This should have no effect on mainnet users, but simplifies testing, where config settings are currently ignored with only a warning. Fix this by making it an error.

  Issues:
  *  bitcoin client 0.17.0 ignores wallet's name (file) #14523
  *  Can't set custom rpcport on testnet #13777
  * ...

ACKs for commit fae38c:

Tree-SHA512: 2e209526898eea6e444c803ec2666989cee4ca137492d32984998733c50a70056cb54657df8dc3027a6a0612738a8afce0bc35824b868c5f22281e00e0188530
2019-04-09 21:14:49 -04:00
MarcoFalke
23712f8ab9
Merge #15693: travis: Switch to ubuntu keyserver to avoid timeouts
fa2056af1c travis: Properly cache and error on timeout (MarcoFalke)
fa36a333ee travis: Switch to ubuntu keyserver to avoid timeouts (MarcoFalke)

Pull request description:

  The other keyserver is consistently timing out on travis: https://travis-ci.org/bitcoin/bitcoin/jobs/512689710#L405

  Attempt to fix it by using a different server.

  Also:
  * fixes #15372
  * fixes #15738

ACKs for commit fa2056:
  ryanofsky:
    utACK fa2056af1c. All good changes (changing keyserver, getting rid of keyserver while loop, clarifying travis error, moving travis documentation to code comment).

Tree-SHA512: ac8436616ecfee0ed579114e19f03c53ceb688fbcd95a60cffe8f15b4e569772a6ba673f353bbd789e79fe27fc5626c77fab4086768844dd51e0c6c108b52fb2
2019-04-09 11:17:29 -04:00
Lawrence Nahum
85f0ad80d6 replace bitcoin-qt with elements-qt 2019-04-09 11:06:35 -04:00
Wladimir J. van der Laan
8088ff21e4
Merge #15765: doc: correct bitcoinconsensus_version in shared-libraries.md
8ae6d020b8 doc: correct bitcoinconsensus_version in shared-libraries (fanquake)

Pull request description:

  efbc86733a/src/script/bitcoinconsensus.h (L36)

ACKs for commit 8ae6d0:
  practicalswift:
    ACK 8ae6d020b8
  promag:
    ACK 8ae6d02.

Tree-SHA512: 48ba90afe02beaa0fc9c3baf24ab7477e7e36947abcf424dab515aaaf5be35b9df3af5a01fc2653f0216a83d9bbff6f1d48bb86131fa71c552798a2e73ffbd82
2019-04-09 13:01:50 +02:00
Wladimir J. van der Laan
79f73436a9
Merge #15757: List new RPCs in psbt.md and descriptors.md
9b085f4863 Mention new descriptor RPCs in descriptors.md (Pieter Wuille)
28d78de00b Mention new PSBT RPCs in psbt.md (Pieter Wuille)

Pull request description:

  The documentation in `psbt.md` and `descriptors.md` does not list new and updated RPCs (`analyzepsbt`, `utxoupdatepsbt`, `joinpsbts`, `deriveaddresses`, `getdescriptorinfo`, `listunspent`). Fix this.

  It'd be good to have this in 0.18 (only documentation).

ACKs for commit 9b085f:
  fanquake:
    utACK 9b085f4

Tree-SHA512: ee16907e8c15351a530f11fc0a585c50835a7bf5aec997ac0e897949d9b9e41a28ddebbeaba69753fee7d2de75e518091518185085fcd1f6ada94b7231097b2e
2019-04-09 12:59:03 +02:00
fanquake
8ae6d020b8
doc: correct bitcoinconsensus_version in shared-libraries 2019-04-07 21:42:32 +08:00
Pieter Wuille
65d2f5d2de Update bips.md for 0.18.0 2019-04-06 08:37:07 -07:00
Pieter Wuille
9b085f4863 Mention new descriptor RPCs in descriptors.md 2019-04-06 08:17:51 -07:00
MarcoFalke
fa2056af1c
travis: Properly cache and error on timeout 2019-04-05 13:35:27 -04:00
Pieter Wuille
28d78de00b Mention new PSBT RPCs in psbt.md 2019-04-05 09:06:44 -07:00