diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml index 71b682ae6ee..73beec90ba4 100644 --- a/.github/workflows/build-dev.yaml +++ b/.github/workflows/build-dev.yaml @@ -58,7 +58,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] steps: - uses: actions/checkout@v3 @@ -75,7 +75,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] steps: - uses: actions/checkout@v3 @@ -92,7 +92,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml index 1f1e0b0a71b..5531fd7025d 100644 --- a/.github/workflows/build-release.yaml +++ b/.github/workflows/build-release.yaml @@ -47,7 +47,7 @@ jobs: tags: latest,${{ env.BUILD_VERSION }} windows: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest if: startsWith(github.ref, 'refs/tags/') steps: @@ -63,7 +63,7 @@ jobs: path: ./build/defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32.tar.gz macos: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest if: startsWith(github.ref, 'refs/tags/') steps: @@ -83,7 +83,7 @@ jobs: - linux - windows - macos - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest if: startsWith(github.ref, 'refs/tags/') steps: diff --git a/.github/workflows/tests-sync.yml b/.github/workflows/tests-sync.yml index 3ac80fda65c..7ae8e4b053b 100644 --- a/.github/workflows/tests-sync.yml +++ b/.github/workflows/tests-sync.yml @@ -25,6 +25,8 @@ jobs: fetch-depth: 0 - name: Build Node + # TODO: Switch this to a docker build later and this builds on the native + # VM toolchain and loses disparity with the CI release builds run: TARGET="x86_64-pc-linux-gnu" ./make.sh build - name: Upload Binaries diff --git a/depends/packages/native_biplist.mk b/depends/packages/native_biplist.mk deleted file mode 100644 index c3054cbd1a1..00000000000 --- a/depends/packages/native_biplist.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=native_biplist -$(package)_version=1.0.3 -$(package)_download_path=https://bitbucket.org/wooster/biplist/downloads -$(package)_file_name=biplist-$($(package)_version).tar.gz -$(package)_sha256_hash=4c0549764c5fe50b28042ec21aa2e14fe1a2224e239a1dae77d9e7f3932aa4c6 -$(package)_install_libdir=$(build_prefix)/lib/python3/dist-packages - -define $(package)_build_cmds - python3 setup.py build -endef - -define $(package)_stage_cmds - mkdir -p $($(package)_install_libdir) && \ - python3 setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir) -endef diff --git a/depends/packages/native_ds_store.mk b/depends/packages/native_ds_store.mk deleted file mode 100644 index f99b689ecdc..00000000000 --- a/depends/packages/native_ds_store.mk +++ /dev/null @@ -1,16 +0,0 @@ -package=native_ds_store -$(package)_version=1.1.2 -$(package)_download_path=https://github.com/al45tair/ds_store/archive/ -$(package)_file_name=v$($(package)_version).tar.gz -$(package)_sha256_hash=3b3ecb7bf0a5157f5b6010bc3af7c141fb0ad3527084e63336220d22744bc20c -$(package)_install_libdir=$(build_prefix)/lib/python3/dist-packages -$(package)_dependencies=native_biplist - -define $(package)_build_cmds - python3 setup.py build -endef - -define $(package)_stage_cmds - mkdir -p $($(package)_install_libdir) && \ - python3 setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir) -endef diff --git a/depends/packages/native_mac_alias.mk b/depends/packages/native_mac_alias.mk deleted file mode 100644 index e60b99dccc9..00000000000 --- a/depends/packages/native_mac_alias.mk +++ /dev/null @@ -1,15 +0,0 @@ -package=native_mac_alias -$(package)_version=2.0.7 -$(package)_download_path=https://github.com/al45tair/mac_alias/archive/ -$(package)_file_name=v$($(package)_version).tar.gz -$(package)_sha256_hash=6f606d3b6bccd2112aeabf1a063f5b5ece87005a5d7e97c8faca23b916e88838 -$(package)_install_libdir=$(build_prefix)/lib/python3/dist-packages - -define $(package)_build_cmds - python3 setup.py build -endef - -define $(package)_stage_cmds - mkdir -p $($(package)_install_libdir) && \ - python3 setup.py install --root=$($(package)_staging_dir) --prefix=$(build_prefix) --install-lib=$($(package)_install_libdir) -endef diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index 06c1e9e15fb..ced6602ea06 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -8,8 +8,7 @@ zmq_packages=zeromq upnp_packages=miniupnpc -darwin_native_packages = native_biplist native_ds_store native_mac_alias - +darwin_native_packages = ifneq ($(build_os),darwin) darwin_native_packages += native_cctools endif diff --git a/make.sh b/make.sh index 0e874c3ffc0..04496cbc96d 100755 --- a/make.sh +++ b/make.sh @@ -16,8 +16,6 @@ setup_vars() { DOCKERFILE=${DOCKERFILE:-""} DOCKERFILES_DIR=${DOCKERFILES_DIR:-"./contrib/dockerfiles"} RELEASE_DIR=${RELEASE_DIR:-"./build"} - CLANG_DEFAULT_VERSION=${CLANG_DEFAULT_VERSION:-"16"} - CLANG_DEFAULT_VERSION=${CLANG_DEFAULT_VERSION:-"16"} MAKE_DEBUG=${MAKE_DEBUG:-"0"} @@ -401,7 +399,7 @@ pkg_install_deps() { pkg_install_deps_mingw_x86_64() { apt install -y \ - g++-mingw-w64-x86-64 mingw-w64-x86-64-dev nsis + g++-mingw-w64-x86-64 mingw-w64-x86-64-dev } pkg_install_deps_armhf() { diff --git a/src/Makefile.am b/src/Makefile.am index a6afc116d24..e5daac7238b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -73,7 +73,7 @@ EXTRA_LIBRARIES += \ $(LIBDEFI_WALLET) \ $(LIBDEFI_ZMQ) -lib_LIBRARIES = $(LIBDEFI_CONSENSUS) +lib_LIBRARIES = lib_LTLIBRARIES = bin_PROGRAMS = @@ -451,6 +451,7 @@ endif if !ENABLE_WALLET libdefi_server_a_SOURCES += dummywallet.cpp endif +libdefi_server_a_LIBADD = $(LIBDEFI_CONSENSUS) if ENABLE_ZMQ libdefi_zmq_a_CPPFLAGS = $(AM_CPPFLAGS) $(DEFI_INCLUDES) $(ZMQ_CFLAGS) diff --git a/src/amount.h b/src/amount.h index dd26bdc686b..70afea0b903 100644 --- a/src/amount.h +++ b/src/amount.h @@ -136,7 +136,7 @@ struct CTokenAmount { // simple std::pair is less informative // add auto sumRes = SafeAdd(nValue, amount); if (!sumRes) { - return sumRes; + return std::move(sumRes); } nValue = *sumRes;