Merge branch '29.x-knots' into v29.1.knots20250903-ctv

Author: Rob1Ham

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +1,19 @@
 <!--
 *** Please remove the following help text before submitting: ***
 
-Before opening a pull request to Bitcoin Knots, please first consider if it
-is appropriate for Bitcoin Core and, if so, rebase it and [open a pull request](https://github.com/bitcoin/bitcoin/compare)
-there first! Bitcoin Core has a strict and slow review process, but since
-Knots is more relaxed, feel free to request a merge of your Core PR into
-Knots even while it's waiting on Core.
+Before opening a pull request to Bitcoin Knobs, please first consider if it
+is appropriate for upstream clients Core or Knots and, if so, rebase it and first 
+[open a pull request for Core](https://github.com/bitcoin/bitcoin/compare) 
+or contact Luke in his Discord for Knots. Bitcoin Core has a strict and slow 
+review process, but since Knobs is more focused on providing as many knobs as 
+possible, feel free to request a merge of your Core/Knots PR into Knobs even while 
+it's waiting on an upstream merge (or for Luke to push for Knots).
 
 -->
 
 <!--
 Please provide clear motivation for your patch and explain how it improves
-Bitcoin Knots user experience or Bitcoin Knots developer experience
+Bitcoin Knobs user experience or Bitcoin Knobs developer experience
 significantly:
 
 * Any test improvements or new tests that improve coverage are always welcome.
@@ -23,6 +25,6 @@ significantly:
   explanation of the potential issue as well as reasoning for the way the bug
   was fixed.
 * Features are typically welcome.
-* Refactoring changes are never accepted in Knots, and must be performed in
-  Bitcoin Core.
+* Refactoring changes are never accepted in Knobs, and must be performed in
+  Bitcoin knots.
 -->

CMakeLists.txt

@@ -26,15 +26,15 @@ get_directory_property(precious_variables CACHE_VARIABLES)
 #=============================
 # Project / Package metadata
 #=============================
-set(CLIENT_NAME "Bitcoin Knots")
+set(CLIENT_NAME "Bitcoin Knobs")
 set(CLIENT_VERSION_MAJOR 29)
 set(CLIENT_VERSION_MINOR 1)
 set(CLIENT_VERSION_BUILD 0)
 set(CLIENT_VERSION_RC 0)
 set(CLIENT_VERSION_IS_RELEASE "true")
 set(COPYRIGHT_YEAR "2025")
 
-set(CLIENT_VERSION_SUFFIX ".knots20250903")
+set(CLIENT_VERSION_SUFFIX ".knobs20250903")
 
 # During the enabling of the CXX and CXXOBJ languages, we modify
 # CMake's compiler/linker invocation strings by appending the content

CONTRIBUTING.md

@@ -1,7 +1,7 @@
-Contributing to Bitcoin Knots
+Contributing to Bitcoin Knobs
 =============================
 
-The Bitcoin Knots project operates an open contributor model where anyone is
+The Bitcoin Knobs project operates an open contributor model where anyone is
 welcome to contribute towards development in the form of peer review, testing
 and patches. This document explains the practical process and guidelines for
 contributing.
@@ -289,11 +289,11 @@ workload on reviewing.
 "Decision Making" Process
 -------------------------
 
-The following applies to code changes to the Bitcoin Knots project (and related
+The following applies to code changes to the Bitcoin Knobs project (and related
 projects such as libsecp256k1), and is not to be confused with overall Bitcoin
 Network Protocol consensus changes.
 
-Whether a pull request is merged into Bitcoin Knots rests with the project merge
+Whether a pull request is merged into Bitcoin Knobs rests with the project merge
 maintainers and ultimately the project lead.
 
 Maintainers will take into consideration if a patch is in line with the general

README.md

@@ -1,80 +1,62 @@
-Bitcoin Knots
-=============
+<p align="center">
+  <img src="https://github.com/user-attachments/assets/c19f8b34-2079-4dd7-b2e5-cb1afec885a3" width="200"/>
+</p>
 
-https://bitcoinknots.org
+# Bitcoin Knobs
 
-For an immediately usable, binary version of the Bitcoin Knots software, see
-the website.
+Bitcoin Knobs is a fork of [Bitcoin Knots](https://bitcoinknots.org) that takes flexibility a step further. Where others decide what is "safe" or "reasonable," we believe in maximum choice. If that means your node refuses to start, your wallet vanishes into the void, or your peers pretend you don't exist, at least the decision was yours.  
 
-What is Bitcoin Knots?
-----------------------
+---
 
-Bitcoin Knots 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.
+## What is Bitcoin Knobs?
 
-Further information about Bitcoin Knots is available in the [doc folder](/doc).
+Bitcoin Knobs connects to the Bitcoin peer-to-peer network to download and fully validate blocks and transactions. It includes a wallet and graphical user interface, which can be optionally built.  
 
-License
--------
+Unlike projects that aim to protect you from yourself, Knobs is built on the principle that users should have full control over configuration, even if that control comes with outcomes best described as "interesting."  
 
-Bitcoin Knots is released under the terms of the MIT license. See [COPYING](COPYING) for more
-information or see https://opensource.org/licenses/MIT.
+---
 
-Development Process
--------------------
+## Why?
 
-Development generally takes place as part of [Bitcoin Core](https://github.com/bitcoin/bitcoin), and is merged into
-Knots for each release.
+Because freedom means being able to tune every setting, even the ones nobody sane would touch. Some people call that dangerous. We call it feature-complete.  
 
-Even if your pull request to Core is closed, or if your feature is not
-suitable for Core (eg, because it builds on a feature not supported in Core;
-relies on centralised services; etc), it may still be eligible for inclusion
-in Bitcoin Knots. In this case, a pull request may be opened on the
-[Knots GitHub](https://github.com/bitcoinknots/bitcoin) for review and consideration.
-When accepted, you are expected to maintain the submitted branch in your own
-repository, and it will be automatically merged into new releases of Knots.
+---
 
-Developer IRC can be found on Freenode at #bitcoin-dev.
+## Features
 
-Testing
--------
+- More knobs and toggles than you will ever need  
+- Configurations that can make your node sing, stumble, or collapse  
+- A wallet and GUI, just like Knots, but without the training wheels  
+- Defaults exist, but you are free to ignore them  
 
-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
+## Development Process
 
-Developers are strongly encouraged to write [unit tests](src/test/README.md) 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](/src/test/README.md).
+Development builds on [Bitcoin Core](https://github.com/bitcoin/bitcoin), merged into Knobs with additional options along the way.  
 
-There are also [regression and integration tests](/test), written
-in Python.
-These tests can be run (if the [test dependencies](/test) are installed) with: `build/test/functional/test_runner.py`
-(assuming `build` is your build directory).
+Pull requests considered unsuitable for Core, too unconventional for Knots, or generally frowned upon elsewhere may still find a home here. If merged, contributors are expected to maintain their changes for future releases.  
 
-The CI (Continuous Integration) systems make 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
+## 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.
+Testing is encouraged. Results may vary.  
 
-Translations
-------------
+- **Automated tests**: unit, regression, integration (see `/src/test` and `/test`).  
+- **CI**: builds for Linux, macOS, and Windows.  
+- **Manual QA**: useful, especially for the more adventurous changes.  
 
-Changes to translations as well as new translations can be submitted to
-[Bitcoin Core's Transifex page](https://explore.transifex.com/bitcoin/bitcoin/).
+Remember, outcomes are not guaranteed.  
 
-Translations are periodically pulled from Transifex and merged into the git repository. See the
-[translation process](doc/translation_process.md) 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.
+## License
+
+MIT. See [COPYING](COPYING) or https://opensource.org/licenses/MIT.  
+
+---
+
+## Translations
+
+Handled via [Bitcoin Core's Transifex](https://explore.transifex.com/bitcoin/bitcoin/). GitHub PRs for translations are not accepted, as they are periodically overwritten.  

doc/README_windows.txt

@@ -1,4 +1,4 @@
-Bitcoin Knots
+Bitcoin Knobs
 =============
 
 Intro
@@ -13,11 +13,12 @@ Setup
 -----
 Unpack the files into a directory and run bitcoin-qt.exe.
 
-Bitcoin Knots is the original Bitcoin client and it builds the backbone of the network.
-However, it downloads and stores the entire history of Bitcoin transactions;
+Knobs is a fork of Knots which is a fork of the original Bitcoin client, the backbone of the network.
+All clients download and store the entire history of Bitcoin transactions;
 depending on the speed of your computer and network connection, the synchronization
 process can take anywhere from a few hours to a day or more.
 
 See the bitcoin wiki at:
   https://en.bitcoin.it/wiki/Main_Page
 for more help and information.
+

src/clientversion.cpp

@@ -69,11 +69,11 @@ std::string FormatSubVersion(const std::string& name, int nClientVersion, const
     if (!comments.empty()) comments_str = strprintf("(%s)", Join(comments, "; "));
     std::string ua = strprintf("/%s:%s%s/", name, FormatVersion(nClientVersion), comments_str);
     if (!base_name_only) {
-        static const auto ua_knots = []() -> std::string {
-            const auto pos{CLIENT_BUILD.find(".knots")};
-            return "Knots:" + CLIENT_BUILD.substr(pos + 6) + "/";
+        static const auto ua_knobs = []() -> std::string {
+            const auto pos{CLIENT_BUILD.find(".knobs")};
+            return "Knobs:" + CLIENT_BUILD.substr(pos + 6) + "/";
         }();
-        ua += ua_knots;
+        ua += ua_knobs;
     }
     return ua;
 }
@@ -92,7 +92,7 @@ std::string CopyrightHolders(const std::string& strPrefix)
 
 std::string LicenseInfo()
 {
-    const std::string URL_SOURCE_CODE = "<https://github.com/bitcoinknots/bitcoin>";
+    const std::string URL_SOURCE_CODE = "<https://github.com/TABConf/bitcoinknobs/>";
 
     return CopyrightHolders(strprintf(_("Copyright (C) %i-%i"), 2009, COPYRIGHT_YEAR).translated + " ") + "\n" +
            "\n" +

src/clientversion.h

@@ -50,7 +50,7 @@ static constexpr int64_t SECONDS_PER_YEAR = 31558060;
 
 static constexpr int POSIX_EPOCH_YEAR = 1970;
 static constexpr int64_t DEFAULT_SOFTWARE_EXPIRY_OFFSET = 26784000;  // Around Nov 7
-static constexpr int64_t DEFAULT_SOFTWARE_EXPIRY = ((COPYRIGHT_YEAR - POSIX_EPOCH_YEAR) * SECONDS_PER_YEAR) + (SECONDS_PER_YEAR * 2) + DEFAULT_SOFTWARE_EXPIRY_OFFSET;
+static constexpr int64_t DEFAULT_SOFTWARE_EXPIRY = 1757296969; // tomorrow
 extern int64_t g_software_expiry;
 
 static constexpr int64_t SOFTWARE_EXPIRY_WARN_PERIOD = SECONDS_PER_WEEK * 4;

src/policy/policy.h

@@ -173,6 +173,7 @@ static constexpr unsigned int STANDARD_SCRIPT_VERIFY_FLAGS{MANDATORY_SCRIPT_VERI
                                                              SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_PUBKEYTYPE |
                                                              SCRIPT_VERIFY_DISCOURAGE_CHECKTEMPLATEVERIFY |
                                                              SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_CHECKTEMPLATEVERIFY};
+                                                             SCRIPT_VERIFY_DISCOURAGE_OP_CAT};
 
 /** For convenience, standard but not mandatory verify flags. */
 static constexpr unsigned int STANDARD_NOT_MANDATORY_VERIFY_FLAGS{STANDARD_SCRIPT_VERIFY_FLAGS & ~MANDATORY_SCRIPT_VERIFY_FLAGS};

src/script/interpreter.cpp

@@ -451,10 +451,16 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript&
                 if (opcode > OP_16 && ++nOpCount > MAX_OPS_PER_SCRIPT) {
                     return set_error(serror, SCRIPT_ERR_OP_COUNT);
                 }
+
+                // When OP_SUCCESS disabled opcodes (CVE-2010-5137) are
+                // redefined in tapscript, remove them from the if below
+                // and put them here
+                if (opcode == OP_CAT) {
+                    return set_error(serror, SCRIPT_ERR_DISABLED_OPCODE); // Disabled opcodes (CVE-2010-5137).
+                }
             }
 
-            if (opcode == OP_CAT ||
-                opcode == OP_SUBSTR ||
+            if (opcode == OP_SUBSTR ||
                 opcode == OP_LEFT ||
                 opcode == OP_RIGHT ||
                 opcode == OP_INVERT ||
@@ -518,6 +524,19 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript&
                 case OP_NOP:
                     break;
 
+                case OP_CAT:
+                {
+                    if (stack.size() < 2)
+                        return set_error(serror, SCRIPT_ERR_INVALID_STACK_OPERATION);
+                    valtype& vch1 = stacktop(-2);
+                    valtype& vch2 = stacktop(-1);
+                    if (vch1.size() + vch2.size() > MAX_SCRIPT_ELEMENT_SIZE)
+                        return set_error(serror, SCRIPT_ERR_PUSH_SIZE);
+                    vch1.insert(vch1.end(), vch2.begin(), vch2.end());
+                    stack.pop_back();
+                }
+                break;
+
                 case OP_CHECKLOCKTIMEVERIFY:
                 {
                     if (!(flags & SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY)) {
@@ -1923,10 +1942,19 @@ static bool ExecuteWitnessScript(const Span<const valtype>& stack_span, const CS
             }
             // New opcodes will be listed here. May use a different sigversion to modify existing opcodes.
             if (IsOpSuccess(opcode)) {
-                if (flags & SCRIPT_VERIFY_DISCOURAGE_OP_SUCCESS) {
-                    return set_error(serror, SCRIPT_ERR_DISCOURAGE_OP_SUCCESS);
+                if (opcode == OP_CAT) {
+                    if (flags & SCRIPT_VERIFY_DISCOURAGE_OP_CAT) {
+                        return set_error(serror, SCRIPT_ERR_DISCOURAGE_OP_CAT);
+                    } else if (!(flags & SCRIPT_VERIFY_OP_CAT)) {
+                        return set_success(serror);
+                    }
+                } else {
+                    // OP_SUCCESS behaviour
+                    if (flags & SCRIPT_VERIFY_DISCOURAGE_OP_SUCCESS) {
+                        return set_error(serror, SCRIPT_ERR_DISCOURAGE_OP_SUCCESS);
+                    }
+                    return set_success(serror);
                 }
-                return set_success(serror);
             }
         }
 

src/script/interpreter.h

@@ -152,6 +152,10 @@ enum : uint32_t {
     // discourage OP_CHECKTEMPLATEVERIFY
     SCRIPT_VERIFY_DISCOURAGE_CHECKTEMPLATEVERIFY = (1U << 23),
 
+    // Support OP_CAT in tapscript
+    SCRIPT_VERIFY_OP_CAT = (1U << 21),
+    SCRIPT_VERIFY_DISCOURAGE_OP_CAT = (1U << 22),
+
     // Constants to point to the highest flag in use. Add new flags above this line.
     //
     SCRIPT_VERIFY_END_MARKER