01c563708f
2b79ac7406Clean up separated ban/discourage interface (Pieter Wuille)0477348057Replace automatic bans with discouragement filter (Pieter Wuille)e7f06f9b0etest: remove Cirrus CI FreeBSD job (fanquake)eb6b82a558qa: Test concurrent wallet loading (João Barbosa)c9b49d2856wallet: Handle concurrent wallet loading (João Barbosa)cf0b5a933dtests: Check that segwit inputs in psbt have both UTXO types (Andrew Chow)3228b59b17psbt: always put a non_witness_utxo and don't remove it (Andrew Chow)ed5ec30804psbt: Allow both non_witness_utxo and witness_utxo (Andrew Chow)68e0e6f852rpc: show both UTXOs in decodepsbt (Andrew Chow)27786d072dtrivial: Suggested cleanups to surrounding code (Russell Yanofsky)654420d6dfwallet: Minimal fix to restore conflicted transaction notifications (Russell Yanofsky)febebc4ea6Fix WSL file locking by using flock instead of fcntl (Samuel Dobson)5c7151a604gui: update Qt base translations for macOS release (fanquake)c219d21634build: improved output of configure for build OS (sachinkm77)0596a6eeb5util: Don't reference errno when pthread fails. (MIZUTA Takeshi) Pull request description: Currently backports the following to the 0.20 branch: * #18700 - Fix locking on WSL using flock instead of fcntl * #18982 - wallet: Minimal fix to restore conflicted transaction notifications * #19059 - gui: update Qt base translations for macOS release * #19152 - build: improve build OS configure output * #19194 - util: Don't reference errno when pthread fails. * #19215 - psbt: Include and allow both non_witness_utxo and witness_utxo for segwit inputs * #19219 - Replace automatic bans with discouragement filter * #19300 - wallet: Handle concurrent wallet loading ACKs for top commit: amitiuttarwar: ACK04773480572b79ac7406by comparing to original changes, double checking the diff sipa: utACK2b79ac7406laanwj: ACK2b79ac7406Tree-SHA512: e5eb31d08288fa4a6e8aba08e60b16ce1988f14f249238b1cfd18ab2c8f6fcd9f07e3c0c491d32d2361fca26e3037fb0374f37464bddcabecea29069d6737539
Bitcoin Core integration/staging tree
What is Bitcoin?
Bitcoin is an experimental digital currency that enables instant payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate with no central authority: managing transactions and issuing money are carried out collectively by the network. Bitcoin Core is the name of open source software which enables the use of this currency.
For more information, as well as an immediately usable, binary version of the Bitcoin Core software, see https://bitcoincore.org/en/download/, or read the original whitepaper.
License
Bitcoin Core is released under the terms of the MIT license. See COPYING for more information or see https://opensource.org/licenses/MIT.
Development Process
The master branch is regularly built and tested, but is not guaranteed to be
completely stable. Tags are created
regularly to indicate new official, stable release versions of Bitcoin Core.
The contribution workflow is described in CONTRIBUTING.md and useful hints for developers can be found in doc/developer-notes.md.
Testing
Testing and code review is the bottleneck for development; we get more pull requests than we can review and test on short notice. Please be patient and help out by testing other people's pull requests, and remember this is a security-critical project where any mistake might cost people lots of money.
Automated Testing
Developers are strongly encouraged to write unit tests for new code, and to
submit new unit tests for old code. Unit tests can be compiled and run
(assuming they weren't disabled in configure) with: make check. Further details on running
and extending unit tests can be found in /src/test/README.md.
There are also regression and integration tests, written
in Python, that are run automatically on the build server.
These tests can be run (if the test dependencies are installed) with: test/functional/test_runner.py
The Travis CI system makes sure that every pull request is built for Windows, Linux, and macOS, and that unit/sanity tests are run automatically.
Manual Quality Assurance (QA) Testing
Changes should be tested by somebody other than the developer who wrote the code. This is especially important for large or high-risk changes. It is useful to add a test plan to the pull request description if testing the changes is not straightforward.
Translations
Changes to translations as well as new translations can be submitted to Bitcoin Core's Transifex page.
Translations are periodically pulled from Transifex and merged into the git repository. See the translation process for details on how this works.
Important: We do not accept translation changes as GitHub pull requests because the next pull from Transifex would automatically overwrite them again.
Translators should also subscribe to the mailing list.