Merge pull request #8 from random-zebra/2019_miller_tests

[Tests] fix solve_stake nTime / nStakeModifier

test/functional/test_framework/messages.py

@@ -95,6 +95,14 @@ def ser_uint256(u):
     return rs
 
 
+def ser_uint64(u):
+    rs = b""
+    for i in range(2):
+        rs += struct.pack("<I", u & 0xFFFFFFFF)
+        u >>= 32
+    return rs
+
+
 def uint256_from_str(s):
     r = 0
     t = struct.unpack("<IIIIIIII", s[:32])
@@ -468,7 +476,7 @@ def solve_stake(self, stakeModifier, prevouts):
                 nvalue, txBlockTime = prevouts[prevout]
                 target = int(target0 * nvalue / 100) % 2**256
                 data = b""
-                data += ser_uint256(stakeModifier)
+                data += ser_uint64(stakeModifier)
                 data += struct.pack("<I", txBlockTime)
                 # prevout for zPoS is serial hashes hex strings
                 if isinstance(prevout, str):
@@ -481,7 +489,8 @@ def solve_stake(self, stakeModifier, prevouts):
                     self.prevoutStake = prevout
                     loop = False
                     break
-            self.nTime += 1
+            if loop:
+                self.nTime += 1
         return True
 
     def __repr__(self):