Merge pull request #2678 from bitshares/release

Merge release branch into master branch for 6.1.0 feature release for Mainnet

.github/workflows/build-and-test.mac.yml

@@ -8,7 +8,7 @@ jobs:
  name: Build and test in macOS
  strategy:
  matrix:
- os: [macos-10.15, macos-11]
+ os: [macos-11]
  runs-on: ${{ matrix.os }}
  steps:
  - name: Install dependencies
@@ -17,7 +17,7 @@ jobs:
  brew install ccache
  brew install parallel
  brew install bitshares/boost/boost@1.69
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  with:
  submodules: recursive
  - name: Configure
@@ -31,7 +31,7 @@ jobs:
  -D OPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 \
  ..
  - name: Load Cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
  with:
  path: ccache
  key: ccache-${{ matrix.os }}-${{ github.ref }}-${{ github.sha }}

.github/workflows/build-and-test.ubuntu-debug.yml

@@ -12,7 +12,7 @@ jobs:
  runs-on: ${{ matrix.os }}
  services:
  elasticsearch:
- image: docker://elasticsearch:7.10.1
+ image: docker://elasticsearch:7.17.7
  options: --env discovery.type=single-node --publish 9200:9200 --publish 9300:9300
  steps:
  - name: Install dependencies
@@ -43,22 +43,28 @@ jobs:
  df -h
  sudo du -hs /mnt/*
  sudo ls -alr /mnt/
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  with:
  submodules: recursive
  - name: Configure
  run: |
  pwd
  df -h .
+ free
+ sudo dd if=/dev/zero of=/swapfile bs=1024 count=4M
+ sudo chmod 600 /swapfile
+ sudo mkswap /swapfile
+ sudo swapon /swapfile
+ free
  mkdir -p _build
- sudo mkdir -p /_build/libraries /_build/programs /mnt/_build/tests
- sudo chmod a+rwx /_build/libraries /_build/programs /mnt/_build/tests
+ sudo mkdir -p /_build/libraries /_build/programs /_build/tests /mnt/_build
+ sudo chmod a+rwx /_build/libraries /_build/programs /_build/tests
  ln -s /_build/libraries _build/libraries
  ln -s /_build/programs _build/programs
- ln -s /mnt/_build/tests _build/tests
+ ln -s /_build/tests _build/tests
  sudo ln -s /_build/libraries /mnt/_build/libraries
  sudo ln -s /_build/programs /mnt/_build/programs
- sudo ln -s /mnt/_build/tests /_build/tests
+ sudo ln -s /_build/tests /mnt/_build/tests
  ls -al _build
  pushd _build
  export -n BOOST_ROOT BOOST_INCLUDEDIR BOOST_LIBRARYDIR
@@ -71,7 +77,7 @@ jobs:
  ..
  popd
  - name: Load Cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
  with:
  path: ccache
  key: ccache-debug-${{ matrix.os }}-${{ github.ref }}-${{ github.sha }}
@@ -83,13 +89,13 @@ jobs:
  export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
  mkdir -p "$CCACHE_DIR"
  df -h
- make -j 2 -C _build chain_test
- make -j 2 -C _build cli_test
- make -j 2 -C _build app_test
- make -j 2 -C _build es_test
- make -j 2 -C _build cli_wallet
- make -j 2 -C _build witness_node
- make -j 2 -C _build
+ make -j 1 -C _build chain_test
+ make -j 1 -C _build cli_test
+ make -j 1 -C _build app_test
+ make -j 1 -C _build es_test
+ make -j 1 -C _build cli_wallet
+ make -j 1 -C _build witness_node
+ make -j 1 -C _build
  df -h
  du -hs _build/libraries/* _build/programs/* _build/tests/*
  du -hs _build/*

.github/workflows/build-and-test.ubuntu-release.yml

@@ -12,7 +12,7 @@ jobs:
  runs-on: ${{ matrix.os }}
  services:
  elasticsearch:
- image: docker://elasticsearch:7.10.1
+ image: docker://elasticsearch:7.17.7
  options: --env discovery.type=single-node --publish 9200:9200 --publish 9300:9300
  steps:
  - name: Install dependencies
@@ -40,7 +40,7 @@ jobs:
  sudo apt-get auto-remove -y
  sudo apt-get clean -y
  df -h
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  with:
  submodules: recursive
  - name: Configure
@@ -57,7 +57,7 @@ jobs:
  ..
  popd
  - name: Load Cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
  with:
  path: ccache
  key: ccache-release-${{ matrix.os }}-${{ github.ref }}-${{ github.sha }}
@@ -68,7 +68,7 @@ jobs:
  run: |
  export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
  mkdir -p "$CCACHE_DIR"
- make -j 2 -C _build
+ make -j 1 -C _build
  df -h
  - name: Unit-Tests
  run: |

.github/workflows/build-and-test.win.yml

@@ -6,9 +6,9 @@ env:
  # The following are for windows cross-build only:
  BOOST_VERSION: 1_69_0
  BOOST_DOTTED_VERSION: 1.69.0
- CURL_VERSION: 7.67.0
- OPENSSL_VERSION: 1.1.1d
- ZLIB_VERSION: 1.2.11
+ CURL_VERSION: 7.86.0
+ OPENSSL_VERSION: 1.1.1s
+ ZLIB_VERSION: 1.2.13
 jobs:
  prepare-mingw64-libs:
  name: Build required 3rd-party libraries
@@ -19,7 +19,7 @@ jobs:
  echo "OS_VERSION=`lsb_release -sr`" >> $GITHUB_ENV
  - name: Load Cache
  id: cache-libs
- uses: actions/cache@v2
+ uses: actions/cache@v3
  with:
  path: libs
  key: mingw64-libs-${{ env.OS_VERSION }}-${{ env.BOOST_VERSION }}_${{ env.CURL_VERSION }}_${{ env.OPENSSL_VERSION }}_${{ env.ZLIB_VERSION }}
@@ -113,13 +113,13 @@ jobs:
  sudo apt-get auto-remove -y
  sudo apt-get clean -y
  df -h
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  with:
  submodules: recursive
  - run: |
  echo "OS_VERSION=`lsb_release -sr`" >> $GITHUB_ENV
  - name: Load external libraries
- uses: actions/cache@v2
+ uses: actions/cache@v3
  with:
  path: libs
  key: mingw64-libs-${{ env.OS_VERSION }}-${{ env.BOOST_VERSION }}_${{ env.CURL_VERSION }}_${{ env.OPENSSL_VERSION }}_${{ env.ZLIB_VERSION }}
@@ -143,7 +143,7 @@ jobs:
  -D GRAPHENE_DISABLE_UNITY_BUILD=ON \
  ..
  - name: Load Cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
  with:
  path: ccache
  key: ccache-mingw64-${{ env.OS_VERSION }}-${{ github.ref }}-${{ github.sha }}

.github/workflows/build-docker.yml

@@ -1,46 +1,62 @@
-name: Build and push to DockerHub
+name: Docker
 on: [ push, pull_request ]
 jobs:
  docker:
  runs-on: ubuntu-latest
  steps:
- - name: Inject slug/short environment variables
- uses: rlespinasse/github-slug-action@v3.x
  - name: Decide whether to push to DockerHub, and set tag
  if: |
  github.event_name == 'push' &&
  ( startsWith( github.ref, 'refs/tags/' ) ||
- contains( fromJSON('["master","develop","testnet","hardfork"]'), env.GITHUB_REF_NAME ) )
+ contains( fromJSON('["master","develop","testnet","hardfork"]'), github.ref_name ) )
  run: |
- if [[ "${GITHUB_REF_NAME}" == "master" ]] ; then
+ if [ "${GITHUB_REF_NAME}" == "master" ] ; then
  DOCKER_PUSH_TAG=latest
  else
  DOCKER_PUSH_TAG=${GITHUB_REF_NAME}
  fi
  echo "DOCKER_PUSH_TAG=${DOCKER_PUSH_TAG}"
  echo "DOCKER_PUSH_TAG=${DOCKER_PUSH_TAG}" >> $GITHUB_ENV
+ VERSION_MAJOR=`echo "${DOCKER_PUSH_TAG}" | cut -f1 -d'.'`
+ if [ "${VERSION_MAJOR}" != "${DOCKER_PUSH_TAG}" ]; then
+ VERSION_MINOR=`echo "${DOCKER_PUSH_TAG}" | cut -f2 -d'.'`
+ DOCKER_PUSH_TAG_SHORT=${VERSION_MAJOR}.${VERSION_MINOR}
+ if [ "${DOCKER_PUSH_TAG_SHORT}" != "${DOCKER_PUSH_TAG}" ]; then
+ echo "DOCKER_PUSH_TAG_SHORT=${DOCKER_PUSH_TAG_SHORT}"
+ echo "DOCKER_PUSH_TAG_SHORT=${DOCKER_PUSH_TAG_SHORT}" >> $GITHUB_ENV
+ fi
+ fi
  - name: Test tag
  if: env.DOCKER_PUSH_TAG != ''
  run: echo "${DOCKER_PUSH_TAG}"
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v1
+ uses: docker/setup-buildx-action@v2
  - name: Build only
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v3
  with:
  context: .
  load: true
  - name: Login to DockerHub
  if: env.DOCKER_PUSH_TAG != ''
- uses: docker/login-action@v1
+ uses: docker/login-action@v2
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}
  password: ${{ secrets.DOCKERHUB_TOKEN }}
- - name: Push to DockerHub
- if: env.DOCKER_PUSH_TAG != ''
- uses: docker/build-push-action@v2
+ - name: Push to DockerHub (for branches)
+ if: env.DOCKER_PUSH_TAG != '' && env.DOCKER_PUSH_TAG_SHORT == ''
+ uses: docker/build-push-action@v3
+ with:
+ context: .
+ push: true
+ tags: ${{ secrets.DOCKERHUB_REPO_PATH }}:${{ env.DOCKER_PUSH_TAG }}
+ - name: Push to DockerHub (for tags)
+ if: env.DOCKER_PUSH_TAG != '' && env.DOCKER_PUSH_TAG_SHORT != ''
+ uses: docker/build-push-action@v3
  with:
  context: .
  push: true
- tags: bitshares/bitshares-core:${{ env.DOCKER_PUSH_TAG }}
+ tags: |
+ ${{ secrets.DOCKERHUB_REPO_PATH }}:${{ env.DOCKER_PUSH_TAG }}
+ ${{ secrets.DOCKERHUB_REPO_PATH }}:${{ env.DOCKER_PUSH_TAG_SHORT }}

.github/workflows/sonar-scan.yml

@@ -8,17 +8,18 @@ jobs:
  name: Scan with SonarScanner
  strategy:
  matrix:
- os: [ ubuntu-latest ]
+ os: [ ubuntu-20.04 ]
  runs-on: ${{ matrix.os }}
  services:
  elasticsearch:
- image: docker://elasticsearch:7.10.1
+ image: docker://elasticsearch:7.17.7
  options: --env discovery.type=single-node --publish 9200:9200 --publish 9300:9300
  steps:
  - name: Download and install latest SonarScanner CLI tool
  run: |
- SONAR_SCANNER_VERSION=`curl https://github.com/SonarSource/sonar-scanner-cli/releases/latest \
- 2>/dev/null | cut -f2 -d'"' | cut -f8 -d'/'`
+ SONAR_SCANNER_VERSION=`curl -w %{redirect_url} \
+ https://github.com/SonarSource/sonar-scanner-cli/releases/latest \
+ 2>/dev/null | cut -f8 -d'/'`
  SONAR_DOWNLOAD_PATH=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli
  curl --create-dirs -sSLo $HOME/.sonar/sonar-scanner.zip \
  $SONAR_DOWNLOAD_PATH/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux.zip
@@ -60,14 +61,20 @@ jobs:
  df -h
  sudo du -hs /mnt/*
  sudo ls -alr /mnt/
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  with:
  fetch-depth: 0
  submodules: recursive
  - name: Configure
  run: |
  pwd
  df -h .
+ free
+ sudo dd if=/dev/zero of=/swapfile bs=1024 count=4M
+ sudo chmod 600 /swapfile
+ sudo mkswap /swapfile
+ sudo swapon /swapfile
+ free
  mkdir -p _build
  sudo mkdir -p /_build/libraries /_build/programs /mnt/_build/tests
  sudo chmod a+rwx /_build/libraries /_build/programs /mnt/_build/tests
@@ -96,7 +103,7 @@ jobs:
  - run: |
  echo "OS_VERSION=`lsb_release -sr`" >> $GITHUB_ENV
  - name: Load Cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
  with:
  path: |
  ccache
@@ -110,7 +117,7 @@ jobs:
  export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
  mkdir -p "$CCACHE_DIR"
  df -h
- programs/build_helpers/make_with_sonar bw-output -j 2 -C _build \
+ programs/build_helpers/make_with_sonar bw-output -j 1 -C _build \
  witness_node cli_wallet js_operation_serializer get_dev_key network_mapper \
  app_test chain_test cli_test es_test
  df -h

CMakeLists.txt

@@ -59,6 +59,13 @@ macro(FIND_CURL)
  find_package(CURL REQUIRED)
  endif (NOT WIN32 AND NOT APPLE AND CURL_STATICLIB)
 
+ if( APPLE AND NOT "${CURL_VERSION_STRING}" VERSION_LESS "7.77.0" )
+ list( APPEND CURL_LIBRARIES "-framework CoreFoundation" )
+ list( APPEND CURL_LIBRARIES "-framework SystemConfiguration" )
+ endif()
+
+ message(STATUS "CURL libraries: ${CURL_LIBRARIES}")
+
  if( WIN32 )
  if ( MSVC )
  list( APPEND CURL_LIBRARIES Wldap32 )
@@ -261,7 +268,7 @@ else( WIN32 ) # Apple AND Linux
 
  if( APPLE )
  # Apple Specific Options Here
- message( STATUS "Configuring BitShares on OS X" )
+ message( STATUS "Configuring BitShares on macOS" )
  set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -stdlib=libc++ -Wall -fvisibility-inlines-hidden -fvisibility=hidden" )
  else( APPLE )
  if ( "${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD" )