From 574a9b1e4d8cae6d68663589007b560f79f98fff Mon Sep 17 00:00:00 2001
From: gatra <gatra@riecoin.org>
Date: Tue, 18 Mar 2014 01:14:37 -0300
Subject: [PATCH] submit block bug fixes

---
 lib/halfnode.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/halfnode.py b/lib/halfnode.py
index a0394c1..4ffc017 100644
--- a/lib/halfnode.py
+++ b/lib/halfnode.py
@@ -270,8 +270,8 @@ class CBlock(object):
         r.append(ser_uint256(self.hashMerkleRoot))
         if settings.COINDAEMON_ALGO == 'riecoin':
             r.append(struct.pack("<I", self.nBits))
-            r.append(struct.pack("<II", self.nTime))
-            r.append(struct.pack("<IIIIIIII", self.nNonce))
+            r.append(struct.pack("<Q", self.nTime))
+            r.append(ser_uint256(self.nNonce))
         else:
             r.append(struct.pack("<I", self.nTime))
             r.append(struct.pack("<I", self.nBits))
@@ -314,10 +314,9 @@ class CBlock(object):
                 r.append(ser_uint256(self.hashPrevBlock))
                 r.append(ser_uint256(self.hashMerkleRoot))
                 r.append(struct.pack("<I", self.nBits))
-                r.append(struct.pack("<II", self.nTime))
-		hash_bin = util.doublesha(''.join([ r[i*4:i*4+4][::-1] for i in range(0, 20) ]))
-                self.riecoin = util.riecoinPoW( util.uint256_from_str(hash_bin), uint256_from_compact(self.nBits), self.nNonce )
-                log.debug("riecoinPoW in  Halfnode is %d" % self.riecoin)
+                r.append(struct.pack("<Q", self.nTime))
+                sha256 = uint256_from_str(SHA256.new(SHA256.new(''.join(r)).digest()).digest())
+                self.riecoin = riecoinPoW( sha256, uint256_from_compact(self.nBits), self.nNonce )
              return self.riecoin
     else:
        def calc_sha256(self):
@@ -336,7 +335,7 @@ class CBlock(object):
     def is_valid(self):
         if settings.COINDAEMON_ALGO == 'riecoin':
             self.calc_riecoin()
-        if settings.COINDAEMON_ALGO == 'scrypt':
+        elif settings.COINDAEMON_ALGO == 'scrypt':
             self.calc_scrypt()
         elif settings.COINDAEMON_ALGO == 'quark':
             self.calc_quark()