Update ethash library

Author: chfast

cmake/ProjectEthash.cmake

@@ -9,7 +9,7 @@ ExternalProject_Add(
     ethash-project
     PREFIX ${prefix}
     GIT_REPOSITORY https://github.com/chfast/ethash
-    GIT_TAG 701c4c94fbaf525c4e5e871fe466a90b1aa6228e
+    GIT_TAG 09b50e66b868b114e89f4b649099edc3b899e91e
     CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
     -DETHASH_BUILD_TESTS=OFF

libethash-cl/CLMiner.cpp

@@ -588,10 +588,10 @@ bool CLMiner::init(int epoch)
             m_globalWorkSize = ((m_globalWorkSize / m_workgroupSize) + 1) * m_workgroupSize;
 
         const auto& context = ethash::managed::get_epoch_context(epoch);
-        const auto lightNumItems = ethash::get_light_cache_num_items(context);
-        const auto dagNumItems = ethash::get_full_dataset_num_items(context);
+        const auto lightNumItems = context.light_cache_num_items;
+        const auto lightSize = ethash::get_light_cache_size(lightNumItems);
+        const auto dagNumItems = context.full_dataset_num_items;
         const auto dagSize = ethash::get_full_dataset_size(dagNumItems);
-        const auto lightRef = ethash::managed::get_light_cache_data(epoch);
 
         // patch source code
         // note: The kernels here are simply compiled version of the respective .cl kernels
@@ -652,15 +652,15 @@ bool CLMiner::init(int epoch)
         // create buffer for dag
         try
         {
-            cllog << "Creating light cache buffer, size" << lightRef.size;
-            m_light = cl::Buffer(m_context, CL_MEM_READ_ONLY, lightRef.size);
+            cllog << "Creating light cache buffer, size" << lightSize;
+            m_light = cl::Buffer(m_context, CL_MEM_READ_ONLY, lightSize);
             cllog << "Creating DAG buffer, size" << dagSize;
             m_dag = cl::Buffer(m_context, CL_MEM_READ_ONLY, dagSize);
             cllog << "Loading kernels";
             m_searchKernel = cl::Kernel(program, "ethash_search");
             m_dagKernel = cl::Kernel(program, "ethash_calculate_dag_item");
             cllog << "Writing light cache buffer";
-            m_queue.enqueueWriteBuffer(m_light, CL_TRUE, 0, lightRef.size, lightRef.data);
+            m_queue.enqueueWriteBuffer(m_light, CL_TRUE, 0, lightSize, context.light_cache);
         }
         catch (cl::Error const& err)
         {

libethcore/EthashAux.cpp

@@ -71,7 +71,7 @@ Result EthashAux::LightAllocation::compute(h256 const& _headerHash, uint64_t _no
 
 Result EthashAux::eval(int epoch, h256 const& _headerHash, uint64_t _nonce) noexcept
 {
-    auto headerHash = ethash::hash256::from_bytes(_headerHash.data());
+    auto headerHash = ethash::hash256_from_bytes(_headerHash.data());
     auto result = ethash::managed::hash(epoch, headerHash, _nonce);
     h256 mix{reinterpret_cast<byte*>(result.mix_hash.bytes), h256::ConstructFromPointer};
     h256 final{reinterpret_cast<byte*>(result.final_hash.bytes), h256::ConstructFromPointer};

libpoolprotocols/getwork/EthGetworkClient.cpp

@@ -101,7 +101,7 @@ void EthGetworkClient::workLoop()
 				WorkPackage newWorkPackage;
 				newWorkPackage.header = h256(v[0].asString());
                 newWorkPackage.epoch = ethash::find_epoch_number(
-                    ethash::hash256::from_bytes(h256{v[1].asString()}.data()));
+                    ethash::hash256_from_bytes(h256{v[1].asString()}.data()));
 
                 // Since we do not have a real connected state with getwork, we just fake it.
 				// If getting work succeeds we know that the connection works

libpoolprotocols/stratum/EthStratumClient.cpp

@@ -509,7 +509,7 @@ void EthStratumClient::processReponse(Json::Value& responseObject)
 						reset_work_timeout();
 
                         m_current.epoch = ethash::find_epoch_number(
-                            ethash::hash256::from_bytes(h256{sSeedHash}.data()));
+                            ethash::hash256_from_bytes(h256{sSeedHash}.data()));
                         m_current.header = h256(sHeaderHash);
 						m_current.boundary = h256();
 						diffToTarget((uint32_t*)m_current.boundary.data(), m_nextWorkDifficulty);
@@ -547,7 +547,7 @@ void EthStratumClient::processReponse(Json::Value& responseObject)
 
 							m_current.header = h256(sHeaderHash);
                             m_current.epoch = ethash::find_epoch_number(
-                                ethash::hash256::from_bytes(h256{sSeedHash}.data()));
+                                ethash::hash256_from_bytes(h256{sSeedHash}.data()));
                             m_current.boundary = h256(sShareTarget);
 							m_current.job = h256(job);