diff --git a/Algo256/keccak256.cu b/Algo256/keccak256.cu
index 45f812f664..a758bd90c1 100644
--- a/Algo256/keccak256.cu
+++ b/Algo256/keccak256.cu
@@ -72,7 +72,8 @@ extern "C" int scanhash_keccak256(int thr_id, struct work* work, uint32_t max_no
if(!use_compat_kernels[thr_id]) {
uint32_t intensity = 23;
- if (strstr(device_name[dev_id], "GTX 1080")) intensity = 25;
+ if (strstr(device_name[dev_id], "GTX 1070")) intensity = 25;
+ if (strstr(device_name[dev_id], "GTX 1080")) intensity = 26;
throughput = cuda_default_throughput(thr_id, 1U << intensity);
keccak256_cpu_init(thr_id);
} else {
@@ -120,7 +121,17 @@ extern "C" int scanhash_keccak256(int thr_id, struct work* work, uint32_t max_no
if (vhash[7] <= ptarget[7] && fulltest(vhash, ptarget)) {
work->valid_nonces = 1;
work_set_target_ratio(work, vhash);
- pdata[19] = work->nonces[0] + 1;
+ if (!use_compat_kernels[thr_id] && work->nonces[1] != UINT32_MAX) {
+ be32enc(&endiandata[19], work->nonces[1]);
+ keccak256_hash(vhash, endiandata);
+ if (vhash[7] <= ptarget[7] && fulltest(vhash, ptarget)) {
+ work->valid_nonces++;
+ bn_set_target_ratio(work, vhash, 1);
+ }
+ pdata[19] = max(work->nonces[0], work->nonces[1]) + 1;
+ } else {
+ pdata[19] = work->nonces[0] + 1;
+ }
return work->valid_nonces;
}
else if (vhash[7] > Htarg) {
diff --git a/ccminer.vcxproj.filters b/ccminer.vcxproj.filters
index b7c088b888..a508e2222c 100644
--- a/ccminer.vcxproj.filters
+++ b/ccminer.vcxproj.filters
@@ -824,7 +824,7 @@
Source Files\CUDA\Algo256
- Source Files\CUDA
+ Source Files\CUDA\Algo256
Source Files\CUDA\Algo256
diff --git a/res/ccminer.rc b/res/ccminer.rc
index 84be50d618..8b47cfa27d 100644
--- a/res/ccminer.rc
+++ b/res/ccminer.rc
@@ -60,8 +60,8 @@ IDI_ICON1 ICON "ccminer.ico"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,2,0
- PRODUCTVERSION 2,2,2,0
+ FILEVERSION 2,2,3,0
+ PRODUCTVERSION 2,2,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x21L
@@ -76,10 +76,10 @@ BEGIN
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "FileVersion", "2.2.2"
+ VALUE "FileVersion", "2.2.3"
VALUE "LegalCopyright", "Copyright (C) 2017"
VALUE "ProductName", "ccminer"
- VALUE "ProductVersion", "2.2.2"
+ VALUE "ProductVersion", "2.2.3"
END
END
BLOCK "VarFileInfo"