diff --git a/.github/workflows/build-all-and-release.yml b/.github/workflows/build-all-and-release.yml index c5dca0f3..6e2c6a75 100644 --- a/.github/workflows/build-all-and-release.yml +++ b/.github/workflows/build-all-and-release.yml @@ -1,13 +1,15 @@ -name: '[Full Build - Linux, Windows, MacOS]' +name: '[Full Build - Linux (Ubuntu 20,22,24), Windows32, Windows64, MacOS]' on: push: tags: - 'v[0-9]+.[0-9]+.[0-9]+' + release: + types: [published] jobs: - macos: - runs-on: macos-12 + macos13: + runs-on: macos-13 steps: - uses: actions/checkout@v4 @@ -16,10 +18,16 @@ jobs: run: git config credential.helper - name: Brew install base dependencies - run: brew install automake berkeley-db@4 boost@1.76 miniupnpc qt@5 gperf qrencode librsvg && curl -L https://raw.githubusercontent.com/vergecurrency/protobuf261/master/protobuf261.rb > protobuf261.rb && brew install protobuf261.rb + run: | + # A workaround for "The `brew link` step did not complete successfully" error. + brew install --quiet python@3 || brew link --overwrite python@3 + brew install --quiet automake berkeley-db@4 miniupnpc qt@5 gperf qrencode librsvg && curl -L https://raw.githubusercontent.com/vergecurrency/protobuf261/master/protobuf261.rb > protobuf261.rb && brew install protobuf261.rb + - name: Brew install boost from our homebrew deps + run: curl -L https://raw.githubusercontent.com/vergecurrency/verge/refs/heads/master/depends/homebrew-formulas/boost176.rb > boost176.rb && brew install boost176.rb + - name: Brew link dependencies - run: brew link boost@1.76 qt@5 berkeley-db@4 + run: brew link qt@5 berkeley-db@4 boost176 - name: Auto generate run: ./autogen.sh @@ -30,20 +38,65 @@ jobs: - name: make run: make -j4 - - name: make check - run: make check -j4 - - name: make .dmg run: make deploy - uses: actions/upload-artifact@v4 with: - name: verge-macos.zip + name: verge-macos13 path: | *.dmg - linux-ubuntu20: - runs-on: ubuntu-20.04 + macos14: + runs-on: macos-14 + + steps: + - uses: actions/checkout@v4 + + - name: git config credential.helper + run: git config credential.helper + + - name: get previous xcode and switch to it + run: ls -la /Applications/Xcode* && sudo xcode-select -switch /Applications/Xcode_15.2.app + + - name: Brew install base dependencies + run: | + # A workaround for "The `brew link` step did not complete successfully" error. + brew install --quiet python@3 || brew link --overwrite python@3 + brew install --quiet automake autoconf berkeley-db@4 pkg-config miniupnpc zeromq libtool qt@5 gperf qrencode librsvg && curl -L https://raw.githubusercontent.com/vergecurrency/protobuf261/master/protobuf261.rb > protobuf261.rb && brew install protobuf261.rb + + - name: Brew install boost from our homebrew deps + run: curl -L https://raw.githubusercontent.com/vergecurrency/verge/refs/heads/master/depends/homebrew-formulas/boost176.rb > boost176.rb && brew install boost176.rb + + - name: Brew link dependencies + run: brew link boost176 qt@5 berkeley-db@4 + + - name: check cellar for openssl + run: cd /opt/homebrew/Cellar/openssl@3/ && ls + + - name: which clang/xcode + run: clang --version + + - name: Auto generate + run: ./autogen.sh + + - name: configure + run: export LDFLAGS="-L/opt/homebrew/opt/boost176/lib" && export CPPFLAGS="-I/opt/homebrew/opt/boost176/include" && ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --with-gui --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib --with-openssl-dir=/opt/homebrew/Cellar/openssl@3/3.4.1 --with-libevent-dir=/opt/homebrew/Cellar/libevent/2.1.12_1 --with-boost=/opt/homebrew/Cellar/boost176/1.76.0_6 + + - name: make + run: make -j4 + + - name: make .dmg + run: make deploy + + - uses: actions/upload-artifact@v4 + with: + name: verge-macos14 + path: | + *.dmg + + ubuntu24: + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 @@ -61,25 +114,22 @@ jobs: run: ./autogen.sh - name: configure - run: ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib + run: CONFIG_SITE=$PWD/depends/x86_64-linux-gnu/share/config.site ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib - name: make run: make -j4 - - name: make check - run: make check -j4 - - uses: actions/upload-artifact@v4 with: - name: verge-ubuntu20.zip + name: verge-ubuntu24 path: | ./src/verged ./src/verge-cli ./src/verge-tx ./src/qt/verge-qt - - linux-ubuntu22: - runs-on: ubuntu-latest + + ubuntu22: + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 @@ -97,25 +147,55 @@ jobs: run: ./autogen.sh - name: configure - run: ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib + run: CONFIG_SITE=$PWD/depends/x86_64-linux-gnu/share/config.site ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib - name: make run: make -j4 - - name: make check - run: make check -j4 + - uses: actions/upload-artifact@v4 + with: + name: verge-ubuntu22 + path: | + ./src/verged + ./src/verge-cli + ./src/verge-tx + ./src/qt/verge-qt + + ubuntu20: + runs-on: ubuntu-20.04 + + steps: + - uses: actions/checkout@v4 + + - name: Update apt repos + run: sudo apt-get update + + - name: Install base dependencies + run: sudo apt-get install build-essential xutils-dev libtool gperf autotools-dev automake pkg-config bsdmainutils libattr1-dev make automake bison byacc cmake curl g++-multilib binutils-gold bison byacc python3 + + - name: Build depends + run: cd depends/ && make -j4 HOST=x86_64-linux-gnu + + - name: Auto generate + run: ./autogen.sh + + - name: configure + run: CONFIG_SITE=$PWD/depends/x86_64-linux-gnu/share/config.site ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib + + - name: make + run: make -j4 - uses: actions/upload-artifact@v4 with: - name: verge-ubuntu22.zip + name: verge-ubuntu20 path: | ./src/verged ./src/verge-cli ./src/verge-tx ./src/qt/verge-qt - - windows: - runs-on: ubuntu-latest + + windows32: + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 @@ -146,7 +226,46 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: verge-windows.zip + name: verge-windows32 + path: | + /home/runner/work/verge/verge/src/verged.exe + /home/runner/work/verge/verge/src/verge-cli.exe + /home/runner/work/verge/verge/src/verge-tx.exe + /home/runner/work/verge/verge/src/qt/verge-qt.exe + + windows64: + runs-on: ubuntu-22.04 + + steps: + - uses: actions/checkout@v4 + + - name: Update apt repos + run: sudo apt-get update + + - name: Install base dependencies + run: sudo apt-get install build-essential libtool gperf autotools-dev automake pkg-config bsdmainutils curl git bison byacc python3 nsis + + - name: Force Posix + run: sudo apt install g++-mingw-w64-x86-64 && sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix + + - name: Build depends for MingW32 Cross Compile + run: PATH=$(echo "$PATH" | sed -e 's/:\/mnt.*//g') && cd depends/ && make HOST=x86_64-w64-mingw32 -j2 + + - name: Auto generate + run: ./autogen.sh + + - name: configure + run: CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure --prefix=/ --disable-bench --disable-tests + + - name: make + run: make -j2 + + - name: strip + run: cd ./src && strip verged.exe verge-cli.exe verge-tx.exe && cd ./qt && strip verge-qt.exe + + - uses: actions/upload-artifact@v4 + with: + name: verge-windows64 path: | /home/runner/work/verge/verge/src/verged.exe /home/runner/work/verge/verge/src/verge-cli.exe @@ -155,7 +274,7 @@ jobs: SendReleases: runs-on: ubuntu-latest - needs: [macos, linux-ubuntu20, linux-ubuntu22, windows] + needs: [macos13, macos14, ubuntu20, ubuntu22, ubuntu24, windows32, windows64] steps: @@ -164,25 +283,63 @@ jobs: - uses: actions/download-artifact@v4 with: - name: verge-windows.zip + name: verge-windows32 + path: verge-windows32 - uses: actions/download-artifact@v4 with: - name: verge-macos.zip + name: verge-windows64 + path: verge-windows64 - uses: actions/download-artifact@v4 with: - name: verge-ubuntu20.zip + name: verge-macos13 + path: verge-macos13 - uses: actions/download-artifact@v4 with: - name: verge-ubuntu22.zip + name: verge-macos14 + path: verge-macos14 + - uses: actions/download-artifact@v4 + with: + name: verge-ubuntu20 + path: verge-ubuntu20 + - uses: actions/download-artifact@v4 + with: + name: verge-ubuntu22 + path: verge-ubuntu22 + - uses: actions/download-artifact@v4 + with: + name: verge-ubuntu24 + path: verge-ubuntu24 + + - name: Create zips + run: | + zip -r verge-windows32.zip verge-windows32/ + zip -r verge-windows64.zip verge-windows64/ + zip -r verge-macos13.zip verge-macos13/ + zip -r verge-macos14.zip verge-macos14/ + zip -r verge-ubuntu20.zip verge-ubuntu20/ + zip -r verge-ubuntu22.zip verge-ubuntu22/ + zip -r verge-ubuntu24.zip verge-ubuntu24/ + + - name: List downloaded artifacts + run: ls -lR + + - name: sha256 + run: | + find . -type f -name "*.zip" | xargs sha256sum -b > SHA256SUMS.txt + cat SHA256SUMS.txt - name: push zips to release uses: softprops/action-gh-release@v2 with: - tag_name: v7.5.0 + tag_name: v7.9.0 files: | - verge-windows.zip - verge-macos.zip + verge-windows32.zip + verge-windows64.zip + verge-macos13.zip + verge-macos14.zip verge-ubuntu20.zip verge-ubuntu22.zip + verge-ubuntu24.zip + SHA256SUMS.txt env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/check-commit.yml b/.github/workflows/check-commit.yml index 95482139..5d42eaf5 100644 --- a/.github/workflows/check-commit.yml +++ b/.github/workflows/check-commit.yml @@ -1,8 +1,8 @@ on: push jobs: - macos: - runs-on: macos-12 + macos13: + runs-on: macos-13 steps: - uses: actions/checkout@v4 @@ -11,34 +11,88 @@ jobs: run: git config credential.helper - name: Brew install base dependencies - run: brew install automake berkeley-db@4 boost@1.76 miniupnpc qt@5 gperf qrencode librsvg && curl -L https://raw.githubusercontent.com/vergecurrency/protobuf261/master/protobuf261.rb > protobuf261.rb && brew install protobuf261.rb - + run: | + # A workaround for "The `brew link` step did not complete successfully" error. + brew install --quiet python@3 || brew link --overwrite python@3 + brew install --quiet automake berkeley-db@4 miniupnpc qt@5 gperf qrencode librsvg && curl -L https://raw.githubusercontent.com/vergecurrency/protobuf261/master/protobuf261.rb > protobuf261.rb && brew install protobuf261.rb + + - name: Brew install boost from our homebrew deps + run: curl -L https://raw.githubusercontent.com/vergecurrency/verge/refs/heads/master/depends/homebrew-formulas/boost176.rb > boost176.rb && brew install boost176.rb + - name: Brew link dependencies - run: brew link boost@1.76 qt@5 berkeley-db@4 + run: brew link qt@5 berkeley-db@4 boost176 + + - name: which clang/xcode + run: clang --version - name: Auto generate run: ./autogen.sh - name: configure - run: ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --with-gui --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib + run: ./configure --enable-scrypt-sse2 --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --with-gui --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib - name: make run: make -j4 - - name: make check - run: make check -j4 - - name: make .dmg run: make deploy - uses: actions/upload-artifact@v4 with: - name: verge-macos.zip + name: verge-macos13 path: | *.dmg - linux: - runs-on: ubuntu-latest + macos14: + runs-on: macos-14 + + steps: + - uses: actions/checkout@v4 + + - name: git config credential.helper + run: git config credential.helper + + - name: get previous xcode and switch to it + run: ls -la /Applications/Xcode* && sudo xcode-select -switch /Applications/Xcode_15.2.app + + - name: Brew install base dependencies + run: | + # A workaround for "The `brew link` step did not complete successfully" error. + brew install --quiet python@3 || brew link --overwrite python@3 + brew install --quiet automake autoconf berkeley-db@4 pkg-config miniupnpc zeromq libtool qt@5 gperf qrencode librsvg && curl -L https://raw.githubusercontent.com/vergecurrency/protobuf261/master/protobuf261.rb > protobuf261.rb && brew install protobuf261.rb + + - name: Brew install boost from our homebrew deps + run: curl -L https://raw.githubusercontent.com/vergecurrency/verge/refs/heads/master/depends/homebrew-formulas/boost176.rb > boost176.rb && brew install boost176.rb + + - name: Brew link dependencies + run: brew link boost176 qt@5 berkeley-db@4 + + - name: check cellar for openssl + run: cd /opt/homebrew/Cellar/openssl@3/ && ls + + - name: which clang/xcode + run: clang --version + + - name: Auto generate + run: ./autogen.sh + + - name: configure + run: export LDFLAGS="-L/opt/homebrew/opt/boost176/lib" && export CPPFLAGS="-I/opt/homebrew/opt/boost176/include" && ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --with-gui --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib --with-openssl-dir=/opt/homebrew/Cellar/openssl@3/3.4.1 --with-libevent-dir=/opt/homebrew/Cellar/libevent/2.1.12_1 --with-boost=/opt/homebrew/Cellar/boost176/1.76.0_6 + + - name: make + run: make -j4 + + - name: make .dmg + run: make deploy + + - uses: actions/upload-artifact@v4 + with: + name: verge-macos14 + path: | + *.dmg + + ubuntu24: + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 @@ -56,24 +110,60 @@ jobs: run: ./autogen.sh - name: configure - run: ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib + run: CONFIG_SITE=$PWD/depends/x86_64-linux-gnu/share/config.site ./configure --enable-scrypt-sse2 --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib - name: make run: make -j4 + + - name: strip + run: cd ./src && strip verged verge-cli verge-tx && cd ./qt && strip verge-qt + + - uses: actions/upload-artifact@v4 + with: + name: verge-ubuntu24 + path: | + ./src/verged + ./src/verge-cli + ./src/verge-tx + ./src/qt/verge-qt - - name: make check - run: make check -j4 + ubuntu22: + runs-on: ubuntu-22.04 + + steps: + - uses: actions/checkout@v4 + + - name: Update apt repos + run: sudo apt-get update + + - name: Install base dependencies + run: sudo apt-get install build-essential xutils-dev libtool gperf autotools-dev automake pkg-config bsdmainutils libattr1-dev make automake bison byacc cmake curl g++-multilib binutils-gold bison byacc python3 + + - name: Build depends + run: cd depends/ && make -j4 HOST=x86_64-linux-gnu + + - name: Auto generate + run: ./autogen.sh + + - name: configure + run: CONFIG_SITE=$PWD/depends/x86_64-linux-gnu/share/config.site ./configure --enable-scrypt-sse2 --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib + + - name: make + run: make -j4 + + - name: strip + run: cd ./src && strip verged verge-cli verge-tx && cd ./qt && strip verge-qt - uses: actions/upload-artifact@v4 with: - name: verge-ubuntu22.zip + name: verge-ubuntu22 path: | ./src/verged ./src/verge-cli ./src/verge-tx ./src/qt/verge-qt - - linux2: + + ubuntu20: runs-on: ubuntu-20.04 steps: @@ -92,25 +182,25 @@ jobs: run: ./autogen.sh - name: configure - run: ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib + run: CONFIG_SITE=$PWD/depends/x86_64-linux-gnu/share/config.site ./configure --enable-scrypt-sse2 --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib - name: make run: make -j4 - - - name: make check - run: make check -j4 + + - name: strip + run: cd ./src && strip verged verge-cli verge-tx && cd ./qt && strip verge-qt - uses: actions/upload-artifact@v4 with: - name: verge-ubuntu20.zip + name: verge-ubuntu20 path: | ./src/verged ./src/verge-cli ./src/verge-tx ./src/qt/verge-qt - windows: - runs-on: ubuntu-latest + windows32-ubuntu20: + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 @@ -130,6 +220,45 @@ jobs: - name: Auto generate run: ./autogen.sh + - name: configure + run: CONFIG_SITE=$PWD/depends/i686-w64-mingw32/share/config.site ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/i686-w64-mingw32 --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib + + - name: make + run: make -j2 + + - name: strip + run: cd ./src && strip verged.exe verge-cli.exe verge-tx.exe && cd ./qt && strip verge-qt.exe + + - uses: actions/upload-artifact@v4 + with: + name: verge-windows32-ubuntu20 + path: | + /home/runner/work/verge/verge/src/verged.exe + /home/runner/work/verge/verge/src/verge-cli.exe + /home/runner/work/verge/verge/src/verge-tx.exe + /home/runner/work/verge/verge/src/qt/verge-qt.exe + + windows32-ubuntu22: + runs-on: ubuntu-22.04 + + steps: + - uses: actions/checkout@v4 + + - name: Update apt repos + run: sudo apt-get update + + - name: Install base dependencies + run: sudo apt-get install build-essential libtool gperf autotools-dev automake pkg-config bsdmainutils curl git bison byacc python3 nsis + + - name: Force Posix + run: sudo apt-get install g++-mingw-w64-i686 mingw-w64-i686-dev && sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix + + - name: Build depends for MingW32 Cross Compile + run: PATH=$(echo "$PATH" | sed -e 's/:\/mnt.*//g') && cd depends/ && make HOST=i686-w64-mingw32 -j2 + + - name: Auto generate + run: ./autogen.sh + - name: configure run: CONFIG_SITE=$PWD/depends/i686-w64-mingw32/share/config.site ./configure --prefix=/ --disable-bench --disable-tests @@ -141,10 +270,88 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: verge-windows.zip + name: verge-windows32-ubuntu22 path: | /home/runner/work/verge/verge/src/verged.exe /home/runner/work/verge/verge/src/verge-cli.exe /home/runner/work/verge/verge/src/verge-tx.exe /home/runner/work/verge/verge/src/qt/verge-qt.exe + + windows64-ubuntu22: + runs-on: ubuntu-22.04 + + steps: + - uses: actions/checkout@v4 + + - name: Update apt repos + run: sudo apt-get update + + - name: Install base dependencies + run: sudo apt-get install build-essential libtool gperf autotools-dev automake pkg-config bsdmainutils curl git bison byacc python3 nsis + + - name: Force Posix + run: sudo apt install g++-mingw-w64-x86-64 && sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix + + - name: Build depends for MingW32 Cross Compile + run: PATH=$(echo "$PATH" | sed -e 's/:\/mnt.*//g') && cd depends/ && make HOST=x86_64-w64-mingw32 -j2 + + - name: Auto generate + run: ./autogen.sh + + - name: configure + run: CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure --enable-scrypt-sse2 --prefix=/ --disable-bench --disable-tests + + - name: make + run: make -j2 + + - name: strip + run: cd ./src && strip verged.exe verge-cli.exe verge-tx.exe && cd ./qt && strip verge-qt.exe + + - uses: actions/upload-artifact@v4 + with: + name: verge-windows64bit-ubuntu22 + path: | + /home/runner/work/verge/verge/src/verged.exe + /home/runner/work/verge/verge/src/verge-cli.exe + /home/runner/work/verge/verge/src/verge-tx.exe + /home/runner/work/verge/verge/src/qt/verge-qt.exe + + windows64-ubuntu20: + runs-on: ubuntu-20.04 + + steps: + - uses: actions/checkout@v4 + + - name: Update apt repos + run: sudo apt-get update + + - name: Install base dependencies + run: sudo apt-get install build-essential libtool gperf autotools-dev automake pkg-config bsdmainutils curl git bison byacc python3 nsis + + - name: Force Posix + run: sudo apt install g++-mingw-w64-x86-64 && sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix + + - name: Build depends for MingW32 Cross Compile + run: PATH=$(echo "$PATH" | sed -e 's/:\/mnt.*//g') && cd depends/ && make HOST=x86_64-w64-mingw32 -j2 + + - name: Auto generate + run: ./autogen.sh + + - name: configure + run: CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure --enable-scrypt-sse2 --prefix=/ --disable-bench --disable-tests + + - name: make + run: make -j2 + + - name: strip + run: cd ./src && strip verged.exe verge-cli.exe verge-tx.exe && cd ./qt && strip verge-qt.exe + + - uses: actions/upload-artifact@v4 + with: + name: verge-windows64bit-ubuntu20 + path: | + /home/runner/work/verge/verge/src/verged.exe + /home/runner/work/verge/verge/src/verge-cli.exe + /home/runner/work/verge/verge/src/verge-tx.exe + /home/runner/work/verge/verge/src/qt/verge-qt.exe diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml index 647280f3..ad8f96a1 100644 --- a/.github/workflows/pull_requests.yml +++ b/.github/workflows/pull_requests.yml @@ -2,7 +2,7 @@ on: pull_request: types: [opened, reopened. review_requested] jobs: - macos: + macos12: runs-on: macos-12 steps: @@ -12,10 +12,10 @@ jobs: run: git config credential.helper - name: Brew install base dependencies - run: brew install automake berkeley-db4 libtool boost@1.76 miniupnpc qt@5 openssl pkg-config python libevent qrencode librsvg && curl -L https://raw.githubusercontent.com/udalov/protobuf261/master/protobuf261.rb > protobuf261.rb && brew install protobuf261.rb + run: brew install automake berkeley-db@4 boost@1.76 miniupnpc qt@5 gperf qrencode librsvg && curl -L https://raw.githubusercontent.com/vergecurrency/protobuf261/master/protobuf261.rb > protobuf261.rb && brew install protobuf261.rb - name: Brew link dependencies - run: brew link boost@1.76 qt@5 berkeley-db4 + run: brew link boost@1.76 qt@5 berkeley-db@4 - name: Auto generate run: ./autogen.sh @@ -26,14 +26,65 @@ jobs: - name: make run: make -j4 - - name: make check - run: make check -j4 + - name: make .dmg + run: make deploy + + macos13: + runs-on: macos-13 + + steps: + - uses: actions/checkout@v4 + + - name: git config credential.helper + run: git config credential.helper + + - name: Brew install base dependencies + run: | + # A workaround for "The `brew link` step did not complete successfully" error. + brew install --quiet python@3 || brew link --overwrite python@3 + brew install --quiet automake berkeley-db@4 boost@1.76 miniupnpc qt@5 gperf qrencode librsvg && curl -L https://raw.githubusercontent.com/vergecurrency/protobuf261/master/protobuf261.rb > protobuf261.rb && brew install protobuf261.rb + + - name: Brew link dependencies + run: brew link boost@1.76 qt@5 berkeley-db@4 + + - name: Auto generate + run: ./autogen.sh + + - name: configure + run: ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --with-gui --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib + + - name: make + run: make -j4 - name: make .dmg run: make deploy + + ubuntu24: + runs-on: ubuntu-24.04 + + steps: + - uses: actions/checkout@v4 + + - name: Update apt repos + run: sudo apt-get update + + - name: Install base dependencies + run: sudo apt-get install build-essential xutils-dev libtool gperf autotools-dev automake pkg-config bsdmainutils libattr1-dev make automake bison byacc cmake curl g++-multilib binutils-gold bison byacc python3 + + - name: Build depends + run: cd depends/ && make -j4 HOST=x86_64-linux-gnu + + - name: Auto generate + run: ./autogen.sh - linux: - runs-on: ubuntu-latest + - name: configure + run: CONFIG_SITE=$PWD/depends/x86_64-linux-gnu/share/config.site ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib + + - name: make + run: make -j4 + + ubuntu22: + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 @@ -42,7 +93,7 @@ jobs: run: sudo apt-get update - name: Install base dependencies - run: sudo apt-get install build-essential libtool autotools-dev automake pkg-config bsdmainutils libattr1-dev make automake bison byacc cmake curl g++-multilib binutils-gold bison byacc python3 + run: sudo apt-get install build-essential xutils-dev libtool gperf autotools-dev automake pkg-config bsdmainutils libattr1-dev make automake bison byacc cmake curl g++-multilib binutils-gold bison byacc python3 - name: Build depends run: cd depends/ && make -j4 HOST=x86_64-linux-gnu @@ -51,16 +102,37 @@ jobs: run: ./autogen.sh - name: configure - run: ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib + run: CONFIG_SITE=$PWD/depends/x86_64-linux-gnu/share/config.site ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib - name: make run: make -j4 + + ubuntu20: + runs-on: ubuntu-20.04 + + steps: + - uses: actions/checkout@v4 + + - name: Update apt repos + run: sudo apt-get update + + - name: Install base dependencies + run: sudo apt-get install build-essential xutils-dev libtool gperf autotools-dev automake pkg-config bsdmainutils libattr1-dev make automake bison byacc cmake curl g++-multilib binutils-gold bison byacc python3 + + - name: Build depends + run: cd depends/ && make -j4 HOST=x86_64-linux-gnu + + - name: Auto generate + run: ./autogen.sh - - name: make check - run: make check -j4 + - name: configure + run: CONFIG_SITE=$PWD/depends/x86_64-linux-gnu/share/config.site ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib + + - name: make + run: make -j4 - windows: - runs-on: ubuntu-latest + windows32-ubuntu20: + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 @@ -69,7 +141,37 @@ jobs: run: sudo apt-get update - name: Install base dependencies - run: sudo apt-get install build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git bison byacc python3 nsis + run: sudo apt-get install build-essential libtool gperf autotools-dev automake pkg-config bsdmainutils curl git bison byacc python3 nsis + + - name: Force Posix + run: sudo apt-get install g++-mingw-w64-i686 mingw-w64-i686-dev && sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix + + - name: Build depends for MingW32 Cross Compile + run: PATH=$(echo "$PATH" | sed -e 's/:\/mnt.*//g') && cd depends/ && make HOST=i686-w64-mingw32 -j2 + + - name: Auto generate + run: ./autogen.sh + + - name: configure + run: CONFIG_SITE=$PWD/depends/i686-w64-mingw32/share/config.site ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/i686-w64-mingw32 --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib + + - name: make + run: make -j2 + + - name: strip + run: cd ./src && strip verged.exe verge-cli.exe verge-tx.exe && cd ./qt && strip verge-qt.exe + + windows32-ubuntu22: + runs-on: ubuntu-22.04 + + steps: + - uses: actions/checkout@v4 + + - name: Update apt repos + run: sudo apt-get update + + - name: Install base dependencies + run: sudo apt-get install build-essential libtool gperf autotools-dev automake pkg-config bsdmainutils curl git bison byacc python3 nsis - name: Force Posix run: sudo apt-get install g++-mingw-w64-i686 mingw-w64-i686-dev && sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix @@ -88,3 +190,64 @@ jobs: - name: strip run: cd ./src && strip verged.exe verge-cli.exe verge-tx.exe && cd ./qt && strip verge-qt.exe + + windows64-ubuntu22: + runs-on: ubuntu-22.04 + + steps: + - uses: actions/checkout@v4 + + - name: Update apt repos + run: sudo apt-get update + + - name: Install base dependencies + run: sudo apt-get install build-essential libtool gperf autotools-dev automake pkg-config bsdmainutils curl git bison byacc python3 nsis + + - name: Force Posix + run: sudo apt install g++-mingw-w64-x86-64 && sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix + + - name: Build depends for MingW32 Cross Compile + run: PATH=$(echo "$PATH" | sed -e 's/:\/mnt.*//g') && cd depends/ && make HOST=x86_64-w64-mingw32 -j2 + + - name: Auto generate + run: ./autogen.sh + + - name: configure + run: CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure --prefix=/ --disable-bench --disable-tests + + - name: make + run: make -j2 + + - name: strip + run: cd ./src && strip verged.exe verge-cli.exe verge-tx.exe && cd ./qt && strip verge-qt.exe + + windows64-ubuntu20: + runs-on: ubuntu-20.04 + + steps: + - uses: actions/checkout@v4 + + - name: Update apt repos + run: sudo apt-get update + + - name: Install base dependencies + run: sudo apt-get install build-essential libtool gperf autotools-dev automake pkg-config bsdmainutils curl git bison byacc python3 nsis + + - name: Force Posix + run: sudo apt install g++-mingw-w64-x86-64 && sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix + + - name: Build depends for MingW32 Cross Compile + run: PATH=$(echo "$PATH" | sed -e 's/:\/mnt.*//g') && cd depends/ && make HOST=x86_64-w64-mingw32 -j2 + + - name: Auto generate + run: ./autogen.sh + + - name: configure + run: CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure --prefix=/ --disable-bench --disable-tests + + - name: make + run: make -j2 + + - name: strip + run: cd ./src && strip verged.exe verge-cli.exe verge-tx.exe && cd ./qt && strip verge-qt.exe + diff --git a/.gitmodules b/.gitmodules index 8e8c959a..e4aa9abc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ [submodule "src/tor"] path = src/tor - url = https://github.com/torproject/tor - branch = tor-0.4.7.10 + url = https://gitlab.torproject.org/tpo/core/tor + branch = release-0.4.8 diff --git a/Makefile.am b/Makefile.am index 7b640c60..8190f533 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,10 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. +# Pattern rule to print variables, e.g. make print-top_srcdir +print-%: FORCE + @echo '$*'='$($*)' + ACLOCAL_AMFLAGS = -I build-aux/m4 SUBDIRS = src/tor src if ENABLE_MAN diff --git a/autogen.sh b/autogen.sh index d3513786..d8a1244c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -11,7 +11,7 @@ git submodule update --init --recursive srcdir="$(dirname $0)" cd "$srcdir" -if [ -z ${LIBTOOLIZE} ] && GLIBTOOLIZE="`command -v glibtoolize 2>/dev/null`"; then +if [ -z "${LIBTOOLIZE}" ] && GLIBTOOLIZE="$(command -v glibtoolize)"; then LIBTOOLIZE="${GLIBTOOLIZE}" export LIBTOOLIZE fi diff --git a/build-aux/m4/bitcoin_find_bdb48.m4 b/build-aux/m4/verge_find_bdb48.m4 similarity index 100% rename from build-aux/m4/bitcoin_find_bdb48.m4 rename to build-aux/m4/verge_find_bdb48.m4 diff --git a/configure.ac b/configure.ac index 8a7dcdab..af4b8e1c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,12 @@ ]\dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 7) -define(_CLIENT_VERSION_MINOR, 5) -define(_CLIENT_VERSION_REVISION, -0)define(_CLIENT_VERSION_BUILD, 0) +define(_CLIENT_VERSION_MINOR, 9) +define(_CLIENT_VERSION_REVISION, 0) +define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_RC, 0) define(_CLIENT_VERSION_IS_RELEASE, true) -define(_COPYRIGHT_YEAR, 2024) +define(_COPYRIGHT_YEAR, 2025) define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Verge Core]]) AC_INIT([Verge Septem],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_REVISION, m4_if(_CLIENT_VERSION_BUILD, [0], [], _CLIENT_VERSION_BUILD))m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/vergecurrency/verge/issues],[verge],[https://vergecurrency.com/]) @@ -15,14 +15,31 @@ AC_CONFIG_HEADERS([src/config/verge-config.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([build-aux/m4]) +m4_ifndef([PKG_PROG_PKG_CONFIG], [m4_fatal([PKG_PROG_PKG_CONFIG macro not found. Please install pkg-config and re-run autogen.sh])]) +PKG_PROG_PKG_CONFIG +if test "$PKG_CONFIG" = ""; then + AC_MSG_ERROR([pkg-config not found]) +fi + +# When compiling with depends, the `PKG_CONFIG_PATH` and `PKG_CONFIG_LIBDIR` variables, +# being set in a `config.site` file, are not exported to let the `--config-cache` option +# work properly. +if test -n "$PKG_CONFIG_PATH"; then + PKG_CONFIG="env PKG_CONFIG_PATH=$PKG_CONFIG_PATH $PKG_CONFIG" +fi +if test -n "$PKG_CONFIG_LIBDIR"; then + PKG_CONFIG="env PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR $PKG_CONFIG" +fi + VERGE_DAEMON_NAME=verged VERGE_GUI_NAME=verge-qt VERGE_CLI_NAME=verge-cli VERGE_TX_NAME=verge-tx dnl Unless the user specified ARFLAGS, force it to be cr -AC_ARG_VAR(ARFLAGS, [Flags for the archiver, defaults to if not set]) -if test "x${ARFLAGS+set}" != "xset"; then +dnl This is also the default as-of libtool 2.4.7 +AC_ARG_VAR([ARFLAGS], [Flags for the archiver, defaults to if not set]) +if test "${ARFLAGS+set}" != "set"; then ARFLAGS="cr" fi @@ -58,10 +75,29 @@ dnl fear of mixing pic/non-pic objects, and import/export complications. Since dnl we have those under control, re-enable that functionality. case $host in *mingw*) + dnl By default, libtool for mingw refuses to link static libs into a dll for + dnl fear of mixing pic/non-pic objects, and import/export complications. Since + dnl we have those under control, re-enable that functionality. lt_cv_deplibs_check_method="pass_all" + + dnl Remove unwanted -DDLL_EXPORT from these variables. + dnl We do not use this macro, but system headers may export unwanted symbols + dnl if it's set. + lt_cv_prog_compiler_pic="-DPIC" + lt_cv_prog_compiler_pic_CXX="-DPIC" + ;; + *darwin*) + dnl Because it prints a verbose warning, lld fails the following check + dnl for "-Wl,-single_module" from libtool.m4: + dnl # If there is a non-empty error log, and "single_module" + dnl # appears in it, assume the flag caused a linker warning + dnl "-single_module" works fine on ld64 and lld, so just bypass the test. + dnl Failure to set this to "yes" causes libtool to use a very broken + dnl link-line for shared libs. + lt_cv_apple_cc_single_mod="yes" ;; esac -dnl Require C++11 compiler (no GNU extensions) +dnl Require C++14 compiler (no GNU extensions) AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory], [nodefault]) dnl Check if -latomic is required for CHECK_ATOMIC @@ -84,8 +120,8 @@ AC_PATH_TOOL(RANLIB, ranlib) AC_PATH_TOOL(STRIP, strip) AC_PATH_TOOL(GCOV, gcov) AC_PATH_PROG(LCOV, lcov) -dnl Python 3.x is supported from 3.4 on (see https://github.com/bitcoin/bitcoin/issues/7893) -AC_PATH_PROGS([PYTHON], [python3.7 python3.6 python3.5 python3.4 python3 python]) +dnl Python 3.5 is specified in .python-version and should be used if available, see doc/dependencies.md +AC_PATH_PROGS([PYTHON], [python3.5 python3.6 python3.7 python3.8 python3 python]) AC_PATH_PROG(GENHTML, genhtml) AC_PATH_PROG([GIT], [git]) AC_PATH_PROG(CCACHE,ccache) @@ -210,6 +246,12 @@ AC_ARG_ENABLE([zmq], [disable ZMQ notifications])], [use_zmq=$enableval], [use_zmq=yes]) + +AC_ARG_ENABLE([scrypt-sse2], + [AS_HELP_STRING([--enable-scrypt-sse2], + [Build with scrypt sse2 implementation (default is no)])], + [use_scrypt_sse2=$enableval], + [use_scrypt_sse2=no]) AC_ARG_WITH([protoc-bindir],[AS_HELP_STRING([--with-protoc-bindir=BIN_DIR],[specify protoc bin path])], [protoc_bin_path=$withval], []) @@ -922,6 +964,7 @@ fi if test x$use_reduce_exports = xyes; then CXXFLAGS="$CXXFLAGS $RE_CXXFLAGS" AX_CHECK_LINK_FLAG([[-Wl,--exclude-libs,ALL]], [RELDFLAGS="-Wl,--exclude-libs,ALL"]) + AX_CHECK_LINK_FLAG([-Wl,-no_exported_symbols], [LIBTOOL_APP_LDFLAGS="$LIBTOOL_APP_LDFLAGS -Wl,-no_exported_symbols"], [], [$LDFLAG_WERROR]) fi if test x$use_tests = xyes; then @@ -960,6 +1003,10 @@ if test x$use_boost = xyes; then BOOST_LIBS="$BOOST_LDFLAGS $BOOST_FILESYSTEM_LIB $BOOST_PROGRAM_OPTIONS_LIB $BOOST_THREAD_LIB $BOOST_CHRONO_LIB $BOOST_SYSTEM_LIB" +# Configure Scrypt SSE2 +if test x$use_scrypt_sse2 = xyes; then + AC_DEFINE(USE_SSE2, 1, [Define this symbol if SSE2 works]) +fi dnl If boost (prior to 1.57) was built without c++11, it emulated scoped enums dnl using c++98 constructs. Unfortunately, this implementation detail leaked into @@ -1289,6 +1336,7 @@ AM_CONDITIONAL([ENABLE_SSE41],[test x$enable_sse41 = xyes]) AM_CONDITIONAL([ENABLE_AVX2],[test x$enable_avx2 = xyes]) AM_CONDITIONAL([USE_ASM],[test x$use_asm = xyes]) AM_CONDITIONAL([WORDS_BIGENDIAN],[test x$ac_cv_c_bigendian = xyes]) +AM_CONDITIONAL([USE_SCRYPT_SSE2], [test x$use_scrypt_sse2 = xyes]) AC_DEFINE(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR, [Major version]) AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, [Minor version]) @@ -1387,7 +1435,7 @@ fi AX_SUBDIRS_CONFIGURE([src/secp256k1], [[--disable-shared], [--with-pic], [--with-bignum=no], [--enable-module-recovery], [--enable-experimental], [--enable-module-ecdh]]) -ac_configure_args="${ac_configure_args} --disable-shared --disable-gcc-hardening --with-pic --with-bignum=no --enable-module-recovery --disable-jni --disable-system-torrc --disable-systemd --disable-lzma --disable-zstd --disable-asciidoc --disable-gcc-hardening" +ac_configure_args="${ac_configure_args} --disable-shared --disable-gcc-hardening --with-pic --with-bignum=no --enable-module-recovery --disable-jni --disable-system-torrc --disable-systemd --disable-lzma --disable-zstd --disable-asciidoc --disable-gcc-hardening --disable-unittests" AC_CONFIG_SUBDIRS([src/tor]) AC_OUTPUT diff --git a/depends/homebrew-formulas/boost176.rb b/depends/homebrew-formulas/boost176.rb new file mode 100644 index 00000000..ace3453a --- /dev/null +++ b/depends/homebrew-formulas/boost176.rb @@ -0,0 +1,101 @@ +class Boost176 < Formula + desc "Collection of portable C++ source libraries" + homepage "https://www.boost.org/" + url "https://sourceforge.net/projects/boost/files/boost/1.76.0/boost_1_76_0.tar.bz2/download" + sha256 "f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41" + license "BSL-1.0" + revision 6 + + keg_only :versioned_formula + + depends_on "icu4c@76" + + uses_from_macos "bzip2" + uses_from_macos "zlib" + + # Backport fixes for newer Clang + patch :p2 do + url "https://github.com/boostorg/numeric_conversion/commit/50a1eae942effb0a9b90724323ef8f2a67e7984a.patch?full_index=1" + sha256 "d96761257f7efc2edc8414f1a2522fc07a3d7d56bb55a51d14af9abd39e389c8" + end + patch :p2 do + url "https://github.com/boostorg/mpl/commit/b37b709cbdb6b2c285fb808dab985aa005786351.patch?full_index=1" + sha256 "b8013ad3e6b63698158319f5efc2fe1558a00c1d2e32193086f741e774acc3e4" + end + + def install + # Force boost to compile with the desired compiler + open("user-config.jam", "a") do |file| + if OS.mac? + file.write "using darwin : : #{ENV.cxx} ;\n" + else + file.write "using gcc : : #{ENV.cxx} ;\n" + end + end + + # libdir should be set by --prefix but isn't + icu4c_prefix = Formula["icu4c@76"].opt_prefix + bootstrap_args = %W[ + --prefix=#{prefix} + --libdir=#{lib} + --with-icu=#{icu4c_prefix} + ] + + # Handle libraries that will not be built. + without_libraries = ["python", "mpi"] + + # Boost.Log cannot be built using Apple GCC at the moment. Disabled + # on such systems. + without_libraries << "log" if ENV.compiler == :gcc + + bootstrap_args << "--without-libraries=#{without_libraries.join(",")}" + + # layout should be synchronized with boost-python and boost-mpi + args = %W[ + --prefix=#{prefix} + --libdir=#{lib} + -d2 + -j#{ENV.make_jobs} + --layout=tagged-1.66 + --user-config=user-config.jam + -sNO_LZMA=1 + -sNO_ZSTD=1 + install + threading=multi,single + link=shared,static + ] + + # Boost is using "clang++ -x c" to select C compiler which breaks C++14 + # handling using ENV.cxx14. Using "cxxflags" and "linkflags" still works. + args << "cxxflags=-std=c++14" + args << "cxxflags=-stdlib=libc++" << "linkflags=-stdlib=libc++" if ENV.compiler == :clang + + system "./bootstrap.sh", *bootstrap_args + system "./b2", "headers" + system "./b2", *args + end + + test do + (testpath/"test.cpp").write <<~CPP + #include + #include + #include + #include + using namespace boost::algorithm; + using namespace std; + + int main() + { + string str("a,b"); + vector strVec; + split(strVec, str, is_any_of(",")); + assert(strVec.size()==2); + assert(strVec[0]=="a"); + assert(strVec[1]=="b"); + return 0; + } + CPP + system ENV.cxx, "-I#{Formula["boost@1.76"].opt_include}", "test.cpp", "-std=c++14", "-o", "test" + system "./test" + end +end \ No newline at end of file diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk index a1c943d6..ed45cbcc 100755 --- a/depends/hosts/darwin.mk +++ b/depends/hosts/darwin.mk @@ -1,5 +1,5 @@ -OSX_MIN_VERSION=10.10 -OSX_SDK_VERSION=10.11 +OSX_MIN_VERSION=12.0 +OSX_SDK_VERSION=14.0 OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk LD64_VERSION=253.9 darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index 336bc0d3..8d635c0f 100755 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -1,8 +1,8 @@ package=boost -$(package)_version=1.79.0 +$(package)_version=1.80.0 $(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$($(package)_version)/source/ $(package)_file_name=boost_$(subst .,_,$($(package)_version)).tar.bz2 -$(package)_sha256_hash=475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39 +$(package)_sha256_hash=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0 $(package)_compiler= ifeq ($(CLANG_ARG),true) diff --git a/depends/packages/expat.mk b/depends/packages/expat.mk index 1d69bb6f..c42f691a 100755 --- a/depends/packages/expat.mk +++ b/depends/packages/expat.mk @@ -1,8 +1,8 @@ package=expat -$(package)_version=2.6.2 +$(package)_version=2.6.4 $(package)_download_path=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$($(package)_version))/ $(package)_file_name=$(package)-$($(package)_version).tar.xz -$(package)_sha256_hash=ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364 +$(package)_sha256_hash=A695629DAE047055B37D50A0FF4776D1D45D0A4C842CF4CCEE158441F55FF7EE # -D_DEFAULT_SOURCE defines __USE_MISC, which exposes additional # definitions in endian.h, which are required for a working diff --git a/depends/packages/fontconfig.mk b/depends/packages/fontconfig.mk index 6d9f08db..027751b9 100755 --- a/depends/packages/fontconfig.mk +++ b/depends/packages/fontconfig.mk @@ -1,8 +1,8 @@ package=fontconfig -$(package)_version=2.15.0 +$(package)_version=2.16.0 $(package)_download_path=http://www.freedesktop.org/software/fontconfig/release/ $(package)_file_name=$(package)-$($(package)_version).tar.xz -$(package)_sha256_hash=63A0658D0E06E0FA886106452B58EF04F21F58202EA02A94C39DE0D3335D7C0E +$(package)_sha256_hash=6A33DC555CC9BA8B10CAF7695878EF134EEB36D0AF366041F639B1DA9B6ED220 $(package)_dependencies=freetype expat define $(package)_set_vars @@ -25,4 +25,4 @@ endef define $(package)_postprocess_cmds rm -rf var lib/*.la -endef \ No newline at end of file +endef diff --git a/depends/packages/freetype.mk b/depends/packages/freetype.mk index 9c3966e7..282c0ceb 100755 --- a/depends/packages/freetype.mk +++ b/depends/packages/freetype.mk @@ -1,8 +1,8 @@ package=freetype -$(package)_version=2.13.2 +$(package)_version=2.13.3 $(package)_download_path=https://sourceforge.net/projects/freetype/files/freetype2/$($(package)_version)/ $(package)_file_name=freetype-$($(package)_version).tar.xz -$(package)_sha256_hash=12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d +$(package)_sha256_hash=0550350666D427C74DAEB85D5AC7BB353ACBA5F76956395995311A9C6F063289 define $(package)_set_vars $(package)_config_opts = --without-zlib --without-png --without-harfbuzz --without-bzip2 --enable-static --disable-shared diff --git a/depends/packages/libX11.mk b/depends/packages/libX11.mk index edadbf0a..0409aefc 100755 --- a/depends/packages/libX11.mk +++ b/depends/packages/libX11.mk @@ -1,8 +1,8 @@ package=libX11 -$(package)_version=1.8.9 +$(package)_version=1.8.11 $(package)_download_path=http://xorg.freedesktop.org/releases/individual/lib/ $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=57CA5F07D263788AD661A86F4139412E8B699662E6B60C20F1F028C25A935E48 +$(package)_sha256_hash=17A37D1597354A1D8040196F1CDAC54240C78C0BD1A1A95E97CC23215CF0B734 $(package)_dependencies=libxcb xtrans xextproto xorgproto define $(package)_set_vars @@ -26,4 +26,4 @@ endef define $(package)_stage_cmds $(MAKE) DESTDIR=$($(package)_staging_dir) install -endef \ No newline at end of file +endef diff --git a/depends/packages/libXau.mk b/depends/packages/libXau.mk index 8c329f7d..deb7ba10 100755 --- a/depends/packages/libXau.mk +++ b/depends/packages/libXau.mk @@ -1,8 +1,8 @@ package=libXau -$(package)_version=1.0.11 +$(package)_version=1.0.12 $(package)_download_path=https://xorg.freedesktop.org/releases/individual/lib/ $(package)_file_name=libXau-$($(package)_version).tar.xz -$(package)_sha256_hash=f3fa3282f5570c3f6bd620244438dbfbdd580fc80f02f549587a0f8ab329bbeb +$(package)_sha256_hash=74D0E4DFA3D39AD8939E99BDA37F5967ABA528211076828464D2777D477FC0FB $(package)_dependencies=xorgproto # When updating this package, check the default value of @@ -31,4 +31,4 @@ endef define $(package)_postprocess_cmds rm -rf share lib/*.la -endef \ No newline at end of file +endef diff --git a/depends/packages/libcap.mk b/depends/packages/libcap.mk index 11e5a81d..93af835f 100755 --- a/depends/packages/libcap.mk +++ b/depends/packages/libcap.mk @@ -1,8 +1,8 @@ package=libcap -$(package)_version=2.69 +$(package)_version=2.73 $(package)_download_path=https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/ $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=3a99ec26452e328e0ea408efd67096ef914f4ee4788fa8e8e21f214e2bd670b9 +$(package)_sha256_hash=16D8E4E625D2A2ED1601172704C560DE3745BAC64AB1384A8074379C03165948 define $(package)_set_vars $(package)_config_opts=--disable-static diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk index 5f622f8e..4433ad8b 100755 --- a/depends/packages/libevent.mk +++ b/depends/packages/libevent.mk @@ -1,15 +1,33 @@ package=libevent -$(package)_version=2.1.8-stable +$(package)_version=2.1.11-stable $(package)_download_path=https://github.com/libevent/libevent/archive/ $(package)_file_name=release-$($(package)_version).tar.gz -$(package)_sha256_hash=316ddb401745ac5d222d7c529ef1eada12f58f6376a66c1118eee803cb70f83d +$(package)_sha256_hash=229393ab2bf0dc94694f21836846b424f3532585bac3468738b7bf752c03901e +$(package)_dependencies=openssl +#$(package)_patches+=fix_mingw_link.patch + +# When building for Windows, we set _WIN32_WINNT to target the same Windows +# version as we do in configure. Due to quirks in libevents build system, this +# is also required to enable support for ipv6. See #19375. +define $(package)_set_vars + $(package)_config_opts=--disable-shared --disable-libevent-regress --disable-samples + $(package)_config_opts += --disable-dependency-tracking --enable-option-checking + $(package)_config_opts_release=--disable-debug-mode + $(package)_config_opts_linux=--with-pic + $(package)_config_opts_freebsd=--with-pic + $(package)_config_opts_netbsd=--with-pic + $(package)_config_opts_openbsd=--with-pic + $(package)_config_opts_android=--with-pic + $(package)_cppflags_mingw32=-D_WIN32_WINNT=0x0601 + $(package)_config_opts_mingw32=LIBS=-liphlpapi +endef define $(package)_preprocess_cmds ./autogen.sh endef define $(package)_set_vars - $(package)_config_opts=--disable-shared --disable-openssl --disable-libevent-regress --disable-samples + $(package)_config_opts=--disable-shared --disable-libevent-regress --disable-samples $(package)_config_opts_release=--disable-debug-mode $(package)_config_opts_linux=--with-pic endef diff --git a/depends/packages/libseccomp.mk b/depends/packages/libseccomp.mk index 3e224240..2be2d326 100755 --- a/depends/packages/libseccomp.mk +++ b/depends/packages/libseccomp.mk @@ -1,8 +1,8 @@ package=libseccomp -$(package)_version=2.5.5 +$(package)_version=2.6.0 $(package)_download_path=https://github.com/seccomp/libseccomp/releases/download/v$($(package)_version)/ $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=248a2c8a4d9b9858aa6baf52712c34afefcf9c9e94b76dce02c1c9aa25fb3375 +$(package)_sha256_hash=83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc ifneq ($(host_os),mingw32) ifneq ($(host_os),darwin) @@ -24,4 +24,4 @@ define $(package)_stage_cmds endef endif -endif \ No newline at end of file +endif diff --git a/depends/packages/libxkbcommon.mk b/depends/packages/libxkbcommon.mk index b1cb3e88..261f0fbc 100644 --- a/depends/packages/libxkbcommon.mk +++ b/depends/packages/libxkbcommon.mk @@ -1,8 +1,8 @@ package=libxkbcommon -$(package)_version=1.7.0 -$(package)_download_path=https://xkbcommon.org/download/ -$(package)_file_name=libxkbcommon-$($(package)_version).tar.xz -$(package)_sha256_hash=65782f0a10a4b455af9c6baab7040e2f537520caa2ec2092805cdfd36863b247 +$(package)_version=1.8.0 +$(package)_download_path=https://github.com/xkbcommon/libxkbcommon/archive/refs/tags +$(package)_file_name=xkbcommon-$($(package)_version).tar.gz +$(package)_sha256_hash=025c53032776ed850fbfb92683a703048cd70256df4ac1a1ec41ed3455d5d39c $(package)_dependencies=libxcb $(package)_patches=no-test-x11.patch toolchain.txt @@ -19,7 +19,7 @@ define $(package)_preprocess_cmds endef define $(package)_config_cmds - meson setup --cross-file toolchain.txt build + meson setup --cross-file toolchain.txt build -Dxkb-config-root=/usr/share/X11/xkb -Dxkb-config-extra-path=/app/share/X11/xkb endef define $(package)_build_cmds @@ -28,4 +28,4 @@ endef define $(package)_stage_cmds DESTDIR=$($(package)_staging_dir) ninja -C build install -endef \ No newline at end of file +endef diff --git a/depends/packages/miniupnpc.mk b/depends/packages/miniupnpc.mk index c4e78cd3..8be75655 100755 --- a/depends/packages/miniupnpc.mk +++ b/depends/packages/miniupnpc.mk @@ -1,8 +1,8 @@ package=miniupnpc -$(package)_version=2.2.8 +$(package)_version=2.3.0 $(package)_download_path=https://miniupnp.tuxfamily.org/files/ $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=05B929679091B9921B6B6C1F25E39E4C8D1F4D46C8FEB55A412AA697AEE03A93 +$(package)_sha256_hash=025C9AB95677F02A69BC64AC0A747F07E02BA99CF797BC679A5A552FED8D990C $(package)_patches=dont_leak_info.patch fix_windows_build.patch define $(package)_set_vars diff --git a/depends/packages/native_capnp.mk b/depends/packages/native_capnp.mk index ba1370ea..3a0e6980 100644 --- a/depends/packages/native_capnp.mk +++ b/depends/packages/native_capnp.mk @@ -1,9 +1,9 @@ package=native_capnp -$(package)_version=1.0.1 +$(package)_version=1.1.0 $(package)_download_path=https://capnproto.org/ -$(package)_download_file=capnproto-c++-$($(package)_version).tar.gz +$(package)_download_file=capnproto-$($(package)_version).tar.gz $(package)_file_name=capnproto-cxx-$($(package)_version).tar.gz -$(package)_sha256_hash=0f7f4b8a76a2cdb284fddef20de8306450df6dd031a47a15ac95bc43c3358e09 +$(package)_sha256_hash=C0A0D78A07E821F7BAE26C7FCAC20A9202EB3D639A673B2606B76092A1F35B6B define $(package)_set_vars $(package)_config_opts := -DBUILD_TESTING=OFF @@ -21,4 +21,4 @@ endef define $(package)_stage_cmds $(MAKE) DESTDIR=$($(package)_staging_dir) install -endef \ No newline at end of file +endef diff --git a/depends/packages/native_cctools.mk b/depends/packages/native_cctools.mk index 02cbc116..cc4d1f54 100755 --- a/depends/packages/native_cctools.mk +++ b/depends/packages/native_cctools.mk @@ -1,8 +1,8 @@ package=native_cctools -$(package)_version=c74fafe86076713cb8e6f937af43b6df6da1f42d +$(package)_version=81f205e8ca6bbf2fdbcb6948132454fd1f97839e $(package)_download_path=https://github.com/tpoechtrager/cctools-port/archive $(package)_file_name=$($(package)_version).tar.gz -$(package)_sha256_hash=e2c1588d505a69c32e079f4e616e0f117d5478429040e394f624f43f2796e6bc +#$(package)_sha256_hash=e2c1588d505a69c32e079f4e616e0f117d5478429040e394f624f43f2796e6bc $(package)_build_subdir=cctools $(package)_dependencies=native_libtapi @@ -36,4 +36,4 @@ endef define $(package)_postprocess_cmds rm -rf share -endef \ No newline at end of file +endef diff --git a/depends/packages/native_libtapi.mk b/depends/packages/native_libtapi.mk index 988a4271..62137863 100644 --- a/depends/packages/native_libtapi.mk +++ b/depends/packages/native_libtapi.mk @@ -1,5 +1,5 @@ package=native_libtapi -$(package)_version=eb33a59f2e30ff9724dc1ea8bee8b5229b0557c9 +$(package)_version=54c9044082ba35bdb2b0edf282ba1a340096154c $(package)_download_path=https://github.com/tpoechtrager/apple-libtapi/archive $(package)_file_name=$($(package)_version).tar.gz $(package)_sha256_hash=d4d46c64622f13d6938cecf989046d9561011bb59e8ee835f8f39825d67f578f @@ -19,4 +19,4 @@ endef define $(package)_stage_cmds ./install.sh -endef \ No newline at end of file +endef diff --git a/depends/packages/native_protobuf.mk b/depends/packages/native_protobuf.mk index ce50b366..1da3c226 100755 --- a/depends/packages/native_protobuf.mk +++ b/depends/packages/native_protobuf.mk @@ -1,8 +1,8 @@ package=native_protobuf -$(package)_version=2.6.1 +$(package)_version=3.10.1 $(package)_download_path=https://github.com/google/protobuf/releases/download/v$($(package)_version) -$(package)_file_name=protobuf-$($(package)_version).tar.bz2 -$(package)_sha256_hash=ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910 +$(package)_file_name=protobuf-cpp-$($(package)_version).tar.gz +$(package)_sha256_hash=E82EE5BDDE198E0A1935E280748A86A7989474EA771418A2FD90F03E2E65B99B define $(package)_set_vars $(package)_config_opts=--disable-shared diff --git a/depends/packages/protobuf.mk b/depends/packages/protobuf.mk index d3fd6b66..54d3fd92 100755 --- a/depends/packages/protobuf.mk +++ b/depends/packages/protobuf.mk @@ -4,18 +4,13 @@ $(package)_download_path=$(native_$(package)_download_path) $(package)_file_name=$(native_$(package)_file_name) $(package)_sha256_hash=$(native_$(package)_sha256_hash) $(package)_dependencies=native_$(package) -$(package)_cxxflags=-std=c++17 +$(package)_cxxflags=-std=c++11 define $(package)_set_vars $(package)_config_opts=--disable-shared --with-protoc=$(build_prefix)/bin/protoc $(package)_config_opts_linux=--with-pic endef -define $(package)_preprocess_cmds - cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . &&\ - cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub gtest/build-aux -endef - define $(package)_config_cmds $($(package)_autoconf) endef @@ -31,4 +26,4 @@ endef define $(package)_postprocess_cmds rm lib/libprotoc.a -endef \ No newline at end of file +endef diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 167fcfcd..3a359b39 100755 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -8,7 +8,7 @@ $(package)_dependencies=openssl zlib $(package)_linux_dependencies=freetype fontconfig libxcb libX11 xorgproto libXext dbus $(package)_build_subdir=qtbase $(package)_qt_libs=corelib network widgets gui plugins testlib -$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_limits_header.patch fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch fix_riscv64_arch.patch xkb-default.patch +$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_limits_header.patch fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch fix_riscv64_arch.patch xkb-default.patch fix_mingw_cross_compile.patch $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix) $(package)_qttranslations_sha256_hash=f7474f260a1382549720081bf2359a3d425ec3bf7d31976c512834303d30d73b @@ -23,12 +23,13 @@ define $(package)_set_vars $(package)_config_opts_release = -release $(package)_config_opts_debug = -debug $(package)_config_opts += -bindir $(build_prefix)/bin -$(package)_config_opts += -c++std c++11 +$(package)_config_opts += -c++std c++1z $(package)_config_opts += -confirm-license $(package)_config_opts += -dbus-runtime $(package)_config_opts += -hostprefix $(build_prefix) $(package)_config_opts += -no-compile-examples $(package)_config_opts += -no-cups +$(package)_config_opts += -no-direct2d $(package)_config_opts += -no-egl $(package)_config_opts += -no-eglfs $(package)_config_opts += -no-freetype @@ -38,6 +39,7 @@ $(package)_config_opts += -no-icu $(package)_config_opts += -no-iconv $(package)_config_opts += -no-kms $(package)_config_opts += -no-linuxfb +$(package)_config_opts += -no-libjpeg $(package)_config_opts += -no-libudev $(package)_config_opts += -no-mtdev $(package)_config_opts += -no-openvg @@ -63,7 +65,7 @@ $(package)_config_opts += -pch $(package)_config_opts += -pkg-config $(package)_config_opts += -prefix $(host_prefix) $(package)_config_opts += -qt-libpng -$(package)_config_opts += -qt-libjpeg +$(package)_config_opts += -gif $(package)_config_opts += -qt-pcre $(package)_config_opts += -qt-harfbuzz $(package)_config_opts += -system-zlib @@ -85,6 +87,7 @@ $(package)_config_opts += -no-feature-textodfwriter $(package)_config_opts += -no-feature-udpsocket $(package)_config_opts += -no-feature-wizard $(package)_config_opts += -no-feature-xml +$(package)_config_opts += -Wno-deprecated-copy ifneq ($(build_os),darwin) $(package)_config_opts_darwin = -no-dbus @@ -188,6 +191,7 @@ define $(package)_preprocess_cmds patch -p1 -i $($(package)_patch_dir)/fix_configure_mac.patch &&\ patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\ patch -p1 -i $($(package)_patch_dir)/fix_limits_header.patch && \ + patch -p1 -i $($(package)_patch_dir)/fix_mingw_cross_compile.patch && \ patch -p1 -i $($(package)_patch_dir)/fix_rcc_determinism.patch &&\ patch -p1 -i $($(package)_patch_dir)/xkb-default.patch &&\ echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ diff --git a/depends/packages/xtrans.mk b/depends/packages/xtrans.mk index 71c3c3cc..741f2318 100755 --- a/depends/packages/xtrans.mk +++ b/depends/packages/xtrans.mk @@ -1,8 +1,8 @@ package=xtrans -$(package)_version=1.5.0 +$(package)_version=1.5.2 $(package)_download_path=http://xorg.freedesktop.org/releases/individual/lib/ $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=A806F8A92F879DCD0146F3F1153FDFFE845F2FC0DF9B1A26C19312B7B0A29C86 +$(package)_sha256_hash=23031301F10FEF5EAA55B438610FBD29294A70D2FA189355343BF0186BFF8374 $(package)_dependencies= define $(package)_set_vars @@ -23,4 +23,4 @@ endef define $(package)_stage_cmds $(MAKE) DESTDIR=$($(package)_staging_dir) install -endef \ No newline at end of file +endef diff --git a/depends/patches/boost/deprecated-two-arg-allocate.diff b/depends/patches/boost/deprecated-two-arg-allocate.diff deleted file mode 100644 index f9622856..00000000 --- a/depends/patches/boost/deprecated-two-arg-allocate.diff +++ /dev/null @@ -1,102 +0,0 @@ -diff -ur orig/include/boost/core/allocator_access.hpp patched/include/boost/core/allocator_access.hpp ---- orig/include/boost/core/allocator_access.hpp 2021-01-18 21:42:05.926895400 +0000 -+++ patched/include/boost/core/allocator_access.hpp 2021-01-18 21:44:26.426895400 +0000 -@@ -11,7 +11,7 @@ - #include - #if !defined(BOOST_NO_CXX11_ALLOCATOR) - #include --#if !defined(BOOST_MSVC) -+#if !defined(BOOST_MSVC) && !defined(BOOST_CLANG) - #include - #else - #include -@@ -49,7 +49,7 @@ - struct allocator_pointer { - typedef typename A::pointer type; - }; --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - struct allocator_pointer { - typedef typename std::allocator_traits::pointer type; -@@ -72,7 +72,7 @@ - struct allocator_const_pointer { - typedef typename A::const_pointer type; - }; --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - struct allocator_const_pointer { - typedef typename std::allocator_traits::const_pointer type; -@@ -137,7 +137,7 @@ - struct allocator_difference_type { - typedef typename A::difference_type type; - }; --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - struct allocator_difference_type { - typedef typename std::allocator_traits::difference_type type; -@@ -161,7 +161,7 @@ - struct allocator_size_type { - typedef typename A::size_type type; - }; --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - struct allocator_size_type { - typedef typename std::allocator_traits::size_type type; -@@ -260,7 +260,7 @@ - struct allocator_rebind { - typedef typename A::template rebind::other type; - }; --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - struct allocator_rebind { - typedef typename std::allocator_traits::template rebind_alloc type; -@@ -313,7 +313,7 @@ - { - return a.allocate(n, h); - } --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - inline typename allocator_pointer::type - allocator_allocate(A& a, typename allocator_size_type::type n, -@@ -400,7 +400,7 @@ - ::new((void*)p) T(v); - } - #endif --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - inline void - allocator_construct(A& a, T* p, Args&&... args) -@@ -449,7 +449,7 @@ - p->~T(); - (void)p; - } --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - inline void - allocator_destroy(A& a, T* p) -@@ -496,7 +496,7 @@ - { - return a.max_size(); - } --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - inline typename allocator_size_type::type - allocator_max_size(const A& a) -@@ -545,7 +545,7 @@ - { - return a; - } --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - inline A - allocator_select_on_container_copy_construction(const A& a) diff --git a/depends/patches/boost/iostreams-106.patch b/depends/patches/boost/iostreams-106.patch deleted file mode 100644 index dcecd5d0..00000000 --- a/depends/patches/boost/iostreams-106.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4e76f73826fd0a7067b837e4850a9051436f5ec5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= - -Date: Sun, 22 Dec 2019 10:26:38 +0100 -Subject: [PATCH] Fix build on windows with libc++ - -Proposed by @SquallATF in #67 ---- - include/boost/iostreams/detail/config/fpos.hpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/boost/iostreams/detail/config/fpos.hpp b/include/boost/iostreams/detail/config/fpos.hpp -index c5dc6cf59..a5835421f 100644 ---- a/include/boost/iostreams/detail/config/fpos.hpp -+++ b/include/boost/iostreams/detail/config/fpos.hpp -@@ -26,7 +26,8 @@ - - # if (defined(_YVALS) || defined(_CPPLIB_VER)) && !defined(__SGI_STL_PORT) && \ - !defined(_STLPORT_VERSION) && !defined(__QNX__) && !defined(_VX_CPU) && !defined(__VXWORKS__) \ -- && !((defined(BOOST_MSVC) || defined(BOOST_CLANG)) && _MSVC_STL_VERSION >= 141) -+ && !((defined(BOOST_MSVC) || defined(BOOST_CLANG)) && _MSVC_STL_VERSION >= 141) \ -+ && !defined(_LIBCPP_VERSION) - /**/ - - #include diff --git a/depends/patches/boost/signals2-noise.patch b/depends/patches/boost/signals2-noise.patch deleted file mode 100644 index e0a9ce48..00000000 --- a/depends/patches/boost/signals2-noise.patch +++ /dev/null @@ -1,23 +0,0 @@ -From fd27423fea5537bc857c1fa14bb0c25b994f77b3 Mon Sep 17 00:00:00 2001 -From: Frank Mori Hess -Date: Mon, 20 Jul 2020 14:17:05 -0400 -Subject: [PATCH] Fix warning about deprecated - boost/function_output_iterator.hpp - ---- - include/boost/signals2/detail/null_output_iterator.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/boost/signals2/detail/null_output_iterator.hpp b/include/boost/signals2/detail/null_output_iterator.hpp -index 9e986959..dee4373c 100644 ---- a/include/boost/signals2/detail/null_output_iterator.hpp -+++ b/include/boost/signals2/detail/null_output_iterator.hpp -@@ -11,7 +11,7 @@ - #ifndef BOOST_SIGNALS2_NULL_OUTPUT_ITERATOR_HPP - #define BOOST_SIGNALS2_NULL_OUTPUT_ITERATOR_HPP - --#include -+#include - - namespace boost - { diff --git a/depends/patches/libevent/fix_mingw_link.patch b/depends/patches/libevent/fix_mingw_link.patch new file mode 100644 index 00000000..6eb42d05 --- /dev/null +++ b/depends/patches/libevent/fix_mingw_link.patch @@ -0,0 +1,25 @@ +commit d108099913c5fdbe518f3f4d711f248f8522bd10 +Author: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> +Date: Mon Apr 22 06:39:35 2024 +0100 + + build: Add `Iphlpapi` to `Libs.private` in `*.pc` files on Windows + + It has been required since https://github.com/libevent/libevent/pull/923 + at least for the `if_nametoindex` call. + + See https://github.com/libevent/libevent/pull/1622. + + +diff --git a/configure.ac b/configure.ac +index d00e063a..cd1fce37 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -906,7 +906,7 @@ if(WIN32) + list(APPEND HDR_PRIVATE WIN32-Code/getopt.h) + + set(EVENT__DNS_USE_FTIME_FOR_ID 1) +- set(LIB_PLATFORM ws2_32 shell32 advapi32) ++ set(LIB_PLATFORM ws2_32 shell32 advapi32 iphlpapi) + add_definitions( + -D_CRT_SECURE_NO_WARNINGS + -D_CRT_NONSTDC_NO_DEPRECATE) \ No newline at end of file diff --git a/depends/patches/qt/fix_mingw_cross_compile.patch b/depends/patches/qt/fix_mingw_cross_compile.patch new file mode 100644 index 00000000..67f76f1d --- /dev/null +++ b/depends/patches/qt/fix_mingw_cross_compile.patch @@ -0,0 +1,25 @@ +commit 5a992a549adfe5a587bbcd6cd2b2cee47d236e27 +Author: fanquake +Date: Fri Sep 4 08:13:44 2020 +0800 + + Work around broken mingw cross-compilation + + See upstream issues: + https://bugreports.qt.io/browse/QTBUG-63637 + https://bugreports.qt.io/browse/QTBUG-63659 + https://codereview.qt-project.org/q/8bebded9 + + We should be able to drop this once we are building qt 5.10.1 or later. + + Added in #12971. + +diff --git a/qtbase/mkspecs/win32-g++/qmake.conf b/qtbase/mkspecs/win32-g++/qmake.conf +index e071a0d1..ad229b10 100644 +--- a/qtbase/mkspecs/win32-g++/qmake.conf ++++ b/qtbase/mkspecs/win32-g++/qmake.conf +@@ -87,3 +87,5 @@ QMAKE_NM = $${CROSS_COMPILE}nm -P + include(../common/angle.conf) + + load(qt_config) ++QMAKE_LINK_OBJECT_MAX = 10 ++QMAKE_LINK_OBJECT_SCRIPT = object_script diff --git a/src/Makefile.am b/src/Makefile.am index 8946a299..4ccc7ca0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -419,13 +419,17 @@ crypto_libverge_crypto_base_a_SOURCES = \ crypto/pow/Lyra2RE.h \ crypto/pow/scrypt.cpp \ crypto/pow/scrypt.h \ - crypto/pow/scrypt-sse2.cpp \ crypto/pow/shabal.c \ crypto/pow/shavite.c \ crypto/pow/simd.c \ crypto/pow/skein.c \ crypto/pow/Sponge.c \ crypto/pow/sph_bmw.h + +# only include SSE2 scrypt sources if USE_SCRYPT_SSE2 is defined +if USE_SCRYPT_SSE2 +crypto_libverge_crypto_base_a_SOURCES += crypto/pow/scrypt-sse2.cpp +endif if USE_ASM diff --git a/src/addrdb.cpp b/src/addrdb.cpp index 5ed284cd..5e994b64 100644 --- a/src/addrdb.cpp +++ b/src/addrdb.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/addrdb.h b/src/addrdb.h index 8284e252..4356f9e0 100644 --- a/src/addrdb.h +++ b/src/addrdb.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/alerter.cpp b/src/alerter.cpp index 585917b4..f91871b7 100644 --- a/src/alerter.cpp +++ b/src/alerter.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/amount.h b/src/amount.h index e3eadf65..ddc5b2fb 100644 --- a/src/amount.h +++ b/src/amount.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/arith_uint256.cpp b/src/arith_uint256.cpp index d0bf1185..0c37cad4 100644 --- a/src/arith_uint256.cpp +++ b/src/arith_uint256.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/arith_uint256.h b/src/arith_uint256.h index 05d7d21c..4dec51e8 100644 --- a/src/arith_uint256.h +++ b/src/arith_uint256.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/base58.cpp b/src/base58.cpp index 88c5154d..c98b0c1d 100644 --- a/src/base58.cpp +++ b/src/base58.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/base58.h b/src/base58.h index 4937bd46..18b0151b 100644 --- a/src/base58.h +++ b/src/base58.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp index 4d1651b5..583d88e8 100644 --- a/src/blockencodings.cpp +++ b/src/blockencodings.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/blockencodings.h b/src/blockencodings.h index 97339650..4965b219 100644 --- a/src/blockencodings.h +++ b/src/blockencodings.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bloom.cpp b/src/bloom.cpp index e7a8c5f5..1d908dbc 100644 --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bloom.h b/src/bloom.h index 2c960ee3..fc2b6d60 100644 --- a/src/bloom.h +++ b/src/bloom.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chain.cpp b/src/chain.cpp index aa202bc7..43d4de95 100644 --- a/src/chain.cpp +++ b/src/chain.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chain.h b/src/chain.h index 887a60c3..0ac1729a 100644 --- a/src/chain.h +++ b/src/chain.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 5f185d66..ea1b12d4 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -157,19 +157,12 @@ vSeeds.emplace_back("y6wkdtkrhdgqorzhxgfhchxb5x2i5k2zzpt4sbrdhjkydrligzuzpzqd.on vSeeds.emplace_back("kb2bgqdwmxwxekxkc6g2s7diramjhdbiqhyxoesbzvlqsbqo7ws5l2qd.onion"); //v7 vSeeds.emplace_back("shtsxnyxjjplkfifdwoz22u7xef7os2fhaq3j7bkk5md37wj7ors4yqd.onion"); //v7 vSeeds.emplace_back("afppaj6ugeskfyjo2z24sjo37572ln7ggfkcuk3a5lkhznpqsfgxw6qd.onion"); //v7 -vSeeds.emplace_back("4omta4xmldql2xqv5ji2rjplejqrd56yst6jlsork43ayb3rbhkpywyd.onion"); //v7 -vSeeds.emplace_back("7q6c6glv5hp5humq3wh5qzlt7jp3s3cacpznjzu2jehkmf7fivy2jmid.onion"); //v7 vSeeds.emplace_back("ka2e2kaw5oxsyykw3ykdvba43eya6cotzm2huvvtrt7fw3dm62ztqfid.onion"); //v7 -vSeeds.emplace_back("xzpuglxfng6lypn2ggnqeiwpo5uyzbnrlwmutgoboeji6aru7oxqjeid.onion"); //v7 vSeeds.emplace_back("4wqkmkldxngbemhlebywhsjzmlqwbveksqbadcjj7ga6ctbrrcs6q3id.onion"); //v7 -vSeeds.emplace_back("xcb4tbu5vywfbiehqj5p56wlpoq4nd4e62ujfhsydbvvrjn6mev2juad.onion"); //v7 -vSeeds.emplace_back("myg3o4o5xe2d4ht2hsguxwbbvkbv5wbthkzztc243oycstapsyldcdqd.onion"); //v7 vSeeds.emplace_back("accu36f6dg5e54axjcytitblk4r736uenuvs6fzbp77m3akfxztpeqqd.onion"); //v7 vSeeds.emplace_back("dzp3twhnyccmyv2mchkhcihgvobgbhwj23bum7esdtg3ajyaheaxswyd.onion"); //v7 vSeeds.emplace_back("b33anagkcywi5ahfdufcvymoaioone5syhrt74bhse46hzbkcziqmfqd.onion"); vSeeds.emplace_back("rje6q245yhiyn4setn5abjlcqwapxzgwbfksrscexyhv7ffjdasmvaqd.onion"); -vSeeds.emplace_back("g2idg3exipjm7po3votk4bjbwhrrw53y5s53vixeilqevvus6cmx4rid.onion"); -vSeeds.emplace_back("b2ii22nkcg2pazmfvojf7vsrfvq76wmfcyh4phmb26tifkrqjwkjslad.onion"); vSeeds.emplace_back("fs6zqnig2st24grcjdeqdvgjisohdj6itwxwqyymv7m6lku2itotczid.onion"); vSeeds.emplace_back("2vrz2akwqkmbvpxa2fhxp2mdccba5253n5jqjox5zthakxrci25wnoqd.onion"); vSeeds.emplace_back("p5lmvvppkxi3jbisxaq3zojsvvnnhfowfngo6aeh63uqt66xfjjg7cyd.onion"); @@ -177,13 +170,10 @@ vSeeds.emplace_back("3o7inymtjb55o6pdpro3irptlhi447hhkxnjmuara2by2pxvlyq464id.on vSeeds.emplace_back("i35eth5la6nsp55z3uyg3fawn4hk6no7pbigfbam7divbrkld7pozuid.onion"); vSeeds.emplace_back("6tick2dw6amargim7w7qauqcpnz2uzbxhyhctiyzjismsraaqehpqmad.onion"); vSeeds.emplace_back("ddnrezdtpkps456y5usfldu6ntvvcb7qir27jj362qz6pjlnkdtmnrqd.onion"); -vSeeds.emplace_back("fgj5j7fityizhekuzdhnl4l3mx2mko3tevklucedspol6lsherwl7tad.onion"); vSeeds.emplace_back("gnxxjtvdww5u3ko5a2irehzxc7f7fsccrtqkz2t6o2juflqxevznclid.onion"); vSeeds.emplace_back("5ia5cridzvmrfn6jrc7yegxdiqsn23yr3gf2b3ru54zopbv5crwt7nad.onion"); -vSeeds.emplace_back("s3qkztnyiyb2zz52vnrm6ywlva7sxxycmjc4qcwvvmuzoukqde32qaqd.onion"); vSeeds.emplace_back("7ernyamnnp7eqqmsbmrjg36c2l3wk7bimdvlrz5qyd4c3uharwbkarad.onion"); vSeeds.emplace_back("5ia5cridzvmrfn6jrc7yegxdiqsn23yr3gf2b3ru54zopbv5crwt7nad.onion"); -vSeeds.emplace_back("tfvbzc6ambp3j4xcuz3f4q6znys4ungjwfrotcx3xeqehup3lc6tqkad.onion"); vSeeds.emplace_back("mmybo32fgmt5fo2ttkoobbrjhm3o2jp44niwfy52vj3fydfca2eb2qid.onion"); vSeeds.emplace_back("kb2bgqdwmxwxekxkc6g2s7diramjhdbiqhyxoesbzvlqsbqo7ws5l2qd.onion"); vSeeds.emplace_back("zvbevhqr33jaz67zx4mj2xqa4uqcitlwi2egmfnmjaozbxohsqppzhqd.onion"); @@ -192,22 +182,41 @@ vSeeds.emplace_back("rkann5lyt2ogrvdnvlu5t7ujewonrojpypqdbp3f2mj3nxb57inxuqad.on vSeeds.emplace_back("dlt3li54277xgyijen36nuaqd7oi6xu6s5ye47frjfd7g7kmnsp53kad.onion"); vSeeds.emplace_back("sufbx5fzkoirdu5vvzm53tae2zqnl3ynnxjamvcslgq62benctcaybid.onion"); vSeeds.emplace_back("n7g5wqzanuip5ito4ugrvwu64d2urahcr2g4dca6uhpdzy7bvrnflxyd.onion"); -vSeeds.emplace_back("5ff6psdazoqr6ufcriba6rgtbsrtuq2pyokckvod2sgrgey5qtwil4id.onion"); vSeeds.emplace_back("yr4q7su3pcstsfgfjedmr552rlrqmjengyzxuwt5mlz2fyjdvvu6gpad.onion"); -vSeeds.emplace_back("jv6ppcw7jbtdwekqoramwefyatm232vogofyzqterhk57ptg4rw6y2yd.onion"); vSeeds.emplace_back("tb2mdz7rtqiz5n6765x2arfmkizdrhmfxibhtglzo6jw72jyrn4pd2qd.onion"); vSeeds.emplace_back("ly6s7ng3a2xen7f3dnf6xrn6izigdx3xbpsp5vgtswij3lwo6gtbghyd.onion"); vSeeds.emplace_back("4tufvajf5pyuxcbzw4bvmodwxxxr3sl5ixggdn2eblycjznjfyagvhyd.onion"); -vSeeds.emplace_back("av36vsyhvcbbmrd6jopgrch7sq5x3d7acx7hfync26vicwt3btwoqoqd.onion"); +vSeeds.emplace_back("fkkznbzmdpyk65swgux63fv2ybez5i4aojcxcry3oavb4qj5czvwdhad.onion"); +vSeeds.emplace_back("ou46wbarsnmet3i3nsbs7zrg5bfisjrp4p7h5gemi2ricdzn6wjrxmad.onion"); +vSeeds.emplace_back("r5tg55r2xnexcnk6yrzekxmv34ysqn7xvpv7vz7ebent7znppw32geyd.onion"); +vSeeds.emplace_back("5tmfjfa7ftdbotoarkwbu7h7xuleahq47lumvnwdqnwoef3zbvanf3qd.onion"); +vSeeds.emplace_back("cydj7pocjyvdvl3nkrb5kxow6wga24oyzfik7ycpe5xlphvlastfhqyd.onion"); +vSeeds.emplace_back("segvmars637oxuy224gclsupzws7567vcuqonqx24j2iephrer2v4ryd.onion"); +vSeeds.emplace_back("tjupazrghiqqotro6yzlsla3zkxe6vfc4odpozgcft4bv5a6xrpnlbqd.onion"); +vSeeds.emplace_back("gaw7kjhgsfjlt4hxvxxoqlewjj7e43spzuubgcfrndglr3rmqb7kebqd.onion"); +vSeeds.emplace_back("me42s2jffdmv2j5lq74y5dfrhjwvnh27cc7k4uleccbojcfmwfsxqzad.onion"); } if (gArgs.IsArgSet("-without-tor") || gArgs.GetBoolArg("-dynamic-network", false)) { vSeeds.emplace_back("seed1.verge-blockchain.com"); //swat vSeeds.emplace_back("seed2.verge-blockchain.com"); //swat +vSeeds.emplace_back("xvg.nownodes.io"); //NOWnodes seed +vSeeds.emplace_back("seed3.verge-blockchain.com"); //swat +vSeeds.emplace_back("139.59.172.93"); +vSeeds.emplace_back("35.79.207.60"); +vSeeds.emplace_back("34.195.53.91"); +vSeeds.emplace_back("52.4.132.28"); +vSeeds.emplace_back("51.178.179.75"); +vSeeds.emplace_back("162.55.208.7"); +vSeeds.emplace_back("54.247.115.161"); +vSeeds.emplace_back("18.176.159.242"); +vSeeds.emplace_back("85.106.4.146"); +vSeeds.emplace_back("195.62.62.248"); +vSeeds.emplace_back("185.220.101.170"); +vSeeds.emplace_back("162.55.208.7"); +vSeeds.emplace_back("49.12.231.33"); } - - base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,30); base58Prefixes[SCRIPT_ADDRESS] = std::vector(1,33); base58Prefixes[SECRET_KEY] = std::vector(1,158); //128 + PUBKEY_ADDRESS @@ -246,6 +255,9 @@ checkpointData = { {6929661, uint256S("0x672aaffe34ac83696cce90a41ca395e07a26951197b343a0ef2f42e8d04b5407")}, // {7000000, uint256S("0x1f1717a822c29de6514d9180cd97afc27f95c8bef23af33ddf96c3b421074949")}, // block 7milly {7164873, uint256S("0xe265661060cbf1d33461052b0db07365217e7dec2b2e1be3f420cfbd531dfab8")}, // 10-10-23 happy 9th bday bb +{7720646, uint256S("0xee75e8bfe611f797bfd7980ca2a3ad88fbcfb2bf1c0eef905e7693e83dea851e")}, // added 9/9 +{7728562, uint256S("0xd45371b7f3a9cd31b8c80eede72c380a92ac532c6777341758d7513823ab3d28")}, // added 9/12/24 +{7860645, uint256S("0xc6ab28a8260fb3b50195c6891a2f36746a9850cf4869c588d99fef725e077f83")}, // added 11/12/24 found on xvg-pool.com! } }; @@ -288,6 +300,9 @@ checkpointIndexData = { {5296344, uint256S("0x65008bb6061b0398bee35cb8713ac90bbfc21808a4961e1edc9e3215c1ace600")}, // 10/1/2021 {5399322, uint256S("0x17ae41e30e74dfaf5e2dd3941ef71647171297fd868125f13436b1d4e45425fd")}, // 11/11/2021 (mined by Mining-Dutch.NL) {6929661, uint256S("0x672aaffe34ac83696cce90a41ca395e07a26951197b343a0ef2f42e8d04b5407")}, +{7720646, uint256S("0xee75e8bfe611f797bfd7980ca2a3ad88fbcfb2bf1c0eef905e7693e83dea851e")}, // added 9/9 +{7728562, uint256S("0xd45371b7f3a9cd31b8c80eede72c380a92ac532c6777341758d7513823ab3d28")}, // added 9/12 +{7860645, uint256S("0xc6ab28a8260fb3b50195c6891a2f36746a9850cf4869c588d99fef725e077f83")}, // added 11/12/24 found on xvg-pool.com! } }; diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index a4325cd6..591ca3e5 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h index f551691c..caab0dff 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 189d4750..f0199883 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/checkpoints.h b/src/checkpoints.h index 1ef024f7..3d8393f4 100644 --- a/src/checkpoints.h +++ b/src/checkpoints.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/checkqueue.h b/src/checkqueue.h index 9d8c0fca..956bd6b7 100644 --- a/src/checkqueue.h +++ b/src/checkqueue.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/clientversion.cpp b/src/clientversion.cpp index d2b0abfe..71468a22 100644 --- a/src/clientversion.cpp +++ b/src/clientversion.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -42,10 +42,11 @@ const std::string CLIENT_NAME("verge"); #include #endif -//! git will put "#define GIT_ARCHIVE 1" on the next line inside archives. $Format:%n#define GIT_ARCHIVE 1$ +//! git will put "#define GIT_ARCHIVE 1" on the next line inside archives. +#define GIT_ARCHIVE 1 #ifdef GIT_ARCHIVE -#define GIT_COMMIT_ID "$Format:%H$" -#define GIT_COMMIT_DATE "$Format:%cD$" +#define GIT_COMMIT_ID "dbf6e5cee54132d22ec8747167f5727ad3bf207a" +#define GIT_COMMIT_DATE "Mon, 2 Sep 2024 22:22:58 -0400" #endif // define BUILD_DESC_WITH_SUFFIX(maj, min, rev, build, suffix) \ diff --git a/src/clientversion.h b/src/clientversion.h index 2ac203af..de8be4d6 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/coins.cpp b/src/coins.cpp index d0e09e0d..50308221 100644 --- a/src/coins.cpp +++ b/src/coins.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/coins.h b/src/coins.h index 409807a1..c7ff1ba0 100644 --- a/src/coins.h +++ b/src/coins.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat.h b/src/compat.h index 0f2dd082..8babe31d 100644 --- a/src/compat.h +++ b/src/compat.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/byteswap.h b/src/compat/byteswap.h index 08f1f2cc..11a67f20 100644 --- a/src/compat/byteswap.h +++ b/src/compat/byteswap.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/endian.h b/src/compat/endian.h index 831f994e..bb8862d6 100644 --- a/src/compat/endian.h +++ b/src/compat/endian.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/glibc_compat.cpp b/src/compat/glibc_compat.cpp index 4a211eff..5be883c6 100644 --- a/src/compat/glibc_compat.cpp +++ b/src/compat/glibc_compat.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/glibc_sanity.cpp b/src/compat/glibc_sanity.cpp index 900491f0..ea8cfb73 100644 --- a/src/compat/glibc_sanity.cpp +++ b/src/compat/glibc_sanity.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/glibcxx_sanity.cpp b/src/compat/glibcxx_sanity.cpp index 5190f52c..731d5a1b 100644 --- a/src/compat/glibcxx_sanity.cpp +++ b/src/compat/glibcxx_sanity.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/sanity.h b/src/compat/sanity.h index 53d744c6..9762b554 100644 --- a/src/compat/sanity.h +++ b/src/compat/sanity.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/strnlen.cpp b/src/compat/strnlen.cpp index 745b83f7..8c576694 100644 --- a/src/compat/strnlen.cpp +++ b/src/compat/strnlen.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compressor.cpp b/src/compressor.cpp index f10f7d9e..70017f47 100644 --- a/src/compressor.cpp +++ b/src/compressor.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compressor.h b/src/compressor.h index 7f0d11fc..a1ce61ce 100644 --- a/src/compressor.h +++ b/src/compressor.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h index fd4d7d39..f19fbc34 100644 --- a/src/consensus/consensus.h +++ b/src/consensus/consensus.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/merkle.cpp b/src/consensus/merkle.cpp index ad10ba7b..0a62b06e 100644 --- a/src/consensus/merkle.cpp +++ b/src/consensus/merkle.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/merkle.h b/src/consensus/merkle.h index 17254a7b..a78eac0d 100644 --- a/src/consensus/merkle.h +++ b/src/consensus/merkle.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/params.h b/src/consensus/params.h index 57a29b77..98a7de3e 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp index b08e6e42..05fbed74 100644 --- a/src/consensus/tx_verify.cpp +++ b/src/consensus/tx_verify.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/tx_verify.h b/src/consensus/tx_verify.h index b74f48f2..8a7fcea9 100644 --- a/src/consensus/tx_verify.h +++ b/src/consensus/tx_verify.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/validation.h b/src/consensus/validation.h index 41151191..b0df9b5c 100644 --- a/src/consensus/validation.h +++ b/src/consensus/validation.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/core_io.h b/src/core_io.h index 93be901b..9dc0a568 100644 --- a/src/core_io.h +++ b/src/core_io.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/core_memusage.h b/src/core_memusage.h index a0f8ba68..acbcd1d8 100644 --- a/src/core_memusage.h +++ b/src/core_memusage.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/core_read.cpp b/src/core_read.cpp index 393f85c7..1ee2b314 100644 --- a/src/core_read.cpp +++ b/src/core_read.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/core_write.cpp b/src/core_write.cpp index 1d62d5d1..fdc91788 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp index 07bdf319..58a142d8 100644 --- a/src/crypto/aes.cpp +++ b/src/crypto/aes.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/aes.h b/src/crypto/aes.h index acd23779..ac902e90 100644 --- a/src/crypto/aes.h +++ b/src/crypto/aes.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. // diff --git a/src/crypto/chacha20.cpp b/src/crypto/chacha20.cpp index e87d2c6e..27bf0cf1 100644 --- a/src/crypto/chacha20.cpp +++ b/src/crypto/chacha20.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/chacha20.h b/src/crypto/chacha20.h index f934b40e..b0cdbbeb 100644 --- a/src/crypto/chacha20.h +++ b/src/crypto/chacha20.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/common.h b/src/crypto/common.h index 55c91365..add834dc 100644 --- a/src/crypto/common.h +++ b/src/crypto/common.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/hmac_sha256.cpp b/src/crypto/hmac_sha256.cpp index f1ef9a48..29d7c643 100644 --- a/src/crypto/hmac_sha256.cpp +++ b/src/crypto/hmac_sha256.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/hmac_sha256.h b/src/crypto/hmac_sha256.h index e93ff2ab..5c3484e8 100644 --- a/src/crypto/hmac_sha256.h +++ b/src/crypto/hmac_sha256.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/hmac_sha512.cpp b/src/crypto/hmac_sha512.cpp index 85512308..e7ce2400 100644 --- a/src/crypto/hmac_sha512.cpp +++ b/src/crypto/hmac_sha512.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/hmac_sha512.h b/src/crypto/hmac_sha512.h index d648738b..141e70b3 100644 --- a/src/crypto/hmac_sha512.h +++ b/src/crypto/hmac_sha512.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/pow/hashblake.h b/src/crypto/pow/hashblake.h index e19f0356..d262ed49 100644 --- a/src/crypto/pow/hashblake.h +++ b/src/crypto/pow/hashblake.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef VERGE_CRYPTO_POW_HASHBLAKE_H diff --git a/src/crypto/pow/hashgroestl.h b/src/crypto/pow/hashgroestl.h index 20deed18..748510c1 100644 --- a/src/crypto/pow/hashgroestl.h +++ b/src/crypto/pow/hashgroestl.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef VERGE_CRYPTO_POW_HASHGROESTL_H diff --git a/src/crypto/pow/hashquark.h b/src/crypto/pow/hashquark.h index 68a83b56..4a9066ef 100644 --- a/src/crypto/pow/hashquark.h +++ b/src/crypto/pow/hashquark.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef VERGE_CRYPTO_POW_HASHQUARK_H diff --git a/src/crypto/pow/hashqubit.h b/src/crypto/pow/hashqubit.h index 9be90169..cb195b11 100644 --- a/src/crypto/pow/hashqubit.h +++ b/src/crypto/pow/hashqubit.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef VERGE_CRYPTO_POW_HASHQUBIT_H diff --git a/src/crypto/pow/hashskein.h b/src/crypto/pow/hashskein.h index fba8cc8d..3e0fe5fd 100644 --- a/src/crypto/pow/hashskein.h +++ b/src/crypto/pow/hashskein.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef VERGE_CRYPTO_POW_HASHSKEIN_H diff --git a/src/crypto/pow/scrypt-sse2.cpp b/src/crypto/pow/scrypt-sse2.cpp index b8f6a84a..4b98b584 100644 --- a/src/crypto/pow/scrypt-sse2.cpp +++ b/src/crypto/pow/scrypt-sse2.cpp @@ -29,7 +29,7 @@ #include -#include "scrypt.h" +#include #include #include #include @@ -41,7 +41,7 @@ #include #endif -#if defined(HAVE_SSE2) +#if defined(USE_SSE2) static inline void xor_salsa8_sse2(__m128i B[4], const __m128i Bx[4]) { diff --git a/src/crypto/pow/scrypt.cpp b/src/crypto/pow/scrypt.cpp index 07f4538e..195c661e 100644 --- a/src/crypto/pow/scrypt.cpp +++ b/src/crypto/pow/scrypt.cpp @@ -29,28 +29,36 @@ #include -#include "scrypt.h" -// #include "util.h" +#include #include #include #include -// #include #include -// #if defined(_MSC_VER) -// #include -// #elif defined(__GNUC__) -// #include -// #endif +#if defined(USE_SSE2) && !defined(USE_SSE2_ALWAYS) -/* +#ifdef _MSC_VER + +// MSVC 64bit is unable to use inline asm + +#include + +#else + // GCC Linux or i686-w64-mingw32 + +#include + +#endif + +#endif + +#ifndef __FreeBSD__ static inline uint32_t be32dec(const void *pp) { const uint8_t *p = (uint8_t const *)pp; return ((uint32_t)(p[3]) + ((uint32_t)(p[2]) << 8) + ((uint32_t)(p[1]) << 16) + ((uint32_t)(p[0]) << 24)); } -*/ static inline void be32enc(void *pp, uint32_t x) { @@ -61,6 +69,8 @@ static inline void be32enc(void *pp, uint32_t x) p[0] = (x >> 24) & 0xff; } +#endif + /** * PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, c, buf, dkLen): * Compute PBKDF2(passwd, salt, c, dkLen) using HMAC-SHA256 as the PRF, and @@ -220,14 +230,15 @@ void scrypt_1024_1_1_256_sp_generic(const char *input, char *output, char *scrat PBKDF2_SHA256((const uint8_t *)input, 80, B, 128, 1, (uint8_t *)output, 32); } -#if defined(HAVE_SSE2) +#if defined(USE_SSE2) // By default, set to generic scrypt function. This will prevent crash in case when scrypt_detect_sse2() wasn't called void (*scrypt_1024_1_1_256_sp_detected)(const char *input, char *output, char *scratchpad) = &scrypt_1024_1_1_256_sp_generic; -void scrypt_detect_sse2() +bool scrypt_detect_sse2() { + bool fUsingSSE2; #if defined(USE_SSE2_ALWAYS) - printf("scrypt: using scrypt-sse2 as built.\n"); + fUsingSSE2 = true; #else // USE_SSE2_ALWAYS // 32bit x86 Linux or Windows, detect cpuid features unsigned int cpuid_edx=0; @@ -245,19 +256,22 @@ void scrypt_detect_sse2() if (cpuid_edx & 1<<26) { scrypt_1024_1_1_256_sp_detected = &scrypt_1024_1_1_256_sp_sse2; - printf("scrypt: using scrypt-sse2 as detected.\n"); + fUsingSSE2 = true; } else { scrypt_1024_1_1_256_sp_detected = &scrypt_1024_1_1_256_sp_generic; - printf("scrypt: using scrypt-generic, SSE2 unavailable.\n"); + fUsingSSE2 = false; } #endif // USE_SSE2_ALWAYS + + return fUsingSSE2; } #endif void scrypt_1024_1_1_256(const char *input, char *output) { - char scratchpad[SCRYPT_SCRATCHPAD_SIZE]; + thread_local char scratchpad[SCRYPT_SCRATCHPAD_SIZE]; + memset(scratchpad, 0, sizeof(scratchpad)); scrypt_1024_1_1_256_sp(input, output, scratchpad); } diff --git a/src/crypto/pow/scrypt.h b/src/crypto/pow/scrypt.h index da2c1a2c..c5b460c5 100644 --- a/src/crypto/pow/scrypt.h +++ b/src/crypto/pow/scrypt.h @@ -1,14 +1,23 @@ +// Copyright (c) 2011-2012 The Litecoin Core developers +// Copyright (c) 2013-2021 The Dogecoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #ifndef VERGE_CRYPTO_POW_SCRYPT_H #define VERGE_CRYPTO_POW_SCRYPT_H #include #include +#if defined(HAVE_CONFIG_H) +#include "verge-config.h" // for USE_SSE2 +#endif + static const int SCRYPT_SCRATCHPAD_SIZE = 131072 + 63; void scrypt_1024_1_1_256(const char *input, char *output); void scrypt_1024_1_1_256_sp_generic(const char *input, char *output, char *scratchpad); -#if defined(HAVE_SSE2) +#if defined(USE_SSE2) #if defined(_M_X64) || defined(__x86_64__) || defined(_M_AMD64) || (defined(MAC_OSX) && defined(__i386__)) #define USE_SSE2_ALWAYS 1 #define scrypt_1024_1_1_256_sp(input, output, scratchpad) scrypt_1024_1_1_256_sp_sse2((input), (output), (scratchpad)) @@ -16,7 +25,7 @@ void scrypt_1024_1_1_256_sp_generic(const char *input, char *output, char *scrat #define scrypt_1024_1_1_256_sp(input, output, scratchpad) scrypt_1024_1_1_256_sp_detected((input), (output), (scratchpad)) #endif -void scrypt_detect_sse2(); +bool scrypt_detect_sse2(); void scrypt_1024_1_1_256_sp_sse2(const char *input, char *output, char *scratchpad); extern void (*scrypt_1024_1_1_256_sp_detected)(const char *input, char *output, char *scratchpad); #else @@ -27,6 +36,8 @@ void PBKDF2_SHA256(const uint8_t *passwd, size_t passwdlen, const uint8_t *salt, size_t saltlen, uint64_t c, uint8_t *buf, size_t dkLen); +#ifndef __FreeBSD__ + static inline uint32_t le32dec(const void *pp) { const uint8_t *p = (uint8_t const *)pp; @@ -42,4 +53,5 @@ static inline void le32enc(void *pp, uint32_t x) p[2] = (x >> 16) & 0xff; p[3] = (x >> 24) & 0xff; } +#endif #endif // VERGE_CRYPTO_POW_SCRYPT_H diff --git a/src/crypto/ripemd160.cpp b/src/crypto/ripemd160.cpp index 12eb26d1..cc8fb818 100644 --- a/src/crypto/ripemd160.cpp +++ b/src/crypto/ripemd160.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/ripemd160.h b/src/crypto/ripemd160.h index 7a46b319..501caecc 100644 --- a/src/crypto/ripemd160.h +++ b/src/crypto/ripemd160.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha1.cpp b/src/crypto/sha1.cpp index aef81864..cd95424a 100644 --- a/src/crypto/sha1.cpp +++ b/src/crypto/sha1.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha1.h b/src/crypto/sha1.h index bdb12403..2d8a2ab2 100644 --- a/src/crypto/sha1.h +++ b/src/crypto/sha1.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha256.cpp b/src/crypto/sha256.cpp index b732c1cd..bacc0776 100644 --- a/src/crypto/sha256.cpp +++ b/src/crypto/sha256.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha256.h b/src/crypto/sha256.h index 177ea2b9..0f454ae8 100644 --- a/src/crypto/sha256.h +++ b/src/crypto/sha256.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha256_sse4.cpp b/src/crypto/sha256_sse4.cpp index 90cb90cb..c90c278b 100644 --- a/src/crypto/sha256_sse4.cpp +++ b/src/crypto/sha256_sse4.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. // diff --git a/src/crypto/sha512.cpp b/src/crypto/sha512.cpp index 8411b8b6..93f9d953 100644 --- a/src/crypto/sha512.cpp +++ b/src/crypto/sha512.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha512.h b/src/crypto/sha512.h index 7ee25f44..4b91b56a 100644 --- a/src/crypto/sha512.h +++ b/src/crypto/sha512.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp index cd1184af..d597ac92 100644 --- a/src/dbwrapper.cpp +++ b/src/dbwrapper.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -7,7 +7,7 @@ #include #include - +#include #include #include #include @@ -256,4 +256,4 @@ const std::vector& GetObfuscateKey(const CDBWrapper &w) return w.obfuscate_key; } -} // namespace dbwrapper_private +} // namespace dbwrapper_private \ No newline at end of file diff --git a/src/dbwrapper.h b/src/dbwrapper.h index d970dd22..a50ff7a3 100644 --- a/src/dbwrapper.h +++ b/src/dbwrapper.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/fs.h b/src/fs.h index 4af39ff6..5c9a6ee2 100644 --- a/src/fs.h +++ b/src/fs.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/hash.cpp b/src/hash.cpp index e7eb1305..06f3930c 100644 --- a/src/hash.cpp +++ b/src/hash.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/hash.h b/src/hash.h index 99346503..3cbc84cf 100644 --- a/src/hash.h +++ b/src/hash.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/httprpc.cpp b/src/httprpc.cpp index 2fc0298a..ad6ff240 100644 --- a/src/httprpc.cpp +++ b/src/httprpc.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/httprpc.h b/src/httprpc.h index 33c6606b..5a2998d9 100644 --- a/src/httprpc.h +++ b/src/httprpc.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/httpserver.cpp b/src/httpserver.cpp index 7019552e..594a14e5 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/httpserver.h b/src/httpserver.h index 515787a0..730eef4b 100644 --- a/src/httpserver.h +++ b/src/httpserver.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/index/base.cpp b/src/index/base.cpp index 1419b730..d2ebe6eb 100644 --- a/src/index/base.cpp +++ b/src/index/base.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/index/base.h b/src/index/base.h index 2b0ce102..f104fb0b 100644 --- a/src/index/base.h +++ b/src/index/base.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/index/txindex.cpp b/src/index/txindex.cpp index b18cfae4..dde0887d 100644 --- a/src/index/txindex.cpp +++ b/src/index/txindex.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/index/txindex.h b/src/index/txindex.h index d90c95db..6e523f34 100644 --- a/src/index/txindex.h +++ b/src/index/txindex.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/indirectmap.h b/src/indirectmap.h index eb5b3323..b5559ed0 100644 --- a/src/indirectmap.h +++ b/src/indirectmap.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/init.cpp b/src/init.cpp index 87c65d2c..28154200 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -17,6 +17,7 @@ #include #include #include +#include // for scrypt_detect_sse2 #include #include #include @@ -1332,7 +1333,14 @@ bool AppInitMain() } int64_t nStart; - + +#if defined(USE_SSE2) + if (scrypt_detect_sse2()) { + LogPrintf("scrypt: using SSE2 implementation\n"); + } else { + LogPrintf("scrypt: using generic implementation\n"); + } +#endif // ********************************************************* Step 5: verify wallet database integrity if (!g_wallet_init_interface.Verify()) return false; diff --git a/src/init.h b/src/init.h index 87179250..09b02380 100644 --- a/src/init.h +++ b/src/init.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/interfaces/handler.cpp b/src/interfaces/handler.cpp index 198278b6..538db51d 100644 --- a/src/interfaces/handler.cpp +++ b/src/interfaces/handler.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/interfaces/handler.h b/src/interfaces/handler.h index 35e393af..c6350cdd 100644 --- a/src/interfaces/handler.h +++ b/src/interfaces/handler.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp index ee6f5c8f..006f043c 100644 --- a/src/interfaces/node.cpp +++ b/src/interfaces/node.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/interfaces/node.h b/src/interfaces/node.h index 61481152..33dbee3e 100644 --- a/src/interfaces/node.h +++ b/src/interfaces/node.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp index d30de6ca..895d4030 100644 --- a/src/interfaces/wallet.cpp +++ b/src/interfaces/wallet.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h index 67f5cf53..3d349cd9 100644 --- a/src/interfaces/wallet.h +++ b/src/interfaces/wallet.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/key.cpp b/src/key.cpp index 20eeab66..79f1e2fe 100644 --- a/src/key.cpp +++ b/src/key.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Copyright (c) 2017 The Zcash developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/key.h b/src/key.h index e0d64c2d..9f71721a 100644 --- a/src/key.h +++ b/src/key.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Copyright (c) 2017 The Zcash developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/key_io.cpp b/src/key_io.cpp index 40dd04ac..3870b2f8 100644 --- a/src/key_io.cpp +++ b/src/key_io.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/key_io.h b/src/key_io.h index bdc20468..d635cde4 100644 --- a/src/key_io.h +++ b/src/key_io.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/keystore.cpp b/src/keystore.cpp index b5c47073..9eb046e4 100644 --- a/src/keystore.cpp +++ b/src/keystore.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/keystore.h b/src/keystore.h index a7a50cbb..9267c732 100644 --- a/src/keystore.h +++ b/src/keystore.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/limitedmap.h b/src/limitedmap.h index 15070db6..2fbeadf5 100644 --- a/src/limitedmap.h +++ b/src/limitedmap.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/logging.cpp b/src/logging.cpp index 2674cc67..f849f0d6 100644 --- a/src/logging.cpp +++ b/src/logging.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/logging.h b/src/logging.h index 2de15256..2208efe9 100644 --- a/src/logging.h +++ b/src/logging.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/memusage.h b/src/memusage.h index 6d49c8ec..5cfb3145 100644 --- a/src/memusage.h +++ b/src/memusage.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp index 0bc808ef..78a8c9f4 100644 --- a/src/merkleblock.cpp +++ b/src/merkleblock.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/merkleblock.h b/src/merkleblock.h index 5e81390c..e573b418 100644 --- a/src/merkleblock.h +++ b/src/merkleblock.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/miner.cpp b/src/miner.cpp index 12d6698f..cc1e20cd 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/miner.h b/src/miner.h index 3bb10a76..8ebba957 100644 --- a/src/miner.h +++ b/src/miner.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/net.cpp b/src/net.cpp index 13c3f1dc..f132ca59 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/net.h b/src/net.h index a79a7300..bf9e404a 100644 --- a/src/net.h +++ b/src/net.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 80604252..633aafd5 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/net_processing.h b/src/net_processing.h index 1da01468..93f01908 100644 --- a/src/net_processing.h +++ b/src/net_processing.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netaddress.cpp b/src/netaddress.cpp index 4bf1fb3d..981247a5 100644 --- a/src/netaddress.cpp +++ b/src/netaddress.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netaddress.h b/src/netaddress.h index d3da8ca1..0cddbcd7 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netbase.cpp b/src/netbase.cpp index bd12007e..8da4cfda 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netbase.h b/src/netbase.h index 94609854..0445a59a 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netmessagemaker.h b/src/netmessagemaker.h index fa712d55..d8d79143 100644 --- a/src/netmessagemaker.h +++ b/src/netmessagemaker.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/noui.cpp b/src/noui.cpp index b061b239..270e097f 100644 --- a/src/noui.cpp +++ b/src/noui.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/noui.h b/src/noui.h index 4863b0bc..5eb77f48 100644 --- a/src/noui.h +++ b/src/noui.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/feerate.cpp b/src/policy/feerate.cpp index 191cbfb7..a2e9ab99 100644 --- a/src/policy/feerate.cpp +++ b/src/policy/feerate.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/feerate.h b/src/policy/feerate.h index 3f09891e..daf746de 100644 --- a/src/policy/feerate.h +++ b/src/policy/feerate.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp index a6d996fe..d1735216 100644 --- a/src/policy/fees.cpp +++ b/src/policy/fees.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/fees.h b/src/policy/fees.h index 1992f881..b4a99911 100644 --- a/src/policy/fees.h +++ b/src/policy/fees.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef VERGE_POLICY_FEES_H diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index 30e788bb..d7fd8178 100644 --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/policy.h b/src/policy/policy.h index b1b2731e..06aa0433 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/rbf.cpp b/src/policy/rbf.cpp index 64a3fdc0..a8f8fdae 100644 --- a/src/policy/rbf.cpp +++ b/src/policy/rbf.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/rbf.h b/src/policy/rbf.h index f56b0af0..ed08eed7 100644 --- a/src/policy/rbf.h +++ b/src/policy/rbf.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/pow.cpp b/src/pow.cpp index 4ed7a133..bff882f5 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/pow.h b/src/pow.h index fdc2b31d..8129fb1b 100644 --- a/src/pow.h +++ b/src/pow.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/prevector.h b/src/prevector.h index 0315543a..3c502b21 100644 --- a/src/prevector.h +++ b/src/prevector.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp index 3a0d9046..43d60927 100644 --- a/src/primitives/block.cpp +++ b/src/primitives/block.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/primitives/block.h b/src/primitives/block.h index e1ffd984..12b7bea1 100644 --- a/src/primitives/block.h +++ b/src/primitives/block.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp index 6477c8cf..2e87cf19 100644 --- a/src/primitives/transaction.cpp +++ b/src/primitives/transaction.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index c891ae9e..74f8fc7d 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/protocol.cpp b/src/protocol.cpp index 25370e97..1e105cc1 100644 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/protocol.h b/src/protocol.h index ced12948..9fc01a93 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/pubkey.cpp b/src/pubkey.cpp index 9c105c85..e460d07e 100644 --- a/src/pubkey.cpp +++ b/src/pubkey.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Copyright (c) 2017 The Zcash developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/pubkey.h b/src/pubkey.h index 553f38a1..12fc9c59 100644 --- a/src/pubkey.h +++ b/src/pubkey.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Copyright (c) 2017 The Zcash developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index 00173897..c7fd8072 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/addressbookpage.h b/src/qt/addressbookpage.h index c99d4357..86d4fcce 100644 --- a/src/qt/addressbookpage.h +++ b/src/qt/addressbookpage.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp index 9cc31d27..20f8b4dd 100644 --- a/src/qt/addresstablemodel.cpp +++ b/src/qt/addresstablemodel.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/addresstablemodel.h b/src/qt/addresstablemodel.h index cfdb4978..e56bfdc9 100644 --- a/src/qt/addresstablemodel.h +++ b/src/qt/addresstablemodel.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index 613f8d4f..ecab2872 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/askpassphrasedialog.h b/src/qt/askpassphrasedialog.h index 57165860..4604ab48 100644 --- a/src/qt/askpassphrasedialog.h +++ b/src/qt/askpassphrasedialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp index d3ec3506..d80d4b62 100644 --- a/src/qt/bantablemodel.cpp +++ b/src/qt/bantablemodel.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bantablemodel.h b/src/qt/bantablemodel.h index 4e045996..c60e76ae 100644 --- a/src/qt/bantablemodel.h +++ b/src/qt/bantablemodel.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index eab984a0..e5d2224c 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h index e1b2dd0f..5c1328fa 100644 --- a/src/qt/clientmodel.h +++ b/src/qt/clientmodel.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index d4fa72d8..d2f54780 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/coincontroldialog.h b/src/qt/coincontroldialog.h index 736a7360..8aaaf77e 100644 --- a/src/qt/coincontroldialog.h +++ b/src/qt/coincontroldialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/coincontroltreewidget.cpp b/src/qt/coincontroltreewidget.cpp index 657661e6..cbf1da1c 100644 --- a/src/qt/coincontroltreewidget.cpp +++ b/src/qt/coincontroltreewidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/coincontroltreewidget.h b/src/qt/coincontroltreewidget.h index 536a06f2..a89b8c4a 100644 --- a/src/qt/coincontroltreewidget.h +++ b/src/qt/coincontroltreewidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/csvmodelwriter.cpp b/src/qt/csvmodelwriter.cpp index df85b8bb..664234f0 100644 --- a/src/qt/csvmodelwriter.cpp +++ b/src/qt/csvmodelwriter.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/csvmodelwriter.h b/src/qt/csvmodelwriter.h index d5bad909..5b9b98cc 100644 --- a/src/qt/csvmodelwriter.h +++ b/src/qt/csvmodelwriter.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp index 3b117dd6..3a145438 100644 --- a/src/qt/editaddressdialog.cpp +++ b/src/qt/editaddressdialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/editaddressdialog.h b/src/qt/editaddressdialog.h index 41b5f7f3..96fbac03 100644 --- a/src/qt/editaddressdialog.h +++ b/src/qt/editaddressdialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 22af6336..03bdd211 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h index 978d21a4..37dfbd1c 100644 --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index d16509e6..55676db2 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/intro.h b/src/qt/intro.h index 572ffa97..0e9ffb22 100644 --- a/src/qt/intro.h +++ b/src/qt/intro.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/macdockiconhandler.h b/src/qt/macdockiconhandler.h index 5b9aba18..b37b8462 100644 --- a/src/qt/macdockiconhandler.h +++ b/src/qt/macdockiconhandler.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/macnotificationhandler.h b/src/qt/macnotificationhandler.h index 6a8710c1..52f8d3f2 100644 --- a/src/qt/macnotificationhandler.h +++ b/src/qt/macnotificationhandler.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/messagemodel.cpp b/src/qt/messagemodel.cpp index f0005901..357b99c2 100644 --- a/src/qt/messagemodel.cpp +++ b/src/qt/messagemodel.cpp @@ -328,7 +328,7 @@ class MessageTablePriv return FailedErrorShown; }; - // Add addresses / update labels that we've sent to to the address book + // Add addresses / update labels that we've sent to the address book std::string strAddress = rcp.address.toStdString(); CTxDestination dest = CDarkSilkAddress(strAddress).Get(); std::string strLabel = rcp.label.toStdString(); diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp index 1924f197..27228202 100644 --- a/src/qt/modaloverlay.cpp +++ b/src/qt/modaloverlay.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/modaloverlay.h b/src/qt/modaloverlay.h index 000096f3..0ade440e 100644 --- a/src/qt/modaloverlay.h +++ b/src/qt/modaloverlay.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/networkstyle.cpp b/src/qt/networkstyle.cpp index 9721a80e..5a858f83 100644 --- a/src/qt/networkstyle.cpp +++ b/src/qt/networkstyle.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/networkstyle.h b/src/qt/networkstyle.h index a1b702a0..5f885d85 100644 --- a/src/qt/networkstyle.h +++ b/src/qt/networkstyle.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp index 885d3eeb..37c948fb 100644 --- a/src/qt/notificator.cpp +++ b/src/qt/notificator.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/notificator.h b/src/qt/notificator.h index aab1dcd7..d9897823 100644 --- a/src/qt/notificator.h +++ b/src/qt/notificator.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/openuridialog.cpp b/src/qt/openuridialog.cpp index 01eac2ad..ed95d443 100644 --- a/src/qt/openuridialog.cpp +++ b/src/qt/openuridialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/openuridialog.h b/src/qt/openuridialog.h index b9743c68..5fa30a2f 100644 --- a/src/qt/openuridialog.h +++ b/src/qt/openuridialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 9e346f46..a79acec7 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/optionsdialog.h b/src/qt/optionsdialog.h index e82a5505..fd5630dd 100644 --- a/src/qt/optionsdialog.h +++ b/src/qt/optionsdialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 8a11beff..a20a222d 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h index 642fd7be..b9c32651 100644 --- a/src/qt/optionsmodel.h +++ b/src/qt/optionsmodel.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 334ea85f..a8a97cfb 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/overviewpage.h b/src/qt/overviewpage.h index cc2334c1..7f52ea45 100644 --- a/src/qt/overviewpage.h +++ b/src/qt/overviewpage.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp index b33243c0..ac71fe31 100644 --- a/src/qt/paymentrequestplus.cpp +++ b/src/qt/paymentrequestplus.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/paymentrequestplus.h b/src/qt/paymentrequestplus.h index bf7b3656..633ab680 100644 --- a/src/qt/paymentrequestplus.h +++ b/src/qt/paymentrequestplus.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index d6b503b0..3f1abb89 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h index d35834e1..ea5467c0 100644 --- a/src/qt/paymentserver.h +++ b/src/qt/paymentserver.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp index 10bdeb64..34b408ce 100644 --- a/src/qt/peertablemodel.cpp +++ b/src/qt/peertablemodel.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/peertablemodel.h b/src/qt/peertablemodel.h index ff40da2a..0880c968 100644 --- a/src/qt/peertablemodel.h +++ b/src/qt/peertablemodel.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/platformstyle.cpp b/src/qt/platformstyle.cpp index 10c12da8..cd51d7e6 100644 --- a/src/qt/platformstyle.cpp +++ b/src/qt/platformstyle.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/platformstyle.h b/src/qt/platformstyle.h index 121f90cf..ed0f4bc5 100644 --- a/src/qt/platformstyle.h +++ b/src/qt/platformstyle.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/qvalidatedlineedit.cpp b/src/qt/qvalidatedlineedit.cpp index 5ae6c025..13c79211 100644 --- a/src/qt/qvalidatedlineedit.cpp +++ b/src/qt/qvalidatedlineedit.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/qvalidatedlineedit.h b/src/qt/qvalidatedlineedit.h index 53885c3a..2883cf43 100644 --- a/src/qt/qvalidatedlineedit.h +++ b/src/qt/qvalidatedlineedit.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/qvaluecombobox.cpp b/src/qt/qvaluecombobox.cpp index 91410595..c65671cb 100644 --- a/src/qt/qvaluecombobox.cpp +++ b/src/qt/qvaluecombobox.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/qvaluecombobox.h b/src/qt/qvaluecombobox.h index d54768b1..67cf6e38 100644 --- a/src/qt/qvaluecombobox.h +++ b/src/qt/qvaluecombobox.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp index 0f6e7c64..7463c4c3 100644 --- a/src/qt/receivecoinsdialog.cpp +++ b/src/qt/receivecoinsdialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/receivecoinsdialog.h b/src/qt/receivecoinsdialog.h index 220d0b49..92a4975e 100644 --- a/src/qt/receivecoinsdialog.h +++ b/src/qt/receivecoinsdialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp index ec5d8ab8..9ba73dde 100644 --- a/src/qt/receiverequestdialog.cpp +++ b/src/qt/receiverequestdialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/receiverequestdialog.h b/src/qt/receiverequestdialog.h index 20b1fda8..ae9c8646 100644 --- a/src/qt/receiverequestdialog.h +++ b/src/qt/receiverequestdialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp index 5a3bfcf8..035f5417 100644 --- a/src/qt/recentrequeststablemodel.cpp +++ b/src/qt/recentrequeststablemodel.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/recentrequeststablemodel.h b/src/qt/recentrequeststablemodel.h index 149e6812..eff4e6da 100644 --- a/src/qt/recentrequeststablemodel.h +++ b/src/qt/recentrequeststablemodel.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/res/icons/splash1.png b/src/qt/res/icons/splash1.png index e91e99e3..b362f1d5 100644 Binary files a/src/qt/res/icons/splash1.png and b/src/qt/res/icons/splash1.png differ diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h index d741867a..e465bd99 100644 --- a/src/qt/rpcconsole.h +++ b/src/qt/rpcconsole.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 2ca8ae86..92fc0f8e 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h index 6d340fff..4d43faad 100644 --- a/src/qt/sendcoinsdialog.h +++ b/src/qt/sendcoinsdialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index ff8d2e2c..6980f743 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/sendcoinsentry.h b/src/qt/sendcoinsentry.h index 4f92c41c..79d08bcf 100644 --- a/src/qt/sendcoinsentry.h +++ b/src/qt/sendcoinsentry.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp index 7f09d49a..3b95a073 100644 --- a/src/qt/signverifymessagedialog.cpp +++ b/src/qt/signverifymessagedialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/signverifymessagedialog.h b/src/qt/signverifymessagedialog.h index 9d8aabb8..4cf28774 100644 --- a/src/qt/signverifymessagedialog.h +++ b/src/qt/signverifymessagedialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index 5f24cc5e..973843bf 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/splashscreen.h b/src/qt/splashscreen.h index b4edfb16..228a3362 100644 --- a/src/qt/splashscreen.h +++ b/src/qt/splashscreen.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/compattests.cpp b/src/qt/test/compattests.cpp index 3ca2f6a3..2069e943 100644 --- a/src/qt/test/compattests.cpp +++ b/src/qt/test/compattests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/compattests.h b/src/qt/test/compattests.h index a03c3c21..6dbe6b88 100644 --- a/src/qt/test/compattests.h +++ b/src/qt/test/compattests.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/paymentrequestdata.h b/src/qt/test/paymentrequestdata.h index 42e52ac8..7ad30d13 100644 --- a/src/qt/test/paymentrequestdata.h +++ b/src/qt/test/paymentrequestdata.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp index ffa998ab..0f379e31 100644 --- a/src/qt/test/paymentservertests.cpp +++ b/src/qt/test/paymentservertests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/paymentservertests.h b/src/qt/test/paymentservertests.h index f8dfeb9f..27ac8ed4 100644 --- a/src/qt/test/paymentservertests.h +++ b/src/qt/test/paymentservertests.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp index 71530150..c2397a59 100644 --- a/src/qt/test/rpcnestedtests.cpp +++ b/src/qt/test/rpcnestedtests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/rpcnestedtests.h b/src/qt/test/rpcnestedtests.h index 185d6a72..21fe3538 100644 --- a/src/qt/test/rpcnestedtests.h +++ b/src/qt/test/rpcnestedtests.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index 82403eee..0d681197 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/uritests.cpp b/src/qt/test/uritests.cpp index 3102bdea..3ee7af16 100644 --- a/src/qt/test/uritests.cpp +++ b/src/qt/test/uritests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/uritests.h b/src/qt/test/uritests.h index b7a2b5d1..6463b5b3 100644 --- a/src/qt/test/uritests.h +++ b/src/qt/test/uritests.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/trafficgraphwidget.cpp b/src/qt/trafficgraphwidget.cpp index 01b29709..b9f16d66 100644 --- a/src/qt/trafficgraphwidget.cpp +++ b/src/qt/trafficgraphwidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/trafficgraphwidget.h b/src/qt/trafficgraphwidget.h index 996403f6..c74102f5 100644 --- a/src/qt/trafficgraphwidget.h +++ b/src/qt/trafficgraphwidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 90f2b091..2d09c863 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiondesc.h b/src/qt/transactiondesc.h index beeab1c5..99e6c509 100644 --- a/src/qt/transactiondesc.h +++ b/src/qt/transactiondesc.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiondescdialog.cpp b/src/qt/transactiondescdialog.cpp index f8126524..7d3bc0fb 100644 --- a/src/qt/transactiondescdialog.cpp +++ b/src/qt/transactiondescdialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiondescdialog.h b/src/qt/transactiondescdialog.h index 5f122bb7..8eef13f4 100644 --- a/src/qt/transactiondescdialog.h +++ b/src/qt/transactiondescdialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp index f8cc2bd1..eb117e38 100644 --- a/src/qt/transactionfilterproxy.cpp +++ b/src/qt/transactionfilterproxy.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionfilterproxy.h b/src/qt/transactionfilterproxy.h index efa83207..af00f234 100644 --- a/src/qt/transactionfilterproxy.h +++ b/src/qt/transactionfilterproxy.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index 0464614e..f114bf68 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h index d053b715..d1201117 100644 --- a/src/qt/transactionrecord.h +++ b/src/qt/transactionrecord.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index 7f910636..45f9a04f 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiontablemodel.h b/src/qt/transactiontablemodel.h index a7339519..45a67b0f 100644 --- a/src/qt/transactiontablemodel.h +++ b/src/qt/transactiontablemodel.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index 89d91978..2a8662cd 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionview.h b/src/qt/transactionview.h index 9c9f3815..6aa6c998 100644 --- a/src/qt/transactionview.h +++ b/src/qt/transactionview.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 77303440..d2a92703 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/utilitydialog.h b/src/qt/utilitydialog.h index 271755f3..f9c3ba9b 100644 --- a/src/qt/utilitydialog.h +++ b/src/qt/utilitydialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/verge.cpp b/src/qt/verge.cpp index 60495900..116edf96 100644 --- a/src/qt/verge.cpp +++ b/src/qt/verge.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/vergeaddressvalidator.cpp b/src/qt/vergeaddressvalidator.cpp index 01d4191b..948659f5 100644 --- a/src/qt/vergeaddressvalidator.cpp +++ b/src/qt/vergeaddressvalidator.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/vergeaddressvalidator.h b/src/qt/vergeaddressvalidator.h index 3e3cb4bf..05bca965 100644 --- a/src/qt/vergeaddressvalidator.h +++ b/src/qt/vergeaddressvalidator.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/vergeamountfield.cpp b/src/qt/vergeamountfield.cpp index 0243bff0..92638178 100644 --- a/src/qt/vergeamountfield.cpp +++ b/src/qt/vergeamountfield.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/vergeamountfield.h b/src/qt/vergeamountfield.h index 6daebdb7..ec8f82ad 100644 --- a/src/qt/vergeamountfield.h +++ b/src/qt/vergeamountfield.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/vergegui.cpp b/src/qt/vergegui.cpp index 5726bb24..ea610e4d 100644 --- a/src/qt/vergegui.cpp +++ b/src/qt/vergegui.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/vergegui.h b/src/qt/vergegui.h index 2e3c40e9..74607e76 100644 --- a/src/qt/vergegui.h +++ b/src/qt/vergegui.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/vergeunits.cpp b/src/qt/vergeunits.cpp index e098ba44..e6ac0641 100644 --- a/src/qt/vergeunits.cpp +++ b/src/qt/vergeunits.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/vergeunits.h b/src/qt/vergeunits.h index 631d9a2f..96799b3c 100644 --- a/src/qt/vergeunits.h +++ b/src/qt/vergeunits.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp index 0b0b0e44..74732d4e 100644 --- a/src/qt/walletframe.cpp +++ b/src/qt/walletframe.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h index 322a07d4..6277bad0 100644 --- a/src/qt/walletframe.h +++ b/src/qt/walletframe.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index f837a58d..96b1f479 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index 8428127e..f51e8410 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletmodeltransaction.cpp b/src/qt/walletmodeltransaction.cpp index 442beef0..1956d1f3 100644 --- a/src/qt/walletmodeltransaction.cpp +++ b/src/qt/walletmodeltransaction.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletmodeltransaction.h b/src/qt/walletmodeltransaction.h index 1f143f1a..560bd57d 100644 --- a/src/qt/walletmodeltransaction.h +++ b/src/qt/walletmodeltransaction.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index c415d0ff..3c82ea92 100644 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletview.h b/src/qt/walletview.h index 3771e425..4d373713 100644 --- a/src/qt/walletview.h +++ b/src/qt/walletview.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/winshutdownmonitor.cpp b/src/qt/winshutdownmonitor.cpp index 12298c5c..746f47c1 100644 --- a/src/qt/winshutdownmonitor.cpp +++ b/src/qt/winshutdownmonitor.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/winshutdownmonitor.h b/src/qt/winshutdownmonitor.h index 819e7913..e9109753 100644 --- a/src/qt/winshutdownmonitor.h +++ b/src/qt/winshutdownmonitor.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/random.cpp b/src/random.cpp index fead468d..af0767e5 100644 --- a/src/random.cpp +++ b/src/random.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/random.h b/src/random.h index b78060a8..45057787 100644 --- a/src/random.h +++ b/src/random.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rest.cpp b/src/rest.cpp index a919c4cf..9de79e08 100644 --- a/src/rest.cpp +++ b/src/rest.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/reverselock.h b/src/reverselock.h index fec7f3f8..ff497133 100644 --- a/src/reverselock.h +++ b/src/reverselock.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 0f230f44..f8b82ba6 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h index 58f4300f..4999f264 100644 --- a/src/rpc/blockchain.h +++ b/src/rpc/blockchain.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index 90630543..107e089f 100644 --- a/src/rpc/client.cpp +++ b/src/rpc/client.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/client.h b/src/rpc/client.h index 60e2a590..d86eb751 100644 --- a/src/rpc/client.h +++ b/src/rpc/client.h @@ -1,6 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 320d6390..dd6ecfa2 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index 6baf6374..87046692 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/protocol.cpp b/src/rpc/protocol.cpp index b7be7f8e..84c0edcd 100644 --- a/src/rpc/protocol.cpp +++ b/src/rpc/protocol.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/protocol.h b/src/rpc/protocol.h index fc7b763c..00fa7dd0 100644 --- a/src/rpc/protocol.h +++ b/src/rpc/protocol.h @@ -1,6 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 226480df..ed235f8c 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/rawtransaction.h b/src/rpc/rawtransaction.h index ed41d962..fdedbf20 100644 --- a/src/rpc/rawtransaction.h +++ b/src/rpc/rawtransaction.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/register.h b/src/rpc/register.h index bb62cac3..ad1b452a 100644 --- a/src/rpc/register.h +++ b/src/rpc/register.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 96cd56c0..6c1521f2 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/server.h b/src/rpc/server.h index 525e23fa..4f99b71f 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -1,6 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp index a3fe4e51..ac8229cc 100644 --- a/src/rpc/util.cpp +++ b/src/rpc/util.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/util.h b/src/rpc/util.h index 890309a4..784b9342 100644 --- a/src/rpc/util.h +++ b/src/rpc/util.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/scheduler.cpp b/src/scheduler.cpp index 58de023d..0bee2d0c 100644 --- a/src/scheduler.cpp +++ b/src/scheduler.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/scheduler.h b/src/scheduler.h index 4e36c6d2..46ffae51 100644 --- a/src/scheduler.h +++ b/src/scheduler.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/secp256k1/src/modinv32_impl.h b/src/secp256k1/src/modinv32_impl.h index 8e400b69..2b23ebf1 100644 --- a/src/secp256k1/src/modinv32_impl.h +++ b/src/secp256k1/src/modinv32_impl.h @@ -80,7 +80,7 @@ static void secp256k1_modinv32_normalize_30(secp256k1_modinv32_signed30 *r, int3 /* In a first step, add the modulus if the input is negative, and then negate if requested. * This brings r from range (-2*modulus,modulus) to range (-modulus,modulus). As all input * limbs are in range (-2^30,2^30), this cannot overflow an int32_t. Note that the right - * shifts below are signed sign-extending shifts (see assumptions.h for tests that that is + * shifts below are signed sign-extending shifts (see assumptions.h for tests that is * indeed the behavior of the right shift operator). */ cond_add = r8 >> 31; r0 += modinfo->modulus.v[0] & cond_add; diff --git a/src/secp256k1/src/modinv64_impl.h b/src/secp256k1/src/modinv64_impl.h index e33727d3..1275d372 100644 --- a/src/secp256k1/src/modinv64_impl.h +++ b/src/secp256k1/src/modinv64_impl.h @@ -104,7 +104,7 @@ static void secp256k1_modinv64_normalize_62(secp256k1_modinv64_signed62 *r, int6 /* In a first step, add the modulus if the input is negative, and then negate if requested. * This brings r from range (-2*modulus,modulus) to range (-modulus,modulus). As all input * limbs are in range (-2^62,2^62), this cannot overflow an int64_t. Note that the right - * shifts below are signed sign-extending shifts (see assumptions.h for tests that that is + * shifts below are signed sign-extending shifts (see assumptions.h for tests that is * indeed the behavior of the right shift operator). */ cond_add = r4 >> 63; r0 += modinfo->modulus.v[0] & cond_add; diff --git a/src/secp256k1/src/secp256k1.c b/src/secp256k1/src/secp256k1.c index 7af333ca..4b488c47 100644 --- a/src/secp256k1/src/secp256k1.c +++ b/src/secp256k1/src/secp256k1.c @@ -526,7 +526,7 @@ static int secp256k1_ecdsa_sign_inner(const secp256k1_context* ctx, secp256k1_sc break; } is_nonce_valid = secp256k1_scalar_set_b32_seckey(&non, nonce32); - /* The nonce is still secret here, but it being invalid is is less likely than 1:2^255. */ + /* The nonce is still secret here, but it being invalid is less likely than 1:2^255. */ secp256k1_declassify(ctx, &is_nonce_valid, sizeof(is_nonce_valid)); if (is_nonce_valid) { ret = secp256k1_ecdsa_sig_sign(&ctx->ecmult_gen_ctx, r, s, &sec, &msg, &non, recid); diff --git a/src/serialize.h b/src/serialize.h index 12151325..c1ce844a 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/span.h b/src/span.h index 26ab884f..2c23bde1 100644 --- a/src/span.h +++ b/src/span.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/streams.h b/src/streams.h index 834c733c..89e92e0a 100644 --- a/src/streams.h +++ b/src/streams.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp index a9d58218..7c447afd 100644 --- a/src/support/lockedpool.cpp +++ b/src/support/lockedpool.cpp @@ -28,6 +28,7 @@ #endif #include +#include LockedPoolManager* LockedPoolManager::_instance = nullptr; std::once_flag LockedPoolManager::init_flag; diff --git a/src/sync.cpp b/src/sync.cpp index 6f33166a..bb4d4a29 100644 --- a/src/sync.cpp +++ b/src/sync.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/sync.h b/src/sync.h index b0113bb8..4fc422f4 100644 --- a/src/sync.h +++ b/src/sync.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/threadinterrupt.cpp b/src/threadinterrupt.cpp index 2c7814d3..77ba2615 100644 --- a/src/threadinterrupt.cpp +++ b/src/threadinterrupt.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/threadinterrupt.h b/src/threadinterrupt.h index 2622f660..e2fc3aa8 100644 --- a/src/threadinterrupt.h +++ b/src/threadinterrupt.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/threadsafety.h b/src/threadsafety.h index 2a69a41a..2b6ab4cd 100644 --- a/src/threadsafety.h +++ b/src/threadsafety.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/timedata.cpp b/src/timedata.cpp index 1c939f31..0a3bb047 100644 --- a/src/timedata.cpp +++ b/src/timedata.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/timedata.h b/src/timedata.h index 27bae974..828bc692 100644 --- a/src/timedata.h +++ b/src/timedata.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/tor b/src/tor index 7c1601fb..d9f8e5a6 160000 --- a/src/tor +++ b/src/tor @@ -1 +1 @@ -Subproject commit 7c1601fb6edd780ffef386936217ede9531c26e6 +Subproject commit d9f8e5a6c265ff6d8714d288f1a1c752040158ea diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp index ddcef03f..c3b2b513 100644 --- a/src/torcontrol.cpp +++ b/src/torcontrol.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Copyright (c) 2017 The Zcash developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/torcontrol.h b/src/torcontrol.h index b1e91178..657c4b76 100644 --- a/src/torcontrol.h +++ b/src/torcontrol.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/torcontroller.cpp b/src/torcontroller.cpp index 45577ce0..9599c410 100644 --- a/src/torcontroller.cpp +++ b/src/torcontroller.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/torcontroller.h b/src/torcontroller.h index ad71ca5b..538aa8da 100644 --- a/src/torcontroller.h +++ b/src/torcontroller.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/txdb.cpp b/src/txdb.cpp index 1dca4d2c..3d852820 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/txdb.h b/src/txdb.h index 385141a1..f20ed96e 100644 --- a/src/txdb.h +++ b/src/txdb.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/txmempool.cpp b/src/txmempool.cpp index d8684e5f..3818db1d 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/txmempool.h b/src/txmempool.h index 2856974f..474b50e6 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -23,8 +23,17 @@ #include #include -#include +// This works around a bug in Boost <= 1.80.0 when using Clang >=18. +// See https://github.com/bitcoin/bitcoin/issues/30751. +#if defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wenum-constexpr-conversion" +#endif #include +#if defined(__clang__) +#pragma clang diagnostic pop +#endif +#include #include #include #include diff --git a/src/ui_interface.cpp b/src/ui_interface.cpp index 0b5e0be5..683116bc 100644 --- a/src/ui_interface.cpp +++ b/src/ui_interface.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/ui_interface.h b/src/ui_interface.h index 22630f06..ec24acd5 100644 --- a/src/ui_interface.h +++ b/src/ui_interface.h @@ -1,6 +1,6 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/uint256.cpp b/src/uint256.cpp index dfe014e4..4bebcf50 100644 --- a/src/uint256.cpp +++ b/src/uint256.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/undo.h b/src/undo.h index 774d9e11..a6d2871b 100644 --- a/src/undo.h +++ b/src/undo.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/moneystr.cpp b/src/util/moneystr.cpp index 9d487855..d710bc5e 100644 --- a/src/util/moneystr.cpp +++ b/src/util/moneystr.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/moneystr.h b/src/util/moneystr.h index cd91abf2..47fb2785 100644 --- a/src/util/moneystr.h +++ b/src/util/moneystr.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/strencodings.cpp b/src/util/strencodings.cpp index 58947521..b1e9b40d 100644 --- a/src/util/strencodings.cpp +++ b/src/util/strencodings.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/strencodings.h b/src/util/strencodings.h index ec461d76..daedac6d 100644 --- a/src/util/strencodings.h +++ b/src/util/strencodings.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/system.h b/src/util/system.h index 62a9eb6f..e35f4c2c 100644 --- a/src/util/system.h +++ b/src/util/system.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/time.cpp b/src/util/time.cpp index d4922363..46d818e0 100644 --- a/src/util/time.cpp +++ b/src/util/time.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/time.h b/src/util/time.h index 2db7f901..e0a88320 100644 --- a/src/util/time.h +++ b/src/util/time.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/validation.h b/src/validation.h index d93e411b..b72551b8 100644 --- a/src/validation.h +++ b/src/validation.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp index 1f5d11b5..c8d41628 100644 --- a/src/validationinterface.cpp +++ b/src/validationinterface.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/validationinterface.h b/src/validationinterface.h index 2390cac6..e078dd40 100644 --- a/src/validationinterface.h +++ b/src/validationinterface.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/verge-cli.cpp b/src/verge-cli.cpp index 59e6dc7c..db6400fc 100644 --- a/src/verge-cli.cpp +++ b/src/verge-cli.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/verge-tx.cpp b/src/verge-tx.cpp index 50583c23..08c7cf75 100644 --- a/src/verge-tx.cpp +++ b/src/verge-tx.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/verged.cpp b/src/verged.cpp index e4d6101f..18fdfa5b 100644 --- a/src/verged.cpp +++ b/src/verged.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/version.h b/src/version.h index 915655f0..13a87fbd 100644 --- a/src/version.h +++ b/src/version.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/versionbits.cpp b/src/versionbits.cpp index 4649c275..68124d43 100644 --- a/src/versionbits.cpp +++ b/src/versionbits.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/versionbits.h b/src/versionbits.h index 2464802c..63a2032e 100644 --- a/src/versionbits.h +++ b/src/versionbits.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h index 591719b4..439c1d2b 100644 --- a/src/wallet/coincontrol.h +++ b/src/wallet/coincontrol.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/coinselection.cpp b/src/wallet/coinselection.cpp index 64c8b1d0..97a021ae 100644 --- a/src/wallet/coinselection.cpp +++ b/src/wallet/coinselection.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/coinselection.h b/src/wallet/coinselection.h index 07e41355..003e9c67 100644 --- a/src/wallet/coinselection.h +++ b/src/wallet/coinselection.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/crypter.cpp b/src/wallet/crypter.cpp index 32a230f1..edb70564 100644 --- a/src/wallet/crypter.cpp +++ b/src/wallet/crypter.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h index 05550ac1..0ff04ad4 100644 --- a/src/wallet/crypter.h +++ b/src/wallet/crypter.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp index 389da913..ca6a3bf9 100644 --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/db.h b/src/wallet/db.h index 7ca154c3..3e226f8e 100644 --- a/src/wallet/db.h +++ b/src/wallet/db.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp index e6c5439b..851691f5 100644 --- a/src/wallet/feebumper.cpp +++ b/src/wallet/feebumper.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/feebumper.h b/src/wallet/feebumper.h index b963b014..22d61f19 100644 --- a/src/wallet/feebumper.h +++ b/src/wallet/feebumper.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/fees.cpp b/src/wallet/fees.cpp index 4561ae4c..65e7e58b 100644 --- a/src/wallet/fees.cpp +++ b/src/wallet/fees.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/fees.h b/src/wallet/fees.h index a0fb0128..282a2142 100644 --- a/src/wallet/fees.h +++ b/src/wallet/fees.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index 2240c927..34c594fd 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 1b335348..32fd8598 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/rpcwallet.h b/src/wallet/rpcwallet.h index e3b89d9d..bb339f76 100644 --- a/src/wallet/rpcwallet.h +++ b/src/wallet/rpcwallet.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/accounting_tests.cpp b/src/wallet/test/accounting_tests.cpp index ea4149ea..cd351a30 100644 --- a/src/wallet/test/accounting_tests.cpp +++ b/src/wallet/test/accounting_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/coinselector_tests.cpp b/src/wallet/test/coinselector_tests.cpp index ff7c8ac6..817705fb 100644 --- a/src/wallet/test/coinselector_tests.cpp +++ b/src/wallet/test/coinselector_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/wallet_crypto_tests.cpp b/src/wallet/test/wallet_crypto_tests.cpp index 9b184460..ca4a7702 100644 --- a/src/wallet/test/wallet_crypto_tests.cpp +++ b/src/wallet/test/wallet_crypto_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/wallet_test_fixture.cpp b/src/wallet/test/wallet_test_fixture.cpp index 7a81f1fc..fe9bfe35 100644 --- a/src/wallet/test/wallet_test_fixture.cpp +++ b/src/wallet/test/wallet_test_fixture.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/wallet_test_fixture.h b/src/wallet/test/wallet_test_fixture.h index ca1d4acd..60e7a73c 100644 --- a/src/wallet/test/wallet_test_fixture.h +++ b/src/wallet/test/wallet_test_fixture.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index 8ad5c82f..c4b7ff57 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index aaee9954..aff8f2ed 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 7248685c..e4e48d61 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index 766dbde5..d0538df0 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h index 7d1f3ec6..681c6434 100644 --- a/src/wallet/walletdb.h +++ b/src/wallet/walletdb.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/walletutil.cpp b/src/wallet/walletutil.cpp index 13b4273c..ef23e412 100644 --- a/src/wallet/walletutil.cpp +++ b/src/wallet/walletutil.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/walletutil.h b/src/wallet/walletutil.h index ac5082cf..b79780ae 100644 --- a/src/wallet/walletutil.h +++ b/src/wallet/walletutil.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/walletinitinterface.h b/src/walletinitinterface.h index da51ea7d..8883a9b1 100644 --- a/src/walletinitinterface.h +++ b/src/walletinitinterface.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/warnings.cpp b/src/warnings.cpp index de1f0a4f..a7b19ed2 100644 --- a/src/warnings.cpp +++ b/src/warnings.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/warnings.h b/src/warnings.h index b6d80bc6..999daf06 100644 --- a/src/warnings.h +++ b/src/warnings.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2018-2023 The Verge Core developers +// Copyright (c) 2018-2025 The Verge Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php.