0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-05-14 03:45:16 +00:00
Bitcoin Core integration/staging tree https://bitcoincore.org/en/download
  • C++ 64.6%
  • Python 18.8%
  • C 12.9%
  • CMake 1.2%
  • Shell 0.9%
  • Other 1.3%
Find a file
Ava Chow 9961229360
Merge bitcoin/bitcoin#31298: rpc: combinerawtransaction now rejects unmergeable transactions
6d86184a8b rpc: combinerawtransaction now rejects unmergeable transactions (Adam Andrews)

Pull request description:

  Previously, combinerawtransaction would silently return the first tx when asked to combine unrelated txs. Now, it will check tx mergeability and throws a descriptive error if tx cannot be merged.

  fixes  #25980

ACKs for top commit:
  nervana21:
    tACK 6d86184a8b
  achow101:
    ACK 6d86184a8b
  rkrux:
    ACK [6d86184](https://github.com/bitcoin/bitcoin/pull/31298/commits/6d86184a8bcc34186d217cc7cfbf7acc21af7ca4)

Tree-SHA512: 5caf983c5ab618a000f40b9ad698439d3e6217ec2dc593740443f47d90f8804a895f3054dd29bbcecdb48a61992b0d0afda7ec89591d768a44918648bbb6e20d
2026-05-13 16:07:35 -07:00
.github ci: Rename vcpkg binary cache entity to force rebuild 2026-04-13 12:32:36 +01:00
.tx Update Transifex slug for 31.x 2026-02-06 13:40:59 +00:00
ci Merge bitcoin/bitcoin#34547: lint: modernise lint tooling 2026-05-13 10:27:38 +02:00
cmake Merge bitcoin/bitcoin#34580: build: Add a compiler minimum feature check 2026-05-11 15:29:35 -07:00
contrib Merge bitcoin/bitcoin#35044: contrib: Fix NameError in signet miner gbt() 2026-05-13 12:34:20 +02:00
depends depends: Unset SOURCE_DATE_EPOCH in gen_id script 2026-05-06 16:04:54 +02:00
doc Merge bitcoin/bitcoin#35274: doc: clarify libfuzzer-nosan preset uses build_fuzz_nosan dir 2026-05-13 20:59:12 +02:00
share scripted-diff: [doc] Unify stale copyright headers 2025-12-16 22:21:15 +01:00
src Merge bitcoin/bitcoin#31298: rpc: combinerawtransaction now rejects unmergeable transactions 2026-05-13 16:07:35 -07:00
test Merge bitcoin/bitcoin#31298: rpc: combinerawtransaction now rejects unmergeable transactions 2026-05-13 16:07:35 -07:00
.editorconfig code style: update .editorconfig file 2024-09-13 17:55:10 +02:00
.gitattributes Separate protocol versioning from clientversion 2014-10-29 00:24:40 -04:00
.gitignore iwyu: Add patch to prefer angled brackets over quotes for includes 2025-12-17 20:28:42 +00:00
.python-version Don't pin Python patch version 2026-04-29 21:50:13 +01:00
.style.yapf Update .style.yapf 2023-06-01 23:35:10 +05:30
CMakeLists.txt Merge bitcoin/bitcoin#34580: build: Add a compiler minimum feature check 2026-05-11 15:29:35 -07:00
CMakePresets.json build: Bump VS minimum supported version to 18.3 2026-02-10 23:30:23 +00:00
CONTRIBUTING.md doc: fix typos and formatting in CONTRIBUTING, i2p, bitcoin-conf, files 2026-04-16 23:18:20 -04:00
COPYING doc: update copyright year 2025-12-29 17:50:43 +00:00
CTestConfig.cmake cmake: Set CTEST_NIGHTLY_START_TIME for CDash Nightly pipelines 2026-05-08 11:09:06 +02:00
INSTALL.md lint: Check for missing trailing newline 2025-05-13 15:50:02 +02:00
libbitcoinkernel.pc.in kernel: create monolithic kernel static library 2025-07-28 10:37:42 +01:00
README.md doc: fix transifex 404s 2025-06-19 11:22:14 +01:00
ruff.toml refactor: Use ignore-list over verbose select-list 2026-05-13 12:24:09 +02:00
SECURITY.md doc: Add Niklas Goegge's key to SECURITY.md 2026-05-06 08:54:08 +01:00
vcpkg.json signals: remove boost::signals2 from depends and vcpkg 2026-04-03 18:20:50 +00:00

Bitcoin Core integration/staging tree

https://bitcoincore.org

For an immediately usable, binary version of the Bitcoin Core software, see https://bitcoincore.org/en/download/.

What is Bitcoin Core?

Bitcoin Core connects to the Bitcoin peer-to-peer network to download and fully validate blocks and transactions. It also includes a wallet and graphical user interface, which can be optionally built.

Further information about Bitcoin Core is available in the doc folder.

License

Bitcoin Core is released under the terms of the MIT license. See COPYING for more information or see https://opensource.org/license/MIT.

Development Process

The master branch is regularly built (see doc/build-*.md for instructions) and tested, but it is not guaranteed to be completely stable. Tags are created regularly from release branches to indicate new official, stable release versions of Bitcoin Core.

The https://github.com/bitcoin-core/gui repository is used exclusively for the development of the GUI. Its master branch is identical in all monotree repositories. Release branches and tags do not exist, so please do not fork that repository unless it is for development reasons.

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 during the generation of the build system) with: ctest. 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. These tests can be run (if the test dependencies are installed) with: build/test/functional/test_runner.py (assuming build is your build directory).

The CI (Continuous Integration) systems make sure that every pull request is tested on Windows, Linux, and macOS. The CI must pass on all commits before merge to avoid unrelated CI failures on new pull requests.

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.