Skip to content

Commit

Permalink
Merge branch 'develop' into segwit
Browse files Browse the repository at this point in the history
  • Loading branch information
BlackcoinDev committed Oct 1, 2024
2 parents 3ccfba2 + 6158e90 commit f55b5d6
Show file tree
Hide file tree
Showing 338 changed files with 9,679 additions and 8,255 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ first. See CONTRIBUTING.md

<!--
Please provide clear motivation for your patch and explain how it improves
Blackcoin More user experience or Blackcoin More developer experience
USDG user experience or USDG developer experience
significantly:
* Any test improvements or new tests that improve coverage are always welcome.
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

- name: linux-64-bit
host: x86_64-pc-linux-gnu
os: ubuntu-20.04
os: ubuntu-22.04
packages: python3
check-security: false
check-symbols: false
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:

- name: linux-arm-64-bit
host: aarch64-linux-gnu
os: ubuntu-20.04
os: ubuntu-22.04
packages: g++-aarch64-linux-gnu binutils-aarch64-linux-gnu
check-security: false
check-symbols: false
Expand Down Expand Up @@ -119,11 +119,11 @@ jobs:
run: ${{ matrix.postinstall }}

- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v3

- name: SDK cache
if: ${{ matrix.sdk }}
uses: actions/cache@v4.0.2
uses: actions/cache@v3
env:
cache-name: sdk
with:
Expand All @@ -149,7 +149,7 @@ jobs:
- name: Build depends
run: |
make -j $MAKEJOBS -C depends HOST=${{ matrix.host }} ${{ matrix.dep-opts }}
- name: Build Blackcoin
- name: Build USDG
run: |
./autogen.sh
./configure --prefix=`pwd`/depends/${{ matrix.host }} ${{ matrix.config-opts }} --enable-reduce-exports || ( cat config.log && false)
Expand All @@ -168,8 +168,8 @@ jobs:
with:
name: blackcoin-more-segwit-${{ github.sha }}-${{ matrix.name }}
path: |
depends/${{ matrix.host }}/bin/blackmore*
dist/Blackmore-Qt.app
depends/${{ matrix.host }}/bin/usdg*
dist/USDG-Qt.app
if-no-files-found: error
retention-days: 14

Expand Down
82 changes: 41 additions & 41 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

*.exe
*.pdb
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/usdg
src/usdgd
src/usdg-cli
src/usdg-gui
src/usdg-node
src/usdg-tx
src/usdg-util
src/usdg-chainstate
src/usdg-wallet
src/test/fuzz/fuzz
src/test/test_bitcoin
src/qt/test/test_bitcoin-qt
src/test/test_usdg
src/qt/test/test_usdg-qt

# autoreconf
Makefile.in
Expand Down Expand Up @@ -50,11 +50,11 @@ src/qt/forms/ui_*.h

src/qt/test/moc*.cpp

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
src/qt/usdg-qt.config
src/qt/usdg-qt.creator
src/qt/usdg-qt.creator.user
src/qt/usdg-qt.files
src/qt/usdg-qt.includes

.deps
.dirstamp
Expand Down Expand Up @@ -92,15 +92,15 @@ src/qt/bitcoin-qt.includes
*.qm
Makefile
!depends/Makefile
src/qt/bitcoin-qt
Bitcoin-Qt.app
src/qt/usdg-qt
USDG-Qt.app

# Qt Creator
Makefile.am.user

# Unit-tests
Makefile.test
bitcoin-qt_test
usdg-qt_test

# Resources cpp
qrc_*.cpp
Expand Down Expand Up @@ -138,8 +138,8 @@ test/.mypy_cache/
libbitcoinconsensus.pc
contrib/devtools/split-debug.sh

# Output from running db4 installation
db4/
# Output from running db62 installation
db62/

# clang-check
*.plist
Expand All @@ -151,34 +151,34 @@ dist/

/ci/scratch/

# Blackcoin specifics
# USDG 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
src/usdg
src/usdgd
src/usdg-cli
src/usdg-gui
src/usdg-node
src/usdg-tx
src/usdg-util
src/usdg-chainstate
src/usdg-wallet
src/test/test_usdg
src/qt/test/test_usdg-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
src/qt/usdg-qt.config
src/qt/usdg-qt.creator
src/qt/usdg-qt.creator.user
src/qt/usdg-qt.files
src/qt/usdg-qt.includes

# Compilation and Qt preprocessor part
src/qt/blackmore-qt
Blackmore-Qt.app
src/qt/usdg-qt
USDG-Qt.app

# Unit-tests
blackmore-qt_test
usdg-qt_test

# Output from running db62 installation
db62/
Expand Down
166 changes: 6 additions & 160 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,164 +1,10 @@
# Changelog

## 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)
## 26.2.0
- ?

## v26.1.0-beta-1 (2024-05-24)
- Updated to Bitcoin Core 26.1
- Create V2 transactions by default
- Disconnect from peers older than version 70015
- Increased `DUST_RELAY_TX_FEE` and `DEFAULT_MIN_RELAY_TX_FEE` to 100000
- Eliminated segfault occurring after a power outage
- Enabled V2 P2P transport by default (backport of Core's PR29347 and 29058)
- Enabled `checkkernel` RPC call
- Only delete the PID file if we created it (backport of Core's PR28946)
- Set minimum UTXO value to be used for staking to 0.1 BLK (can be overridden with `-minstakingamount` parameter)
## 26.1.0
- ?

## v26.0.0-beta-1 (2024-02-12)
- Updated to Bitcoin Core 26.0
- Fixed a bug that prevented adding more inputs in the coinstake transaction for legacy wallets
- Fixed a bug causing inability to connect to fixed seeds
- Fixed reindexing

## 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
- Added support for staking with multiple wallets simultaneously
- Removed GUI staking warnings due to incompatibility with multiple staking threads
- Enabled `staking` RPC call
- Multiple minor changes to ThreadStakeMiner() algorithm

## v25.1.0-alpha-1 (2023-10-24)
- 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 PR711)
- Added a GUI warning if unable to stake

## v22.1.0-alpha-2 (2023-01-24)
- Flush orphaned stakes prior to each staking attempt
- Enabled checkpoints by default
- Added rolling checkpoints checks

## v22.1.0-alpha-1 (2023-01-20)
- Updated to Bitcoin Core 22.1

## v13.2.3 (2024-05-18)
- Create V2 transactions by default
- Disconnect from peers older than version 70015
- Increased `DEFAULT_MIN_RELAY_TX_FEE` to 100000

## 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
- Fixed a segfault issue occurring during the initial sync

## v13.2.0 (2022-11-24)
- Changed versioning (backport of Core's PR20223)
- Testnet hard fork: Removed transaction timestamp
- Testnet hard fork: Increased transaction fees and set minimum transaction fee of 0.001 BLK
- Testnet hard fork: Enabled relative timelocks (OP_CHECKSEQUENCEVERIFY, BIP62, 112 and 113)
- Enabled compact block relay protocol (BIP152)
- Added an option to donate the specified percentage of staking rewards to the dev fund (20% by default)
- Set default `MAX_OP_RETURN_RELAY` to 223
- Removed `sendfreetransactions` argument
- Get rid of `AA_EnableHighDpiScaling` warning (backport of Core's PR16254)
- Updated multiple dependencies

## v2.13.2.9 (2022-02-24)
- Updated leveldb, which should resolve the "missing UTXO" staking issue
- Updated dependencies and ported build system from Bitcoin Core 0.20+
- Updated crypto and added CRC32 for ARM64
- 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
- Code cleanup (headers, names, etc)

## v2.13.2.8 (2021-02-24)
- Immediately ban clients operating on forked chains older than nMaxReorganizationDepth
- Fixed IsDust() policy to allow atomic swaps
- Updated fixed seeds for mainnet and testnet
- Updated dependencies for MacOS

## v2.13.2.7 (2020-11-24)
- Dust mitigation in mempool (by JJ12880 from Radium Core)
- Compile on MacOS Catalina
- Cross-compile MacOS with Xcode 11.3.1
- Updated dependencies for Windows x64, Linux x64, MacOS, ARM64, ARMv7
- Sign/verify compatibility with legacy clients
- Increased dbcache to 450MB
- Disabled stake cache for now
- Updated fixed seeds for mainnet and testnet

## v2.13.2.6 (2020-07-21)
- Fix staking memory leak (by JJ12880 from Radium Core)
- Updated fixed seeds
- Added secondary Blackcoin DNS seeder

## v2.13.2.5 (2020-04-28)
- Updated Berkeley DB to 6.2.38
- Updated OpenSSL to 1.0.2u
- Updated fixed seeds
- Changed default port on regtest to 35714

## v2.13.2.4 (2019-11-11)
- Updated fixed seeds
- 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`

## 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)
- Allowed connections from peers with protocol version 60016
- Disabled BIP 152

## v2.13.2.1 (2018-12-03)
- Updated to Bitcoin Core 0.13.2
- Some small fixes and updates from Bitcoin Core 0.14.x branch
- Fixed testnet and regtest
- Added Qt 5.9 support for cross-compile
- 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
- Removed SegWit
- Removed replace-by-fee
- Removed address indexes
- Removed relaying of double-spends
- Removed drivechain support using OP_COUNT_ACKS
- Proof-of-stake related code optimized and refactored

## 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 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)
- Removed P2P alert system (backport of Core's PR7692)
## 22.1.0
- ?
Loading

0 comments on commit f55b5d6

Please sign in to comment.