Merge remote-tracking branch 'upstream/25.x'

.gitignore

@@ -2,18 +2,18 @@
 
 *.exe
 *.pdb
-src/blackmore
-src/blackmored
-src/blackmore-cli
-src/blackmore-gui
-src/blackmore-node
-src/blackmore-tx
-src/blackmore-util
-src/blackmore-chainstate
-src/blackmore-wallet
+src/bitcoin
+src/bitcoind
+src/bitcoin-cli
+src/bitcoin-gui
+src/bitcoin-node
+src/bitcoin-tx
+src/bitcoin-util
+src/bitcoin-chainstate
+src/bitcoin-wallet
 src/test/fuzz/fuzz
-src/test/test_blackmore
-src/qt/test/test_blackmore-qt
+src/test/test_bitcoin
+src/qt/test/test_bitcoin-qt
 
 # autoreconf
 Makefile.in
@@ -50,11 +50,11 @@ src/qt/forms/ui_*.h
 
 src/qt/test/moc*.cpp
 
-src/qt/blackmore-qt.config
-src/qt/blackmore-qt.creator
-src/qt/blackmore-qt.creator.user
-src/qt/blackmore-qt.files
-src/qt/blackmore-qt.includes
+src/qt/bitcoin-qt.config
+src/qt/bitcoin-qt.creator
+src/qt/bitcoin-qt.creator.user
+src/qt/bitcoin-qt.files
+src/qt/bitcoin-qt.includes
 
 .deps
 .dirstamp
@@ -92,15 +92,15 @@ src/qt/blackmore-qt.includes
 *.qm
 Makefile
 !depends/Makefile
-src/qt/blackmore-qt
-Blackmore-Qt.app
+src/qt/bitcoin-qt
+Bitcoin-Qt.app
 
 # Qt Creator
 Makefile.am.user
 
 # Unit-tests
 Makefile.test
-blackmore-qt_test
+bitcoin-qt_test
 
 # Resources cpp
 qrc_*.cpp
@@ -138,8 +138,8 @@ test/.mypy_cache/
 libbitcoinconsensus.pc
 contrib/devtools/split-debug.sh
 
-# Output from running db62 installation
-db62/
+# Output from running db4 installation
+db4/
 
 # clang-check
 *.plist
@@ -151,7 +151,34 @@ dist/
 
 /ci/scratch/
 
-# Visual Studio
-.vscode/*
-.vs/*
+# Blackcoin specifics
 
+#binaries
+src/blackmore
+src/blackmored
+src/blackmore-cli
+src/blackmore-gui
+src/blackmore-node
+src/blackmore-tx
+src/blackmore-util
+src/blackmore-chainstate
+src/blackmore-wallet
+src/test/test_blackmore
+src/qt/test/test_blackmore-qt
+
+# autoreconf
+src/qt/blackmore-qt.config
+src/qt/blackmore-qt.creator
+src/qt/blackmore-qt.creator.user
+src/qt/blackmore-qt.files
+src/qt/blackmore-qt.includes
+
+# Compilation and Qt preprocessor part
+src/qt/blackmore-qt
+Blackmore-Qt.app
+
+# Unit-tests
+blackmore-qt_test
+
+# Output from running db62 installation
+db62/

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v25.1.0-alpha-3 (2024-01-30)
+- Set mainnet hard fork date to April 24, 2024
+- Use virtual transaction size in minimum fee calculation
+- Fixed a bug with header syncing between More 25.1 nodes
+- Fixed windows build
+- Enabled flushing of orphaned stakes also on wallet start
+- Enabled staking with P2WPKH inputs
+
 ## v25.1.0-alpha-2 (2023-11-24)
 - Fixed a bug with segfault on wallet close when staking is enabled
 - Added full support for descriptor wallets, including staking
@@ -12,7 +20,7 @@
 - Updated to Bitcoin Core 25.1
 - Removed OpenSSL
 - Implemented maximum witness size policy (Peercoin RFC-0027)
-- Added optimizeutxoset RPC method to simplify splitting coins for efficient staking (Peercoin PR #711)
+- Added `optimizeutxoset` RPC method to simplify splitting coins for efficient staking (Peercoin PR711)
 - Added a GUI warning if unable to stake
 
 ## v22.1.0-alpha-2 (2023-01-24)
@@ -23,6 +31,10 @@
 ## v22.1.0-alpha-1 (2023-01-20)
 - Updated to Bitcoin Core 22.1
 
+## v13.2.2 (2024-01-24)
+- Set mainnet hard fork date to April 24, 2024
+- Adjusted minimum fee calculations
+
 ## v13.2.1 (2023-07-04)
 - Reduced the minimum fee after a fork
 - Fixed a bug in the derivation of TxTime that could potentially lead to unplanned hard forks
@@ -47,8 +59,8 @@
 - Updated univalue to v1.0.3
 - Updated to Qt v5.12.11
 - Updated to OpenSSL v1.1.1m
-- Added "getstakereport" RPC call
-- Added --use-sse2 to enable SSE2
+- Added `getstakereport` RPC call
+- Added `--use-sse2` to enable SSE2
 - Code cleanup (headers, names, etc)
 
 ## v2.13.2.8 (2021-02-24)
@@ -80,22 +92,22 @@
 
 ## v2.13.2.4 (2019-11-11)
 - Updated fixed seeds
-- Added burn RPC call
-- Set default MAX_OP_RETURN_RELAY to 15000
+- Added `burn` RPC call
+- Set default `MAX_OP_RETURN_RELAY` to 15000
 - Removed unit selector from status bar
 
 ## v2.13.2.3 (2019-04-02)
 - Updated fixed seeds
 - Some small fixes and refactorings
 - Fixed wrongly displayed balances in GUI and RPC
 - Added header spam filter (fake stake vulnerability fix)
-- Added total balance in RPC call getwalletinfo
+- Added total balance in RPC call `getwalletinfo`
 
 ## v2.13.2.2 (2019-03-13)
 - Updated dependencies
 - Updated fixed seeds
 - Some small fixes and updates
-- Fixed walletpassphrase RPC call (wallet now can be unlocked for staking only)
+- Fixed `walletpassphrase` RPC call (wallet now can be unlocked for staking only)
 - Allowed connections from peers with protocol version 60016
 - Disabled BIP 152
 
@@ -107,8 +119,8 @@
 - Added Qt support for ARMv7
 - Added out-of-sync modal window (backport of Core's PR8371, PR8802, PR8805, PR8906, PR8985, PR9088, PR9461, PR9462)
 - Added support for nested commands and simple value queries in RPC console (backport of Core's PR7783)
-- Added abortrescan RPC call (backport of Core's PR10208)
-- Added reservebalance RPC call
+- Added `abortrescan` RPC call (backport of Core's PR10208)
+- Added `reservebalance` RPC call
 - Removed SegWit
 - Removed replace-by-fee
 - Removed address indexes
@@ -119,7 +131,7 @@
 ## v2.12.1.1 (2018-10-01)
 - Rebranded to Blackcoin More
 - Some small fixes and updates from Bitcoin Core 0.13.x branch
-- Added use available balance button in send coins dialog (backport of Core's PR11316)
+- Added "Use available balance" button in send coins dialog (backport of Core's PR11316)
 - Added a button to open the config file in a text editor (backport of Core's PR9890)
-- Added uptime RPC call (backport of Core's PR10400)
+- Added `uptime` RPC call (backport of Core's PR10400)
 - Removed P2P alert system (backport of Core's PR7692)

Makefile.am

@@ -67,9 +67,9 @@ OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_INSTALLER_ICONS) \
   $(top_srcdir)/contrib/macdeploy/detached-sig-create.sh
 
 COVERAGE_INFO = $(COV_TOOL_WRAPPER) baseline.info \
-  test_bitcoin_filtered.info total_coverage.info \
+  test_blackmore_filtered.info total_coverage.info \
   baseline_filtered.info functional_test.info functional_test_filtered.info \
-  test_bitcoin_coverage.info test_bitcoin.info fuzz.info fuzz_filtered.info fuzz_coverage.info
+  test_blackmore_coverage.info test_blackmore.info fuzz.info fuzz_filtered.info fuzz_coverage.info
 
 dist-hook:
 	-$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf -
@@ -204,16 +204,16 @@ fuzz_filtered.info: fuzz.info
 	$(abs_builddir)/contrib/filter-lcov.py $(LCOV_FILTER_PATTERN) $< $@
 	$(LCOV) -a $@ $(LCOV_OPTS) -o $@
 
-test_bitcoin.info: baseline_filtered.info
+test_blackmore.info: baseline_filtered.info
 	$(MAKE) -C src/ check
-	$(LCOV) -c $(LCOV_OPTS) -d $(abs_builddir)/src -t test_bitcoin -o $@
+	$(LCOV) -c $(LCOV_OPTS) -d $(abs_builddir)/src -t test_blackmore -o $@
 	$(LCOV) -z $(LCOV_OPTS) -d $(abs_builddir)/src
 
-test_bitcoin_filtered.info: test_bitcoin.info
+test_blackmore_filtered.info: test_blackmore.info
 	$(abs_builddir)/contrib/filter-lcov.py $(LCOV_FILTER_PATTERN) $< $@
 	$(LCOV) -a $@ $(LCOV_OPTS) -o $@
 
-functional_test.info: test_bitcoin_filtered.info
+functional_test.info: test_blackmore_filtered.info
 	@TIMEOUT=15 test/functional/test_runner.py $(EXTENDED_FUNCTIONAL_TESTS)
 	$(LCOV) -c $(LCOV_OPTS) -d $(abs_builddir)/src --t functional-tests -o $@
 	$(LCOV) -z $(LCOV_OPTS) -d $(abs_builddir)/src
@@ -225,17 +225,17 @@ functional_test_filtered.info: functional_test.info
 fuzz_coverage.info: fuzz_filtered.info
 	$(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a fuzz_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
 
-test_bitcoin_coverage.info: baseline_filtered.info test_bitcoin_filtered.info
-	$(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_bitcoin_filtered.info -o $@
+test_blackmore_coverage.info: baseline_filtered.info test_blackmore_filtered.info
+	$(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_blackmore_filtered.info -o $@
 
-total_coverage.info: test_bitcoin_filtered.info functional_test_filtered.info
-	$(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_bitcoin_filtered.info -a functional_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
+total_coverage.info: test_blackmore_filtered.info functional_test_filtered.info
+	$(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_blackmore_filtered.info -a functional_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
 
 fuzz.coverage/.dirstamp: fuzz_coverage.info
 	$(GENHTML) -s $(LCOV_OPTS) $< -o $(@D)
 	@touch $@
 
-test_bitcoin.coverage/.dirstamp:  test_bitcoin_coverage.info
+test_blackmore.coverage/.dirstamp:  test_blackmore_coverage.info
 	$(GENHTML) -s $(LCOV_OPTS) $< -o $(@D)
 	@touch $@
 
@@ -245,7 +245,7 @@ total.coverage/.dirstamp: total_coverage.info
 
 cov_fuzz: fuzz.coverage/.dirstamp
 
-cov: test_bitcoin.coverage/.dirstamp total.coverage/.dirstamp
+cov: test_blackmore.coverage/.dirstamp total.coverage/.dirstamp
 
 endif
 
@@ -334,7 +334,7 @@ clean-docs:
 	rm -rf doc/doxygen
 
 clean-local: clean-docs
-	rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ fuzz.coverage/ test/tmp/ cache/ $(OSX_APP)
+	rm -rf coverage_percent.txt test_blackmore.coverage/ total.coverage/ fuzz.coverage/ test/tmp/ cache/ $(OSX_APP)
 	rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache share/rpcauth/__pycache__
 	rm -rf osx_volname dist/
 

configure.ac

@@ -1678,7 +1678,7 @@ AC_MSG_CHECKING([whether to build blackmore-util])
 AM_CONDITIONAL([BUILD_BITCOIN_UTIL], [test $build_bitcoin_util = "yes"])
 AC_MSG_RESULT($build_bitcoin_util)
 
-AC_MSG_CHECKING([whether to build experimental bitcoin-chainstate])
+AC_MSG_CHECKING([whether to build experimental blackmore-chainstate])
 if test "$build_bitcoin_chainstate" = "yes"; then
   if test "$build_experimental_kernel_lib" = "no"; then
     AC_MSG_ERROR([experimental blackmore-chainstate cannot be built without the experimental bitcoinkernel library. Use --with-experimental-kernel-lib]);

contrib/seeds/nodes_main.txt

@@ -1,47 +1,49 @@
 # List of fixed seed nodes for main network
 
 # IPv4 nodes
-167.86.117.103
-167.86.117.144
-167.86.117.143
-45.137.91.173
-45.138.55.130
-45.138.55.134
-216.39.250.91
-172.99.189.198
-152.228.187.235
-81.0.246.79
-92.60.44.21
-94.130.176.201
-119.45.242.241
-70.59.61.107
-116.203.82.109
-84.249.4.71
-125.228.69.196
-193.164.140.87
-113.118.18.149
-152.228.187.235
-94.231.253.146
-95.217.78.81
-118.195.208.33
-194.193.140.45
-192.230.223.13
-98.250.168.70
-58.104.47.195
-68.224.52.56
-71.184.152.225
-109.88.22.67
+167.86.117.103:15714
+167.86.117.144:15714
+167.86.117.143: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:2056:6532::1]
-[2a02:c207:2056:6534::1]
-[2a02:c207:2056:6533::1]
-[2a02:c204:2110:9258::1]
-[2a02:c207:2041:3853::1]
-[2604:86c0:f201:6::10:91]
-[2602:fec3:2:10::9:91]
-[2a10:3781:525:1::201]
-[2a10:3781:525:1::210]
+[2a02:c207:2041:3853::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
+[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
 
 # Onion nodes
 jgsfxfwhm7vdabt5dxl42il7uenvysknyedtzuaiajo7w5bv5jf2jpid.onion:15714