RanchiMall/stratum-mining
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

submit block bug fixes

Browse Source
This commit is contained in:
gatra 2014-03-18 01:14:37 -03:00
parent 60e4eb6149
commit 574a9b1e4d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/halfnode.py
View File

@ -270,8 +270,8 @@ class CBlock(object):
r.append(ser_uint256(self.hashMerkleRoot)) r.append(ser_uint256(self.hashMerkleRoot))
if settings.COINDAEMON_ALGO == 'riecoin': if settings.COINDAEMON_ALGO == 'riecoin':
r.append(struct.pack("<I", self.nBits)) r.append(struct.pack("<I", self.nBits))
r.append(struct.pack("<II", self.nTime)) r.append(struct.pack("<Q", self.nTime))
r.append(struct.pack("<IIIIIIII", self.nNonce)) r.append(ser_uint256(self.nNonce))
else: else:
r.append(struct.pack("<I", self.nTime)) r.append(struct.pack("<I", self.nTime))
r.append(struct.pack("<I", self.nBits)) 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.hashPrevBlock))
r.append(ser_uint256(self.hashMerkleRoot)) r.append(ser_uint256(self.hashMerkleRoot))
r.append(struct.pack("<I", self.nBits)) r.append(struct.pack("<I", self.nBits))
r.append(struct.pack("<II", self.nTime)) r.append(struct.pack("<Q", self.nTime))
hash_bin = util.doublesha(''.join([ r[i*4:i*4+4][::-1] for i in range(0, 20) ])) sha256 = uint256_from_str(SHA256.new(SHA256.new(''.join(r)).digest()).digest())
self.riecoin = util.riecoinPoW( util.uint256_from_str(hash_bin), uint256_from_compact(self.nBits), self.nNonce ) self.riecoin = riecoinPoW( sha256, uint256_from_compact(self.nBits), self.nNonce )
log.debug("riecoinPoW in Halfnode is %d" % self.riecoin)
return self.riecoin return self.riecoin
else: else:
def calc_sha256(self): def calc_sha256(self):
@ -336,7 +335,7 @@ class CBlock(object):
def is_valid(self): def is_valid(self):
if settings.COINDAEMON_ALGO == 'riecoin': if settings.COINDAEMON_ALGO == 'riecoin':
self.calc_riecoin() self.calc_riecoin()
if settings.COINDAEMON_ALGO == 'scrypt': elif settings.COINDAEMON_ALGO == 'scrypt':
self.calc_scrypt() self.calc_scrypt()
elif settings.COINDAEMON_ALGO == 'quark': elif settings.COINDAEMON_ALGO == 'quark':
self.calc_quark() self.calc_quark()