Merge pull request #444 from Creepsky/development

1.9.0

Author: Creepsky

.appveyor.yml

@@ -68,7 +68,7 @@ before_build:
   - mkdir C:\projects\creepMiner\bin\Release
   - cd C:\projects\creepminer
   - conan install . -o Poco:shared=False -o OpenSSL:shared=False -o zlib:shared=False --build=missing
-  - cmake CMakeLists.txt -G "Visual Studio 15 2017 Win64" -DUSE_CUDA=OFF -DUSE_OPENCL=%GPU% -DCMAKE_BUILD_TYPE=RELEASE -DOpenCL_INCLUDE_DIR=%OPENCL_INCLUDE_DIR% -DOpenCL_LIBRARY=%OPENCL_LIB_DIR%
+  - cmake CMakeLists.txt -G "Visual Studio 15 2017 Win64" -DUSE_CUDA=OFF -DUSE_OPENCL=%GPU% -DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DOpenCL_INCLUDE_DIR=%OPENCL_INCLUDE_DIR% -DOpenCL_LIBRARY=%OPENCL_LIB_DIR%
 
 # scripts to run after build
 after_build:

CMakeLists.txt

@@ -6,7 +6,7 @@ project(creepMiner)
 set(CMAKE_CXX_STANDARD 14)
 
 if (NOT CMAKE_BUILD_TYPE)
-	set(CMAKE_BUILD_TYPE RELEASE)
+	set(CMAKE_BUILD_TYPE RELWITHDEBINFO)
 endif ()
 
 ##################################################################
@@ -131,15 +131,15 @@ file(GLOB SOURCE_FILES
     src/logging/channels/*.*pp
     src/logging/*.*pp
     src/mining/*.*pp
-	src/network/*.*pp
-	src/nxt/nxt_address.h
-	src/nxt/nxt_address.cpp
-	src/plots/*.*pp
-	src/shabal/*.*pp
-	src/shabal/sphlib/*.*pp
+    src/network/*.*pp
+    src/nxt/nxt_address.h
+    src/nxt/nxt_address.cpp
+    src/plots/*.*pp
+    src/shabal/*.*pp
+    src/shabal/sphlib/*.*pp
     src/wallet/*.*pp
     src/webserver/*.*pp
-	src/resources.rc)
+    src/resources.rc)
 
 ##################################################################
 # Special files and settings
@@ -192,6 +192,13 @@ endif ()
 ##################################################################
 # Libraries
 ##################################################################
+
+# Optimised Shabal Library
+find_library(SHABAL_LIB NAMES shabal.dll libshabal.dylib libshabal.so HINTS "${CMAKE_SOURCE_DIR}/libShabal")
+add_library(shabalLib STATIC IMPORTED)
+set_property(TARGET shabalLib PROPERTY IMPORTED_LOCATION ${SHABAL_LIB})
+target_link_libraries(creepMiner shabalLib)
+
 target_link_libraries(creepMiner ${CONAN_LIBS})
 
 if (NOT USE_CONAN)
@@ -222,9 +229,13 @@ if (NOT MSVC)
 			WORLD_READ WORLD_WRITE WORLD_EXECUTE)
 	if (UNIX)
 		install(DIRECTORY lib/ DESTINATION lib)
-	endif ()
+		install(FILES libShabal/libshabal.so DESTINATION .)
+	elseif (APPLE)
+		install(FILES libShabal/libshabal.dylib DESTINATION .)
+	endif()
 else ()
 	install(TARGETS creepMiner RUNTIME DESTINATION .)
+	install(FILES libShabal/shabal.dll DESTINATION .)
 endif ()
 
 ##################################################################

README.md

@@ -11,6 +11,7 @@ creepMiner is written in C++ and is multi-threaded to get the best performance,
 - Multi Mining (Build a network of several miners)
 - Filter bad deadlines with the auto target deadline feature
 - Responsive web interface for keeping a close eye on your mining 
+- Support for **[BFS (Burst File System)](https://github.com/Creepsky/creepMiner/wiki/Burst-File-System)**
 
 ## Getting Started
 Please follow the [Quick start guide](https://github.com/Creepsky/creepMiner/wiki)

libShabal/libshabal.dylib

@@ -0,0 +1,40 @@
+{
+    "words": {
+        "ERROR": "color: #E88D67;",
+        "Error": "color: #E88D67;",
+        "WARN": "color: yellow;",
+        "INFO": "color: #99C5B5;",
+        "Node is DEAD": "color: #E88D67;",
+        "Nonce forward request": "color: yellow;",
+        "Got nonce forward request": "color: yellow;",
+        "nonce forward request from remote miner": "color: yellow;",
+        "success": "font-weight: bold;color: green;",
+        "deadlineText": "font-weight: bold;color: green;",
+        "ended in": "font-weight: bold;color:#70389c;",
+        "Sending wallet request": "color: yellow;",
+        "Processed block": "color: yellow;color: #99C5B5;",
+        "Ip": "color: yellow;color: #99C5B5;",
+        "in:    ": "color: #2fa4e7;",
+        "Submit-loop 1": "color: #468847;",
+        "Submit-loop 2": "color: #468847;",
+        "Submit-loop ": "color: yellow;",
+        "ItemStateChangedEvent": "font-weight: bold;"
+    },
+    "lines": {
+        "/Volumes/": "color: #ff3898;font-weight: bold;",
+        "miner-01": "color: #ff3898;font-weight: bold;",
+        "miner-02": "color: #ff54A7;font-weight: bold;",
+        "miner-03": "color: #E4239D;font-weight: bold;",
+        "ERROR": "font-weight: bold;",
+        "Error": "font-weight: bold;",
+        "block#": "color: #99C5B5;",
+        "scoop#": "color: #99C5B5;",
+        "baseTarget#": "color: #99C5B5;",
+        "nonce: ": "color: #2fa4e7;",
+        "nonce found": "color: #73a839;",
+        "nonce submitted": "color: #468847;",
+        "JSON confirmation": "color: #468847;",
+        "nonce confirmed": "color: green;font-weight: bold;",
+        "requestType=getMiningInfo": "color: black;"
+    }
+}

libShabal/libshabal.so

@@ -88,7 +88,11 @@ echo $use_avx2
 echo $use_opencl
 echo $use_cuda
 
+cd ..
 conan install . --build=missing -s compiler.libcxx=libstdc++11
 rm CMakeCache.txt -f
 cmake . -DCMAKE_BUILD_TYPE=RELEASE $use_sse4 $use_avx $use_avx2 $use_opencl $use_cuda
 make -j$(nproc)
+cp -Tr resources/public bin/public
+cp resources/run.sh bin
+cp resources/screen.sh bin

libShabal/shabal.dll

@@ -0,0 +1,4 @@
+cd ..
+conan install . --build=missing -o Poco:shared=False -o OpenSSL:shared=False -o zlib:shared=False -if conan/debug -s build_type=Debug
+conan install . --build=missing -o Poco:shared=False -o OpenSSL:shared=False -o zlib:shared=False -s build_type=Release
+pause