Merge remote-tracking branch 'remotes/origin/fierce_fermion_6.0RC' into testnet

Author: anatolse

.github/workflows/build.yml

@@ -51,29 +51,14 @@ jobs:
       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
 
-    - name: Download boost
+    - name: Download boost [ubuntu && macos]
+      if: matrix.os != 'windows-2019'
       shell: bash
       run: |
         git clone --depth=1 https://github.com/BeamMW/boost_prebuild_${{matrix.os}}.git ${{runner.workspace}}/boost_prebuild
-
-    - name: Configure boost path [windows]
-      shell: bash
-      if: matrix.os == 'windows-2019'
-      run: |
-        echo "BOOST_ROOT=${{runner.workspace}}/boost_prebuild" >> $GITHUB_ENV
-
-    - name: Configure boost path [ununtu all]
-      shell: bash
-      if: matrix.os == 'ubuntu-16.04' || matrix.os == 'ubuntu-18.04' || matrix.os == 'ubuntu-20.04'
-      run: |
-        echo "BOOST_INCLUDEDIR=${{runner.workspace}}/boost_prebuild/include" >> $GITHUB_ENV
-        echo "BOOST_LIBRARYDIR=${{runner.workspace}}/boost_prebuild/lib/" >> $GITHUB_ENV
-
-    - name: Configure boost path [macos-10.15]
-      shell: bash
-      if: matrix.os == 'macos-10.15'
-      run: |
         echo "BOOST_INCLUDEDIR=${{runner.workspace}}/boost_prebuild/include" >> $GITHUB_ENV
         echo "BOOST_LIBRARYDIR=${{runner.workspace}}/boost_prebuild/lib/" >> $GITHUB_ENV
 

3rdparty/CMakeLists.txt

@@ -9,8 +9,8 @@ add_library(pbkdf STATIC
 )
 
 add_subdirectory(secp256k1-zkp)
+add_subdirectory(ethash)
 if (BEAM_ATOMIC_SWAP_SUPPORT)
-    add_subdirectory(ethash)
     add_subdirectory(libbitcoin)
 endif()
 add_subdirectory(sqlite)

3rdparty/ethash/include/ethash/keccak.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <ethash/hash_types.h>
+#include "hash_types.h"
 
 #include <stddef.h>
 

bvm/CMakeLists.txt

@@ -12,6 +12,7 @@ add_library(bvm STATIC ${BVM_SRC})
 target_link_libraries(bvm 
     PUBLIC
         core
+        keccak
 )
 
 if(BEAM_TESTS_ENABLED)

bvm/Shaders/dummy/contract.cpp

@@ -120,11 +120,17 @@ export void Method_7(Dummy::Hash2& r)
 
 export void Method_8(Dummy::Hash3& r)
 {
-    HashObj* pHash = Env::HashCreateKeccak256();
+    HashObj* pHash = Env::HashCreateKeccak(r.m_Bits);
     Env::Halt_if(!pHash);
 
-    Env::HashWrite(pHash, r.m_pInp, sizeof(r.m_pInp));
-    Env::HashGetValue(pHash, r.m_pRes, sizeof(r.m_pRes));
+    for (uint32_t nDone = 0; nDone < r.m_Inp; )
+    {
+        auto nPortion = std::min(r.m_NaggleBytes, r.m_Inp - nDone);
+        Env::HashWrite(pHash, r.m_pInp + nDone, nPortion);
+        nDone += nPortion;
+    }
+
+    Env::HashGetValue(pHash, r.m_pRes, r.m_Bits / 8);
 
     Env::HashFree(pHash);
 }

bvm/Shaders/dummy/contract.h

@@ -55,8 +55,11 @@ namespace Dummy
     {
         static const uint32_t s_iMethod = 8;
 
-        uint8_t m_pInp[15];
-        uint8_t m_pRes[32];
+        uint32_t m_Bits;
+        uint32_t m_Inp;
+        uint32_t m_NaggleBytes;
+        uint8_t m_pInp[520];
+        uint8_t m_pRes[64];
     };
 
     struct VerifyBeamHeader