Merge branch 'develop' into 27.x

lateminer · Nov 18, 2024 · b9b4300 · b9b4300
2 parents 6f983f7 + de3e073
commit b9b4300
Show file tree

Hide file tree

Showing 66 changed files with 668 additions and 500 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,13 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the default location of `.github/workflows`. (You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.)
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
         include:
           - name: linux-32-bit
             host: i686-pc-linux-gnu
-            os: ubuntu-22.04
+            os: ubuntu-20.04
             packages: g++-multilib
             check-security: false
             check-symbols: false
@@ -43,12 +43,12 @@ jobs:
 
           - name: linux-64-bit
             host: x86_64-pc-linux-gnu
-            os: ubuntu-22.04
+            os: ubuntu-20.04
             packages: python3
             check-security: false
             check-symbols: false
             dep-opts: ""
-            config-opts: "--enable-glibc-back-compat LDFLAGS=-static-libstdc++"
+            config-opts: "--enable-sse2 --enable-glibc-back-compat LDFLAGS=-static-libstdc++"
             goal: install
 
           - name: windows-64-bit
@@ -63,7 +63,7 @@ jobs:
             check-security: false
             check-symbols: false
             dep-opts: ""
-            config-opts: "LDFLAGS=-static-libgcc"
+            config-opts: "--enable-sse2 LDFLAGS=-static-libgcc"
             goal: install
 
           - name: macos-64-bit
@@ -73,13 +73,13 @@ jobs:
             check-security: false
             check-symbols: false
             dep-opts: ""
-            config-opts: ""
+            config-opts: "--enable-sse2"
             goal: deploy
             sdk: 12.2-12B45b
 
           - name: linux-arm-32-bit
             host: arm-linux-gnueabihf
-            os: ubuntu-22.04
+            os: ubuntu-20.04
             packages: g++-arm-linux-gnueabihf binutils-arm-linux-gnueabihf
             check-security: false
             check-symbols: false
@@ -89,7 +89,7 @@ jobs:
 
           - name: linux-arm-64-bit
             host: aarch64-linux-gnu
-            os: ubuntu-22.04
+            os: ubuntu-20.04
             packages: g++-aarch64-linux-gnu binutils-aarch64-linux-gnu
             check-security: false
             check-symbols: false
@@ -119,11 +119,11 @@ jobs:
         run: ${{ matrix.postinstall }}
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.7
 
       - name: SDK cache
         if: ${{ matrix.sdk }}
-        uses: actions/cache@v3
+        uses: actions/cache@v4.0.2
         env:
           cache-name: sdk
         with:
@@ -139,7 +139,7 @@ jobs:
           tar -C depends/SDKs -xzvf depends/sdk-sources/Xcode-${{ matrix.sdk }}-extracted-SDK-with-libcxx-headers.tar.gz
 
       - name: Dependency cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4.0.2
         env:
           cache-name: depends
         with:
@@ -164,7 +164,7 @@ jobs:
         run: make -C src check-symbols
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: blackmore-${{ github.sha }}-${{ matrix.name }}
           path: |
@@ -174,6 +174,6 @@ jobs:
           retention-days: 7
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4.1.8
         with:
           name: blackmore-${{ github.sha }}-${{ matrix.name }}
diff --git a/.github/workflows/docker_build_push_26.yml b/.github/workflows/docker_build_push_26.yml
@@ -0,0 +1,20 @@
+name: Build and Push Docker - 26.x
+on: [push]
+jobs:
+  test:
+    name: Build and Push Docker - 26.x
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout code
+        uses: actions/[email protected]
+        with:
+          repository: BlackcoinDev/docker-blk
+          ref: main
+      - name: Set environment variables
+        run: echo "GIT_CURRENT_BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
+      - name: Show GITHUB_ENV content
+        run: cat $GITHUB_ENV
+      - name: Login to DockerHub Registry
+        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login --username "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+      - name: Run build script
+        run: ./gh-build-26.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## v26.2.0-beta-2 (2024-XX-XX)
+- Activated SegWit on testnet on Sep 23, 2024
+- Changed miner activation window parameters for BIP9 soft fork deployment
+- Updated derivation path with the BIP44 coin type for descriptor wallets
+- Abandon coinstake transactions when orphaned (Peercoin commit `f6896a4`)
+- Show P2PK addresses for coinstake transactions in RPC
+- Show the reward value for coinstake transactions in RPC
+
+## v26.2.0-beta-1 (2024-08-07)
+- Updated to Bitcoin Core 26.2
+- Activated Segwit on regtest
+- New mempool.dat format (backport of Core's PR28207)
+
 ## v26.1.0-beta-1 (2024-05-24)
 - Updated to Bitcoin Core 26.1
 - Create V2 transactions by default

diff --git a/COPYING b/COPYING
@@ -2,7 +2,7 @@ The MIT License (MIT)
 
 Copyright (c) 2009-2024 The Bitcoin Core developers
 Copyright (c) 2009-2024 Bitcoin Developers
-Copyright (c) 2011-2023 Peercoin developers
+Copyright (c) 2011-2024 Peercoin developers
 Copyright (c) 2013-2014 The NovaCoin developers
 Copyright (c) 2016-2023 The Qtum developers
 Copyright (c) 2014-2018 The Blackcoin developers

diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt
@@ -1,55 +1,30 @@
 # List of fixed seed nodes for main network
 
 # IPv4 nodes
+185.197.251.199:15714
+109.123.251.87:15714
+84.46.245.181:15714
 167.86.117.103:15714
-167.86.117.144:15714
 167.86.117.143:15714
+167.86.117.144:15714
 45.137.91.173:15714
-5.189.160.139:15714
-81.0.246.79:15714
-5.189.159.220:15714
-161.97.80.103:15714
 45.138.55.128:15714
-45.138.55.129:15714
 45.138.55.130:15714
-45.138.55.131:15714
-45.138.55.132:15714
-45.138.55.133:15714
-45.138.55.134:15714
-45.138.55.135:15714
-116.86.146.44:15714
-118.195.208.33:15714
-119.45.242.241:15714
-91.121.217.71:15714
-216.39.250.91:15714
-172.99.189.198:15714
-50.47.255.100:15714
 
 
 # IPv6 nodes
-[2a02:c207:2041:3853::1]:15714
+[2a02:c206:2210:3221::1]:15714
+[2a02:c206:2210:3222::1]:15714
+[2a02:c206:2210:3223::1]:15714
 [2a02:c207:2056:6532::1]:15714
-[2a02:c207:2056:6534::1]:15714
 [2a02:c207:2056:6533::1]:15714
-[2a02:c207:2110:9257::1]:15714
-[2a02:c204:2110:9258::1]:15714
-[2a02:c207:2110:9259::1]:15714
-[2a10:3781:525:1::210]:15714
-[2a10:3781:525:1::201]:15714
+[2a02:c207:2056:6534::1]:15714
+[2a10:3781:525:1::1]:15714
 [2a10:3781:525:1::210]:15714
-[2a10:3781:525:1::201]:15714
-[2a10:3781:525:1::211]:15714
-[2a10:3781:525:1::212]:15714
-[2a10:3781:525:1::213]:15714
-[2a10:3781:525:1::215]:15714
-[2a10:3781:525:6::10]:15714
-[2a10:3781:525:6::11]:15714
-[2602:fec3:2:10::9:91]:15714
-[2001:41d0:303:6855::501]:15714
-[2604:86c0:f201:6::10:91]:15714
-[2a01:5a8:302:f394:5870:53f7:cb1f:9cfb]:15714
-[2a01:5a8:302:f394:8cd0:93fc:9953:3223]:15714
-[2a01:5a8:302:f394:5d2:e182:3f6:b054]:15714
+[2a10:3781:525::1]:15714
+
 
 # Onion nodes
 jgsfxfwhm7vdabt5dxl42il7uenvysknyedtzuaiajo7w5bv5jf2jpid.onion:15714
+hqnztorcojz5gsomamrxgqvoriitu4dfeze46hclmwd5zht4eic6jfid.onion:15714
+5evnjurdgzorvoty6qnrgqnmb7xot237b4rafgnt3t2vth2hy2bju7id.onion:15714
diff --git a/contrib/seeds/nodes_test.txt b/contrib/seeds/nodes_test.txt
@@ -1,39 +1,30 @@
 # List of fixed seed nodes for testnet
 
 # IPv4 nodes
+185.197.251.199:25714
+109.123.251.87:25714
+84.46.245.181:25714
 167.86.117.103:25714
-167.86.117.144:25714
 167.86.117.143:25714
+167.86.117.144:25714
 45.137.91.173:25714
-5.189.160.139:25714
-81.0.246.79:25714
-5.189.159.220:25714
-161.97.80.103:25714
 45.138.55.128:25714
-45.138.55.129:25714
 45.138.55.130:25714
-45.138.55.131:25714
-45.138.55.132:25714
-45.138.55.133:25714
-45.138.55.134:25714
-45.138.55.135:25714
+
 
 # IPv6 nodes
-[2a02:c207:2041:3853::1]:25714
+[2a02:c206:2210:3221::1]:25714
+[2a02:c206:2210:3222::1]:25714
+[2a02:c206:2210:3223::1]:25714
 [2a02:c207:2056:6532::1]:25714
-[2a02:c207:2056:6534::1]:25714
 [2a02:c207:2056:6533::1]:25714
-[2a02:c207:2110:9257::1]:25714
-[2a02:c204:2110:9258::1]:25714
-[2a02:c207:2110:9259::1]:25714
+[2a02:c207:2056:6534::1]:25714
+[2a10:3781:525:1::1]:25714
 [2a10:3781:525:1::210]:25714
-[2a10:3781:525:1::201]:25714
-[2a10:3781:525:1::211]:25714
-[2a10:3781:525:1::212]:25714
-[2a10:3781:525:1::213]:25714
-[2a10:3781:525:1::215]:25714
-[2a10:3781:525:6::10]:25714
-[2a10:3781:525:6::11]:25714
+[2a10:3781:525::1]:25714
+
 
 # Onion nodes
 tzpgz5hg5d2xxipzgy6fuwhkcxun2at3z37bc53k3krerwo4dhwk4xad.onion:25714
+s3fhynnohiq666qor6tegsxcxzsirgecp425hc3nwfcsqdurxtsazzyd.onion:25714
+v2zvr54qt5zf677vnczxzekyqn4hk6efpvx3u77vq7iwhulf2ajmsbid.onion:25714
diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -5,7 +5,7 @@ Bitcoin Core version 27.2 is now available from:
 
   <https://bitcoincore.org/bin/bitcoin-core-27.2/>
 
-This release includes various bug fixes and performance
+This release includes new features, various bug fixes and performance
 improvements, as well as updated translations.
 
 Please report bugs using the issue tracker at GitHub:
@@ -69,7 +69,7 @@ Notable changes
 - #30283 upnp: fix build with miniupnpc 2.2.8
 - #30633 Fixes for GCC 15 compatibility
 
-### CI
+### Misc
 
 - #30193 ci: move ASan job to GitHub Actions from Cirrus CI
 - #30299 ci: remove unused bcc variable from workflow