Merge remote-tracking branch 'remotes/origin/fierce_fermion_6.2RC' in…

…to testnet

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-10.15, ubuntu-16.04, windows-2019]
+        os: [macos-10.15, ubuntu-18.04, windows-2019]
         #os: [macos-10.15, ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, windows-2019]
 
     steps:
@@ -39,9 +39,9 @@ jobs:
         sudo apt-get update
         sudo apt-get install libssl-dev curl libxi-dev libcups2-dev -y
       
-    - name: Create Build Environment [ubuntu 16.04]
+    - name: Create Build Environment [ubuntu-18.04]
       shell: bash
-      if: matrix.os == 'ubuntu-16.04'
+      if: matrix.os == 'ubuntu-18.04'
       run: |
         sudo add-apt-repository ppa:ubuntu-toolchain-r/test
         sudo apt-get update
@@ -459,8 +459,8 @@ jobs:
         git clone https://github.com/emscripten-core/emsdk.git
         cd emsdk
         git pull
-        ./emsdk install latest
-        ./emsdk activate latest
+        ./emsdk install 2.0.33
+        ./emsdk activate 2.0.33
 
     - name: Download boost
       shell: bash
@@ -514,8 +514,8 @@ jobs:
         git clone https://github.com/emscripten-core/emsdk.git ${{runner.workspace}}/emsdk
         cd ${{runner.workspace}}/emsdk
         git pull
-        ./emsdk install latest
-        ./emsdk activate latest
+        ./emsdk install 2.0.33
+        ./emsdk activate 2.0.33
 
     - name: Download boost
       shell: bash
@@ -535,7 +535,7 @@ jobs:
     - name: Configure CMake && Build
       run: |
         source ${{runner.workspace}}/emsdk/emsdk_env.sh
-        cmake . -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_TOOLCHAIN_FILE=${{runner.workspace}}/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DBoost_DEBUG=On -DBEAM_TESTS_ENABLED=Off -DBEAM_WALLET_CLIENT_LIBRARY=On -DBEAM_ATOMIC_SWAP_SUPPORT=Off -DBEAM_LASER_SUPPORT=Off -DBEAM_USE_STATIC=On -DBOOST_ROOT=${{runner.workspace}}/boost_prebuild -DCMAKE_FIND_ROOT_PATH:FILEPATH="${{runner.workspace}}/boost_prebuild;${{runner.workspace}}/openssl-wasm" -DOPENSSL_ROOT_DIR=${{runner.workspace}}/openssl-wasm -B${{runner.workspace}}/build_wasm
+        cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE=${{runner.workspace}}/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DBoost_DEBUG=On -DBEAM_TESTS_ENABLED=Off -DBEAM_WALLET_CLIENT_LIBRARY=On -DBEAM_ATOMIC_SWAP_SUPPORT=Off -DBEAM_LASER_SUPPORT=Off -DBEAM_USE_STATIC=On -DBOOST_ROOT=${{runner.workspace}}/boost_prebuild -DCMAKE_FIND_ROOT_PATH:FILEPATH="${{runner.workspace}}/boost_prebuild;${{runner.workspace}}/openssl-wasm" -DOPENSSL_ROOT_DIR=${{runner.workspace}}/openssl-wasm -B${{runner.workspace}}/build_wasm
         emmake make -j$(nproc) -C ${{runner.workspace}}/build_wasm
 
     - name: Save version info

.github/workflows/msvc-analysis.yml

@@ -0,0 +1,64 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+#
+# Find more information at:
+# https://github.com/microsoft/msvc-code-analysis-action
+
+name: Microsoft C++ Code Analysis
+
+on:
+  #push:
+  #  branches: [ master ]
+  #pull_request:
+  #  branches: [ master ]
+  schedule:
+    - cron: '23 6 * * 3'
+
+env:
+  # Path to the CMake build directory.
+  build: '${{ github.workspace }}/build'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Configure CMake
+        run: |
+          git clone --depth=1 https://github.com/BeamMW/libs.git c:/beam-libs
+          echo "OPENSSL_ROOT_DIR=c:\beam-libs\openssl" >> $GITHUB_ENV
+          git clone https://github.com/BeamMW/boost_prebuild_${{matrix.os}}.git c:/boost_prebuild
+          echo "BOOST_ROOT=c:\boost_prebuild" >> $GITHUB_ENV
+          cmake -B ${{ env.build }}
+
+      # Build is not required unless generated source files are used
+      # - name: Build CMake
+      #   run: cmake --build ${{ env.build }}
+
+      - name: Initialize MSVC Code Analysis
+        uses: microsoft/msvc-code-analysis-action@502db28262ba134c9a621d5a509b9f7e696c99b6
+        # Provide a unique ID to access the sarif output path
+        id: run-analysis
+        with:
+          cmakeBuildDirectory: ${{ env.build }}
+          # Ruleset file that will determine what checks will be run
+          ruleset: NativeRecommendRules.ruleset
+
+      # Upload SARIF file to GitHub Code Scanning Alerts
+      - name: Upload SARIF to GitHub
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: ${{ steps.run-analysis.outputs.sarif }}
+
+      # Upload SARIF file as an Artifact to download and view
+      # - name: Upload SARIF as an Artifact
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: sarif-file
+      #     path: ${{ steps.run-analysis.outputs.sarif }}

.gitignore

@@ -111,4 +111,5 @@ ui/translations.qrc
 beam_version.gen
 keykeeper/wasm-key-keeper.*
 
-out/
+out/
+wmake.sh

3rdparty/libbitcoin/include/bitcoin/bitcoin/impl/formats/base_16.ipp

@@ -44,7 +44,7 @@ bool decode_base16(byte_array<Size>& out, const std::string &in)
 template <size_t Size>
 byte_array<(Size - 1) / 2> base16_literal(const char (&string)[Size])
 {
-    byte_array<(Size - 1) / 2> out;
+    byte_array<(Size - 1) / 2> out = {};
     DEBUG_ONLY(const auto success =) decode_base16_private(out.data(),
         out.size(), string);
     BITCOIN_ASSERT(success);

3rdparty/libbitcoin/src/chain/CMakeLists.txt

@@ -11,6 +11,7 @@ if(MSVC)
     target_compile_options(${TARGET_NAME} PUBLIC "/wd4996")
     target_compile_options(${TARGET_NAME} PUBLIC "/wd4273")
     target_compile_options(${TARGET_NAME} PUBLIC "/wd4251")
+    target_compile_options(${TARGET_NAME} PUBLIC "/wd4189")
 elseif(APPLE  OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     target_compile_options(${TARGET_NAME} PUBLIC -Wno-mismatched-tags)
     target_compile_options(${TARGET_NAME} PUBLIC -Wno-unused-variable)

3rdparty/libbitcoin/src/config/authority.cpp

@@ -126,7 +126,7 @@ authority::authority(const message::network_address& address)
 
 static asio::ipv6 to_boost_address(const message::ip_address& in)
 {
-    asio::ipv6::bytes_type bytes;
+    asio::ipv6::bytes_type bytes = {};
     BITCOIN_ASSERT(bytes.size() == in.size());
     std::copy_n(in.begin(), in.size(), bytes.begin());
     const asio::ipv6 out(bytes);

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13)
 cmake_policy(SET CMP0074 NEW)
 
 set(VERSION_MAJOR 6)
-set(VERSION_MINOR 1 )
+set(VERSION_MINOR 2 )
 set(VERSION_REVISION 0)
 set(GIT_COMMIT_HASH "unknown")
 
@@ -100,6 +100,8 @@ set(BEAM_VERSION_MAJOR ${VERSION_MAJOR} CACHE INTERNAL "")
 set(BEAM_VERSION_MINOR ${VERSION_MINOR} CACHE INTERNAL "")
 set(BEAM_VERSION_REVISION ${VERSION_REVISION} CACHE INTERNAL "")
 set(BEAM_BRANCH_NAME ${BRANCH_NAME} CACHE INTERNAL "")
+set(BEAM_PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR} CACHE INTERNAL "")
+set(BEAM_PROJECT_BINARY_DIR ${PROJECT_BINARY_DIR} CACHE INTERNAL "")
 
 message("BEAM_VERSION: ${PROJECT_VERSION}")
 
@@ -275,7 +277,7 @@ else()
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
 
     if (EMSCRIPTEN)
-        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_PTHREADS=1 -s DISABLE_EXCEPTION_CATCHING=0 -s USE_BOOST_HEADERS=1")
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_PTHREADS=1 -s DISABLE_EXCEPTION_CATCHING=0 -s USE_BOOST_HEADERS=1 ")
         set(BEAM_WEB_WALLET_THREADS_NUM 5)
         add_definitions(-DBEAM_WEB_WALLET_THREADS_NUM=${BEAM_WEB_WALLET_THREADS_NUM})
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-command-line-argument") # mostly in 3rd-party libs
@@ -286,6 +288,7 @@ else()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-const-variable") # so what?
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function") # mostly in 3rd-party libs
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-value") # proto.h
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-nonnull") # yas
 endif()
 
 if(BEAM_HW_WALLET)
@@ -446,7 +449,6 @@ if(NOT BEAM_BVM_ONLY)
     add_subdirectory(hw_crypto)
     add_subdirectory(node)
     add_subdirectory(mnemonic)
-    add_subdirectory(websocket)
 endif()
 
 if (EMSCRIPTEN)
@@ -460,4 +462,5 @@ endif()
 if(NOT BEAM_WALLET_CLIENT_LIBRARY)
     add_subdirectory(beam)
     add_subdirectory(explorer)
+    add_subdirectory(websocket)
 endif()

README.md

@@ -43,8 +43,6 @@ ap-nodes.mainnet.beam.mw:8100
 
 ap-hk-nodes.mainnet.beam.mw:8100
 
-shanghai-node.mainnet.beam.mw:8100
-
 Latest documentation is here: https://documentation.beam.mw
 
 ### BUILD FROM SOURCE

android/CMakeLists.txt

@@ -10,12 +10,17 @@ set(SRC
     common.cpp 
     node_model.h 
     node_model.cpp
+    dao/apps_api_ui.h
+    dao/apps_api_ui.cpp
+    dao/web_api_creator.h
+    dao/web_api_creator.cpp
 )
 
 add_library(${TARGET_NAME} SHARED ${SRC})
 target_link_libraries(${TARGET_NAME}
     PRIVATE
         wallet_client
+        wallet_api
         utility 
         node 
         mnemonic

android/com/mw/beam/beamwallet/core/entities/dto/ContractConsentDTO.java

@@ -0,0 +1,8 @@
+
+
+public class ContractConsentDTO
+{       
+    public String request;         
+    public String info;
+    public String amounts;
+}

android/com/mw/beam/beamwallet/core/entities/dto/TxDescriptionDTO.java

@@ -36,4 +36,10 @@ public class TxDescriptionDTO
     public boolean isMaxPrivacy;
     public boolean isShielded;
 	public int assetId;
+    public boolean isDapps;
+	public String appName;
+	public String appID;
+	public String contractCids;
+	public int minConfirmations;
+	public String minConfirmationsProgress;	
 }

android/common.cpp

@@ -29,6 +29,7 @@ jclass ExchangeRateClass = 0;
 jclass VersionInfoClass = 0;
 jclass TransactionParametersClass = 0;
 jclass AssetInfoClass = 0;
+jclass ContractConsetClass = 0;
 
 namespace
 {

android/common.h

@@ -47,6 +47,7 @@ extern jclass ExchangeRateClass;
 extern jclass VersionInfoClass;
 extern jclass TransactionParametersClass;
 extern jclass AssetInfoClass;
+extern jclass ContractConsetClass;
 
 JNIEnv* Android_JNI_getEnv(void);