diff --git a/.github/workflows/check-commit.yml b/.github/workflows/check-commit.yml index a017d215..f9b21f36 100644 --- a/.github/workflows/check-commit.yml +++ b/.github/workflows/check-commit.yml @@ -1,42 +1,6 @@ on: push jobs: - macos12: - runs-on: macos-12 - - steps: - - uses: actions/checkout@v4 - - - name: git config credential.helper - run: git config credential.helper - - - name: which clang/xcode - run: clang --version - - - name: Brew install base dependencies - run: 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 --overwrite boost@1.76 && brew link boost@1.76 qt@5 berkeley-db@4 - - - name: Auto generate - run: ./autogen.sh - - - name: configure - 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 .dmg - run: make deploy - - - uses: actions/upload-artifact@v4 - with: - name: verge-macos12 - path: | - *.dmg - macos13: runs-on: macos-13 @@ -50,10 +14,13 @@ jobs: 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 + 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 @@ -92,19 +59,25 @@ jobs: 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 boost@1.76 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 - + 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 boost@1.76 qt@5 berkeley-db@4 + 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: export boost flags and run Auto generate + - name: Auto generate run: ./autogen.sh - name: configure - run: export LDFLAGS="-L/opt/homebrew/opt/boost@1.76/lib" && export CPPFLAGS="-I/opt/homebrew/opt/boost@1.76/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.3.1 --with-libevent-dir=/opt/homebrew/Cellar/libevent/2.1.12_1 --with-boost=/opt/homebrew/Cellar/boost@1.76/1.76.0_5 + 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.0 --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 diff --git a/configure.ac b/configure.ac index ce4f255e..6bf554a8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ ]\dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 7) -define(_CLIENT_VERSION_MINOR, 7) -define(_CLIENT_VERSION_REVISION, -0)define(_CLIENT_VERSION_BUILD, 0) +define(_CLIENT_VERSION_MINOR, 8) +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) diff --git a/depends/homebrew-formulas/boost176.rb b/depends/homebrew-formulas/boost176.rb new file mode 100644 index 00000000..8d02b97b --- /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://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2" + 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@74"].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 diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 61aa9775..e6618b28 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -189,15 +189,18 @@ vSeeds.emplace_back("4tufvajf5pyuxcbzw4bvmodwxxxr3sl5ixggdn2eblycjznjfyagvhyd.on 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"); } 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 } - - base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,30); base58Prefixes[SCRIPT_ADDRESS] = std::vector(1,33); base58Prefixes[SECRET_KEY] = std::vector(1,158); //128 + PUBKEY_ADDRESS diff --git a/src/tor b/src/tor index 1b1b2b1a..d9f8e5a6 160000 --- a/src/tor +++ b/src/tor @@ -1 +1 @@ -Subproject commit 1b1b2b1a4a60cf32bcfa643eee28b88b9981ecf8 +Subproject commit d9f8e5a6c265ff6d8714d288f1a1c752040158ea