Merge branch 'mainnet_7.1RC' into mainnet

.github/workflows/build.yml

@@ -14,7 +14,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-10.15, ubuntu-18.04, windows-2019]
+        # os: [macos-11]
+        os: [macos-11, ubuntu-18.04, windows-2019]
 
     steps:
     - uses: actions/checkout@v2
@@ -30,8 +31,8 @@ jobs:
 # Create Build Environment
 ###############################################################################
 
-    - name: Create Build Environment [macos-10.15]
-      if: matrix.os == 'macos-10.15'
+    - name: Create Build Environment [macos-11]
+      if: matrix.os == 'macos-11'
       run: |
         echo $GITHUB_WORKSPACE
         echo "OPENSSL_ROOT_DIR=/usr/local/opt/[email protected]" >> $GITHUB_ENV
@@ -63,18 +64,26 @@ jobs:
         echo "BOOST_ROOT=c:\boost_prebuild" >> $GITHUB_ENV
 
     - name: Download boost [ubuntu && macos]
-      if: matrix.os != 'windows-2019'
+      if: matrix.os != 'windows-2019' && matrix.os != 'macos-11'
       shell: bash
       run: |
         git clone --depth=1 https://github.com/BeamMW/boost_prebuild_${{matrix.os}}.git ${{runner.workspace}}/boost_prebuild
         echo "BOOST_INCLUDEDIR=${{runner.workspace}}/boost_prebuild/include" >> $GITHUB_ENV
         echo "BOOST_LIBRARYDIR=${{runner.workspace}}/boost_prebuild/lib/" >> $GITHUB_ENV
 
+    - name: Download boost [macos]
+      if: matrix.os == 'macos-11'
+      shell: bash
+      run: |
+        git clone --depth=1 https://github.com/BeamMW/boost_prebuild_macos-10.15.git ${{runner.workspace}}/boost_prebuild
+        echo "BOOST_INCLUDEDIR=${{runner.workspace}}/boost_prebuild/include" >> $GITHUB_ENV
+        echo "BOOST_LIBRARYDIR=${{runner.workspace}}/boost_prebuild/lib/" >> $GITHUB_ENV
+
 ###############################################################################
 # Configure CMake
 ###############################################################################
-    - name: Configure CMake [macos-10.15]
-      if: matrix.os == 'macos-10.15'
+    - name: Configure CMake [macos-11]
+      if: matrix.os == 'macos-11'
       run: |
         # git apply 3rdparty/protobuf-patch.diff
         cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDEBUG_MESSAGES_IN_RELEASE_MODE=On -DBEAM_LINK_TYPE=Static -DBRANCH_NAME=${GITHUB_REF##*/} -DBEAM_HW_WALLET=Off .
@@ -103,8 +112,8 @@ jobs:
 ###############################################################################
 # Build
 ###############################################################################
-    - name: Build [macos-10.15]
-      if: matrix.os == 'macos-10.15'
+    - name: Build [macos-11]
+      if: matrix.os == 'macos-11'
       run: cmake --build . --parallel --config $BUILD_TYPE
 
     - name: Build [ununtu all]
@@ -120,8 +129,8 @@ jobs:
 ###############################################################################
 # Test
 ###############################################################################
-    - name: Test [macos-10.15]
-      if: matrix.os == 'macos-10.15'
+    - name: Test [macos-11]
+      if: matrix.os == 'macos-11'
       continue-on-error: false
       run: ctest -C $BUILD_TYPE --verbose
 
@@ -140,14 +149,14 @@ jobs:
 ###############################################################################
 # Collect artifacts
 ###############################################################################
-    - name: Import Code-Signing Certificates [macos-10.15]
-      if: matrix.os == 'macos-10.15'
+    - name: Import Code-Signing Certificates [macos-11]
+      if: matrix.os == 'macos-11'
       uses: Apple-Actions/import-codesign-certs@v1
       with:
         p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
         p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
-    - name: Sign the mac binaries [macos-10.15]
-      if: matrix.os == 'macos-10.15'
+    - name: Sign the mac binaries [macos-11]
+      if: matrix.os == 'macos-11'
       run: |
         codesign --deep --force -v -s "${{secrets.MACOS_SIGN_IDENTITY}}" -o runtime --timestamp beam/beam-node${{env.BEAM_TARGET_SUFFIX}}
         codesign --deep --force -v -s "${{secrets.MACOS_SIGN_IDENTITY}}" -o runtime --timestamp wallet/cli/beam-wallet${{env.BEAM_TARGET_SUFFIX}}
@@ -166,8 +175,8 @@ jobs:
         sha256sum wallet/broadcaster/broadcaster${{env.BEAM_TARGET_SUFFIX}} > wallet/broadcaster/broadcaster${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
         sha256sum bvm/ethash_service/ethash-service > bvm/ethash_service/ethash-service-checksum.txt
 
-    - name: Checksum [macos-10.15]
-      if: matrix.os == 'macos-10.15'
+    - name: Checksum [macos-11]
+      if: matrix.os == 'macos-11'
       run: |
         shasum -a 256 beam/beam-node${{env.BEAM_TARGET_SUFFIX}} > beam/beam-node${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
         shasum -a 256 wallet/cli/beam-wallet${{env.BEAM_TARGET_SUFFIX}} > wallet/cli/beam-wallet${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
@@ -176,7 +185,7 @@ jobs:
         shasum -a 256 wallet/broadcaster/broadcaster${{env.BEAM_TARGET_SUFFIX}} > wallet/broadcaster/broadcaster${{env.BEAM_TARGET_SUFFIX}}-checksum.txt
         shasum -a 256 bvm/ethash_service/ethash-service > bvm/ethash_service/ethash-service-checksum.txt
 
-    - name: Collect [macos-10.15 && ununtu all]
+    - name: Collect [macos-11 && ununtu all]
       shell: bash
       if: matrix.os != 'windows-2019'
       run: |
@@ -228,8 +237,8 @@ jobs:
         certUtil -hashfile artifacts/ethash-service.exe SHA256 > artifacts/ethash-service-checksum.txt
         certUtil -hashfile artifacts/ipfs-bindings.dll SHA256 > artifacts/ipfs-bindings-checksum.txt
 
-    - name: OS name [macos-10.15]
-      if: matrix.os == 'macos-10.15'
+    - name: OS name [macos-11]
+      if: matrix.os == 'macos-11'
       run: echo "PLATFORM_NAME=mac" >> $GITHUB_ENV
 
     - name: OS name [ununtu all]
@@ -297,7 +306,7 @@ jobs:
 # Build IOS
 ###############################################################################
   build_ios:
-    runs-on: macos-10.15
+    runs-on: macos-11
     #if: ${{false}}
 
     steps:
@@ -394,7 +403,7 @@ jobs:
         abi: [x86, x86_64, armeabi-v7a, arm64-v8a]
     env:
       ANDROID_ABI: ${{matrix.abi}}
-      ANDROID_SDK_VERSION: 23
+      ANDROID_SDK_VERSION: 25
 
     steps:
     - uses: actions/checkout@v2
@@ -408,7 +417,8 @@ jobs:
       run: |
         git clone --depth=1 https://github.com/BeamMW/boost-android.git ${{runner.workspace}}/dependencies/boost_1_68-android
         git clone --depth=1 https://github.com/BeamMW/openssl-android.git ${{runner.workspace}}/dependencies/Prebuilt-OpenSSL-Android
-        echo "ANDROID_NDK_HOME=/usr/local/lib/android/sdk/ndk-bundle" >> $GITHUB_ENV
+        echo "ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME" >> $GITHUB_ENV
+        ls /usr/local/lib/android/sdk
         echo "BOOST_ROOT_ANDROID=${{runner.workspace}}/dependencies/boost_1_68-android" >> $GITHUB_ENV
         echo "OPENSSL_ROOT_DIR_ANDROID=${{runner.workspace}}/dependencies/Prebuilt-OpenSSL-Android" >> $GITHUB_ENV
 

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13)
 cmake_policy(SET CMP0074 NEW)
 
 set(VERSION_MAJOR 7)
-set(VERSION_MINOR 0 )
+set(VERSION_MINOR 1 )
 set(VERSION_REVISION 0)
 set(GIT_COMMIT_HASH "unknown")
 

android/dao/web_api_creator.cpp

@@ -37,7 +37,7 @@ void WebAPICreator::createApi(WalletModel::Ptr walletModel, const std::string& v
     const auto appid = beam::wallet::GenerateAppID(appName, appUrl);
     auto guard = this;
 
-    AppsApiUI::ClientThread_Create(walletModel.get(), version, appid, appName, false,
+    AppsApiUI::ClientThread_Create(walletModel.get(), version, appid, appName, 0, false,
                                    [this, guard, version, appName, appid] (AppsApiUI::Ptr api) {
         if (guard)
         {