aboutsummaryrefslogtreecommitdiff
path: root/contrib
AgeCommit message (Collapse)Author
2017-07-11Merge #10786: Add PR description to merge commit in github-merge.pyWladimir J. van der Laan
475c08c Add PR description to merge commit in github-merge.py (Pieter Wuille) Pull request description: There is often some context given in PR descriptions that is missing from commits, and it may be worthwhile to retain that information in our history in git. This PR adds that information to the merge commit when created through `github-merge.py`. We should also encourage people to provide as much information as possible in the PR commits themselves, but I believe that is an orthogonal issue. Individual commits don't need to have a description of the overall goal of a PR. Tree-SHA512: cbae46ec24ce911744e11a07e5d51895d3acc79659db306d8124304ef8e422bba99001ee2a741b08c92a5eb39d9c3f6b723622b20d6553ca5cfa0a8de866194c
2017-07-11Merge #10651: Verify binaries from bitcoincore.org and bitcoin.orgWladimir J. van der Laan
6270d62 Verify binaries from bitcoincore.org and bitcoin.org (Matt Corallo) Tree-SHA512: 39e99ce9be3e7c99d17b296749c0af53c867039bc95fd5b03572593c812817decea75e7296bb66e89ba460518210d84114b7bdc22465df621340319b47bd4303
2017-07-10Add PR description to merge commit in github-merge.pyPieter Wuille
2017-06-29Merge #10688: contrib: Update laanwj keyMarcoFalke
3c85332 contrib: Update laanwj key (Wladimir J. van der Laan) Tree-SHA512: c8cad76158850a3e480ccb58ee86c3dbb4e45ef67376173720c2520d3cb02c1c3e13b4e0acea3be6d90991e073db49aad2e185a87a09be194f1d1605b31b6ee4
2017-06-28contrib: Update laanwj keyWladimir J. van der Laan
I recently added a signing subkey, which is used to sign gitian asserts as well as commits. Old: ``` pub rsa2048/0x74810B012346C9A6 2011-08-24 uid Wladimir J. van der Laan <laanwj@gmail.com> sub rsa2048/0xF69705ED890DE427 2011-08-24 ``` New: ``` pub rsa2048/0x74810B012346C9A6 2011-08-24 [expires: 2019-02-14] uid Wladimir J. van der Laan <laanwj@visucore.com> uid Wladimir J. van der Laan <laanwj@gmail.com> sub rsa2048/0xF69705ED890DE427 2011-08-24 sub rsa2048/0x1E4AED62986CD25D 2017-05-17 [expires: 2019-05-17] sub rsa2048/0x69B4C4CDC628F8F9 2017-05-17 [expires: 2019-05-17] ```
2017-06-26Random db flush crash simulatorPieter Wuille
2017-06-24Merge #10626: doc: Remove outdated minrelaytxfee commentWladimir J. van der Laan
fab9b60 doc: Remove outdated minrelaytxfee comment (MarcoFalke) Tree-SHA512: e36c5a554a9773f034c2d358c52a772688009a5a71dfd3f664d9b5566c98378f44ef7c6dc0902b42d69ab5fd54b60d4850a2903823d0b2309c7ae063d1923f7f
2017-06-22Merge #10565: [coverage] Remove subtrees and benchmarks from coverage reportWladimir J. van der Laan
d5711f4 Filter subtrees and and benchmarks from coverage report (Andrew Chow) 405b86a Replace lcov -r commands with faster way (Andrew Chow) c8914b9 Have `make cov` optionally include branch coverage statistics (Andrew Chow) Tree-SHA512: 9c349a7baeb7430ea586617c52f91177df58e3546d6dc573e26815ddb79e30ab1873542d85ac1daca5e1fb2c6d6c8965824b42d027b6b0496a744af57b095852
2017-06-22Merge #10633: doc: Fix various typosWladimir J. van der Laan
0a5a6b9 Fixed multiple typos (Dimitris Tsapakidis) Tree-SHA512: 57748710bcbc03945b160db5e95bd686a2c64605f25d5e11d8ed9d0e1be3b3bf287a63588dc6eb33d0cef4ff17c765fda7c226d667a357acc539c8fcf2b9bb7e
2017-06-22Verify binaries from bitcoincore.org and bitcoin.orgMatt Corallo
2017-06-22Merge #10276: contrib/verifybinaries: allow filtering by platformWladimir J. van der Laan
8d4dafd contrib/verifybinaries: allow filtering by platform (Andres G. Aragoneses) Tree-SHA512: 5c117d18fd6e73cdbbf39c610f521bccb32ca7100eb8d5d5ed9c664514c37b32bd2f94f357b64c34f7c093e0c09312ecff330b7f5c708700d4b48643780ebac5
2017-06-22Fixed multiple typosDimitris Tsapakidis
A few "a->an" and "an->a". "Shows, if the supplied default SOCKS5 proxy" -> "Shows if the supplied default SOCKS5 proxy". Change made on 3 occurrences. "without fully understanding the ramification of a command" -> "without fully understanding the ramifications of a command". Removed duplicate words such as "the the".
2017-06-18doc: Remove outdated minrelaytxfee commentMarcoFalke
2017-06-13Merge #10480: Improve commit-check-script.shWladimir J. van der Laan
5432fc3 Fail on commit with VERIFY SCRIPT but no scripted-diff (Pieter Wuille) Tree-SHA512: 687b6c825f6f882f9c8e9d301bc893383710bad70216fa40b95f7e24d83a7148f9c759c3e4bd905a6cd26960829f8f6bd03106dc6c83ac312bf34ad239917018
2017-06-12Filter subtrees and and benchmarks from coverage reportAndrew Chow
Remove leveldb baseline coverage gathering. Added filter rules to remove all of the subtress (leveldb, secp256k1, ctaes, univalue) and benchmarking from the coverage report. These items are unnecessary as we do not test for any of the subtrees and benchmark coverage is unneeded.
2017-06-09Replace lcov -r commands with faster wayAndrew Chow
Instead of using lcov -r (which is extremely slow), first use a python script to perform bulk cleanup of the /usr/include/* coverage. Then use lcov -a to remove the duplicate entries. This has the same effect of lcov -r but runs significantly faster
2017-06-06contrib/verifybinaries: allow filtering by platformAndres G. Aragoneses
Downloading all the binaries of all platforms can take quite long, especially for slow connections, which may deter people from using this script and, therefore, to disregard security altogether. This change introduces the new possibility of specifying the platform along with the version number, so that only the binaries that contain the platform name are downloaded.
2017-06-01Merge #10451: contrib/init/bitcoind.openrcconf: Don't disable wallet by defaultWladimir J. van der Laan
afc693d contrib/init/bitcoind.openrcconf: Don't disable wallet by default (Luke Dashjr) Tree-SHA512: 1763a9e91788485b079b96239cf09f1557b338e5045aa4ffbad3908f88c4e362b9b5d86a8a0f33734899de244e76e7ced02a6be8e52b3fb69258a5101d6445ef
2017-06-01Merge #10495: contrib: Update location of seeds.txtWladimir J. van der Laan
ac9cd95 contrib: Update location of seeds.txt (Wladimir J. van der Laan) Tree-SHA512: c12a75787ba87f03707c21731da083b466762a7e0af9ca501107695ea1074025907cc24805c7c87f4a66daa7f4f13e574da16be1681e61deaf1acbd72176b3ff
2017-06-01contrib: Update location of seeds.txtWladimir J. van der Laan
Update the steps for updating the hardcoded seed nodes to point to the new filename on @sipa's server, and add command to decompress it. Ref: #10163
2017-05-31devtools: Retry after signing fails in github-mergeWladimir J. van der Laan
When signing fails, go back to the sign/exit prompt instead of exiting the script.
2017-05-30Fail on commit with VERIFY SCRIPT but no scripted-diffPieter Wuille
2017-05-25contrib/init/bitcoind.openrcconf: Don't disable wallet by defaultLuke Dashjr
It's harmless if it goes unused, and confused when a wallet is desired
2017-05-17Merge #7522: Bugfix: Only use git for build info if the repository is ↵Wladimir J. van der Laan
actually the right one ed1fcdc Bugfix: Detect genbuild.sh in repo correctly (Luke Dashjr) e98e3dd Bugfix: Only use git for build info if the repository is actually the right one (Luke Dashjr) Tree-SHA512: 510d7ec8cfeff4e8e0c7ac53631eb32c7acaada7017e7f8cc2e6f60d86afe1cd131870582e01022f961c85a783a130bcb8fef971f8b110070c9c02afda020726
2017-05-11Merge #10317: Remove unused Python importsWladimir J. van der Laan
0c60c63 Remove unused Python imports (practicalswift) Tree-SHA512: c7ae6a8ae2c751b771804960498bf270ab022c80fa9e1b39118d5986d890c8cdfc27a3cc24bf28c080d8088ddc11facd1f2881ba2c209cdd819675fda4689d83
2017-05-11Merge #10328: Update contrib/debian to latest Ubuntu PPA upload.Wladimir J. van der Laan
91700aa Re-enable upnp support in contrib/debian (Matt Corallo) c5071e1 Build with QT5 on Debian-based systems using contrib/debian (Matt Corallo) a8e9286 Bump minimum boost version in contrib/debian (Matt Corallo) 9970219 Update contrib/debian to latest Ubuntu PPA upload. (Matt Corallo) Tree-SHA512: ee4d3c5927a9cfb2794672eaca883c4af5df541383afbdbc6500714ee17518e78b58f509b2e9805bbc424ef97a5e64be0b9a977212c5002cb682f0569d28099b
2017-05-05Re-enable upnp support in contrib/debianMatt Corallo
2017-05-05Build with QT5 on Debian-based systems using contrib/debianMatt Corallo
2017-05-04Bump minimum boost version in contrib/debianMatt Corallo
2017-05-04devtools: add script to verify scriptable changesCory Fields
2017-05-03Update contrib/debian to latest Ubuntu PPA upload.Matt Corallo
This: * Partially reverts 9f68ed6 (which fixed spelling in a changelog, though generally changelogs should be append-only). * Disables UPnP support (PPA has not had it for a while, and I still don't trust miniupnpc, plus it seems uneccessary - its been a while since we needed to care about Bitcoin-Qt home users getting their inbound ports auto-mapped). * Enables ZMQ. * Forces GUI to Qt4 to fix various issues people have been seeing on Ubuntu and elsewhere with Qt5. * Reverts 70899d70b (Bitcoin does not enable "instant payments", not is transaction management "carried out collectively by the network", for whatever "transaction management" means, finally Bitcoin Core is not the only way to use the Bitcoin currency, as seemingly implied in the description).
2017-05-02Remove unused Python importspracticalswift
2017-04-26Merge #9670: contrib: github-merge improvementsWladimir J. van der Laan
b508424 contrib: github-merge improvements (Wladimir J. van der Laan) Tree-SHA512: 56a34e887716bf6bfcd1b6520f6b9a1bb742e1ad17e75618caf982af71fceb75d50caec1bf4279cb9a2f7a74319f1bcec4c824682841bd6e994acc0991616451
2017-04-25Use `with` in `macdeployqtplus` script.Chris Gavin
2017-04-25Remove unused variable from `macdeployqtplus` script.Chris Gavin
2017-04-21contrib: github-merge improvementsWladimir J. van der Laan
Some minor github-merge improvements I've made over time: User interface: - Print merge details again before signing off, to refresh your memory - usually I'll have done lots of different things in the shell so this will have scrolled out a long time ago. - Require a valid answer on the prompts. One of the requested answers must be typed, if not, the prompt will re-ask. This prevents accidentally rejecting. Efficiency: - Condense "accept merge" and "sign off" prompts. There's no reason to have this as two separate prompts, both are just opportunities to skip out on the merge, no action is performed in between. Merging: - Strip spaces from github title. This avoids redundant spaces surrounding it from getting into the commit message.
2017-04-05Merge #10104: linearize script: Option to use RPC cookieWladimir J. van der Laan
bd41d98 Datadir option in linearize scripts (Andrew Chow) Tree-SHA512: 0d11866b574986c087ec962a8a9fc0b6dfee8175ae20ef827f8b4a143f657c5bffc9f9696e9dabf29b68002003a5b6a7d8ac473231b5c9c81c3a4fa0318f5bd0
2017-04-02Merge #10036: Fix init README format to render correctly on githubWladimir J. van der Laan
b99fbad Fix init README format to render correctly on github (Jameson Lopp) Tree-SHA512: 52b8ed9661e48e830c9e0c0e9aa670fe8d1a3848426d2d854494b477a9926f286d87e0586c2bc63f433136f8e5acd2cab3ab1f616380fb517c5a8f9d34ed52da
2017-03-31Merge #10090: Update bitcoin.conf with example for pruningMarcoFalke
c0651cc Update bitcoin.conf with example for pruning (Kyle Honeycutt) Tree-SHA512: f27180ac5d5a4bd32c7a63de156ca14eb8068509e64d386ca84ee16d0dacfa8e1bab9a8e7b88175fae12c8d823f71f8705d413f224a15d5aa7cf059f416fa023
2017-03-29Update bitcoin.conf with example for pruningKyle Honeycutt
This option is becoming more popular recently, and I propose an example to be shown in the bitcoin.conf. pruning comments updated and corrected pruning comments Revised details on pruning in bitcoin.conf Revised details on pruning in bitcoin.conf spelling and space spelling and space add details on pruning in bitcoin.conf
2017-03-29Datadir option in linearize scriptsAndrew Chow
Adds a datadir configuration option to the linearize scripts to allow the script to use the RPC cookie instead of requiring the user to set a rpcuser and rpcpassword for the rpc server.
2017-03-28Remove accidental trailing semicolons in Python codepracticalswift
2017-03-22[tests] Remove unused and duplicate importspracticalswift
2017-03-20Move src/test/bitcoin-util-test.py to test/util/bitcoin-util-test.pyJohn Newbery
2017-03-20Rename test/pull-tester/rpc-tests.py to test/functional/test_runner.pyJohn Newbery
2017-03-20Rename rpc-tests directory to functionalJohn Newbery
2017-03-20Rename qa directory to testJohn Newbery
2017-03-19Fix init README format to render correctly on githubJameson Lopp
2017-03-13devtools: Make github-merge compute SHA512 from git, instead of worktreeWladimir J. van der Laan
This changes tree_sha512sum() to requests the objects for hashing from git instead of from the working tree. The change should make the process more deterministic (it hashes what will be pushed) and hopefully avoids the frequent miscomputed SHA512's that happen now.
2017-03-13Merge #9940: Fix verify-commits on OSX, update for new bad Tree-SHA512, ↵Wladimir J. van der Laan
point travis to different keyservers df5bae2 Update trusted-sha512-root-commit for new bad tree hash (Matt Corallo) efc06c2 If GNU sha512sum is missing, try perl shasum in verify-commits (Matt Corallo) 8ed849f Fix travis failing to fetch keys from the sks keyserver pool (Matt Corallo) fd5e905 Make verify-commits.sh non-recursive (Matt Corallo) Tree-SHA512: 457cc81d6e0a77ab32d030ecd058c59857f22cb998a1394593e115639081f3fdc74a6376035b77be0712ad5cb9143bc3f498b77e99eb66034492dbbb38c39bc6
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-07 22:45:00 +0000