From 5e5d6b9b149bd5d085fbcf239a85e835699f0b06 Mon Sep 17 00:00:00 2001 From: Ken Date: Thu, 13 Feb 2014 06:18:28 +0000 Subject: [PATCH 1/5] fix syntax errors --- lib/template_registry.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/template_registry.py b/lib/template_registry.py index 7be8db6..bb719a9 100644 --- a/lib/template_registry.py +++ b/lib/template_registry.py @@ -241,10 +241,10 @@ class TemplateRegistry(object): if settings.COINDAEMON_ALGO == 'scrypt': hash_bin = ltc_scrypt.getPoWHash(''.join([ header_bin[i*4:i*4+4][::-1] for i in range(0, 20) ])) elif settings.COINDAEMON_ALGO == 'scrypt-jane': - if settings.SCRYPTJANE_NAME = 'vtc_scrypt: + if settings.SCRYPTJANE_NAME == 'vtc_scrypt': hash_bin = scryptjane.getPoWHash(''.join([ header_bin[i*4:i*4+4][::-1] for i in range(0, 20) ])) else: - hash_bin = scryptjane.getPoWHash(''.join([ header_bin[i*4:i*4+4][::-1] for i in range(0, 20) ])), int(ntime, 16)) + hash_bin = scryptjane.getPoWHash(''.join([ header_bin[i*4:i*4+4][::-1] for i in range(0, 20) ]), int(ntime, 16)) elif settings.COINDAEMON_ALGO == 'quark': hash_bin = quark_hash.getPoWHash(''.join([ header_bin[i*4:i*4+4][::-1] for i in range(0, 20) ])) elif settings.COINDAEMON_ALGO == 'skeinhash': From 56cd8940b16181665353cf7b7c9302dad720b1ec Mon Sep 17 00:00:00 2001 From: Ken Date: Thu, 13 Feb 2014 06:41:55 +0000 Subject: [PATCH 2/5] Added vert module --- .gitmodules | 3 +++ externals/vertcoin_scrypt | 1 + 2 files changed, 4 insertions(+) create mode 160000 externals/vertcoin_scrypt diff --git a/.gitmodules b/.gitmodules index a64f28d..3863f4c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "externals/quarkcoin-hash"] path = externals/quarkcoin-hash url = https://github.com/Neisklar/quarkcoin-hash-python +[submodule "externals/vertcoin_scrypt"] + path = externals/vertcoin_scrypt + url = https://github.com/scr34m/vertcoin_scrypt.git diff --git a/externals/vertcoin_scrypt b/externals/vertcoin_scrypt new file mode 160000 index 0000000..4a3d789 --- /dev/null +++ b/externals/vertcoin_scrypt @@ -0,0 +1 @@ +Subproject commit 4a3d789cf4fd713308f26610e39e81cb7d86423f From 67f74ff9ef76808a6f2c486719e0e5c4dd805a51 Mon Sep 17 00:00:00 2001 From: Ken Date: Thu, 13 Feb 2014 06:51:32 +0000 Subject: [PATCH 3/5] Another try --- .gitmodules | 3 +++ externals/vtc_scrypt | 1 + 2 files changed, 4 insertions(+) create mode 160000 externals/vtc_scrypt diff --git a/.gitmodules b/.gitmodules index 3863f4c..b5fd9e0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "externals/vertcoin_scrypt"] path = externals/vertcoin_scrypt url = https://github.com/scr34m/vertcoin_scrypt.git +[submodule "externals/vtc_scrypt"] + path = externals/vtc_scrypt + url = https://github.com/scr34m/vertcoin_scrypt.git diff --git a/externals/vtc_scrypt b/externals/vtc_scrypt new file mode 160000 index 0000000..4a3d789 --- /dev/null +++ b/externals/vtc_scrypt @@ -0,0 +1 @@ +Subproject commit 4a3d789cf4fd713308f26610e39e81cb7d86423f From 7e4f9cd58fb62777ba97d69ce3900d585c89f75e Mon Sep 17 00:00:00 2001 From: Ken Date: Thu, 13 Feb 2014 07:21:05 +0000 Subject: [PATCH 4/5] Revert "Another try" This reverts commit 67f74ff9ef76808a6f2c486719e0e5c4dd805a51. --- .gitmodules | 3 --- externals/vtc_scrypt | 1 - 2 files changed, 4 deletions(-) delete mode 160000 externals/vtc_scrypt diff --git a/.gitmodules b/.gitmodules index b5fd9e0..3863f4c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,6 +13,3 @@ [submodule "externals/vertcoin_scrypt"] path = externals/vertcoin_scrypt url = https://github.com/scr34m/vertcoin_scrypt.git -[submodule "externals/vtc_scrypt"] - path = externals/vtc_scrypt - url = https://github.com/scr34m/vertcoin_scrypt.git diff --git a/externals/vtc_scrypt b/externals/vtc_scrypt deleted file mode 160000 index 4a3d789..0000000 --- a/externals/vtc_scrypt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4a3d789cf4fd713308f26610e39e81cb7d86423f From 5f8a1ff51d77ab5aa05840c1b6bf57a54053687c Mon Sep 17 00:00:00 2001 From: Ken Date: Thu, 13 Feb 2014 20:00:35 +0000 Subject: [PATCH 5/5] fix typo --- lib/halfnode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/halfnode.py b/lib/halfnode.py index c886384..e18be88 100644 --- a/lib/halfnode.py +++ b/lib/halfnode.py @@ -296,7 +296,7 @@ class CBlock(object): self.quark = uint256_from_str(quark_hash.getPoWHash(''.join(r))) return self.quark elif settings.COINDAEMON_ALGO == 'scrypt-jane': - def calc_acryptjane(self): + def calc_scryptjane(self): if self.scryptjane is None: r = [] r.append(struct.pack("