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

MaxCoin Main Fixes

Browse Source
This commit is contained in:
ahmedbodi 2014-02-27 11:04:37 +00:00
parent 098c99c3a1
commit 759532479f
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/halfnode.py
View File

@ -11,7 +11,6 @@ import sys
import random import random
import cStringIO import cStringIO
from Crypto.Hash import SHA256 from Crypto.Hash import SHA256
from sha3 import sha3_256
from twisted.internet.protocol import Protocol from twisted.internet.protocol import Protocol
from util import * from util import *
@ -30,18 +29,12 @@ elif settings.COINDAEMON_ALGO == 'quark':
elif settings.COINDAEMON_ALGO == 'max': elif settings.COINDAEMON_ALGO == 'max':
log.debug("########################################### Loading Max Support #########################################################") log.debug("########################################### Loading Max Support #########################################################")
import max_hash import max_hash
from sha3 import sha3_256
elif settings.COINDAEMON_ALGO == 'keccak': elif settings.COINDAEMON_ALGO == 'keccak':
import sha3 import sha3
else: else:
log.debug("########################################### Loading SHA256 Support ######################################################") log.debug("########################################### Loading SHA256 Support ######################################################")
#if settings.COINDAEMON_Reward == 'POS':
# log.debug("########################################### Loading POS Support #########################################################")
# pass
#else:
# log.debug("########################################### Loading POW Support ######################################################")
# pass
if settings.COINDAEMON_TX == 'yes': if settings.COINDAEMON_TX == 'yes':
log.debug("########################################### Loading SHA256 Transaction Message Support #########################################################") log.debug("########################################### Loading SHA256 Transaction Message Support #########################################################")
pass pass
@ -162,7 +155,8 @@ class CTxOut(object):
class CTransaction(object): class CTransaction(object):
def __init__(self): def __init__(self):
self.sha3 = None if settings.COINDAEMON_ALGO == 'max':
self.sha3 = None
if settings.COINDAEMON_Reward == 'POW': if settings.COINDAEMON_Reward == 'POW':
self.nVersion = 1 self.nVersion = 1
if settings.COINDAEMON_TX == 'yes': if settings.COINDAEMON_TX == 'yes':
@ -315,7 +309,6 @@ class CBlock(object):
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))
r.append(struct.pack("<I", self.nNonce)) r.append(struct.pack("<I", self.nNonce))
#self.max = uint256_from_str(max_hash.getPoWHash(''.join(r)))
self.max = uint256_from_str(sha3_256(''.join(r)).digest()) self.max = uint256_from_str(sha3_256(''.join(r)).digest())
return self.max return self.max
elif settings.COINDAEMON_ALGO == 'keccak': elif settings.COINDAEMON_ALGO == 'keccak':