Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to py3 #13

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update to py3 #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions nightminer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
# Scrypt Algorithm - http://www.tarsnap.com/scrypt/scrypt.pdf
# Scrypt Implementation - https://code.google.com/p/scrypt/source/browse/trunk/lib/crypto/crypto_scrypt-ref.c

import base64, binascii, json, hashlib, hmac, math, socket, struct, sys, threading, time, urlparse
import base64, binascii, json, hashlib, hmac, math, socket, struct, sys, threading, time, urllib.parse

# DayMiner (ah-ah-ah), fighter of the...
USER_AGENT = "NightMiner"
Expand Down Expand Up @@ -152,14 +152,14 @@ def scrypt(password, salt, N, r, p, dkLen):
def array_overwrite(source, source_start, dest, dest_start, length):
'''Overwrites the dest array with the source array.'''

for i in xrange(0, length):
for i in range(0, length):
dest[dest_start + i] = source[source_start + i]


def blockxor(source, source_start, dest, dest_start, length):
'''Performs xor on arrays source and dest, storing the result back in dest.'''

for i in xrange(0, length):
for i in range(0, length):
dest[dest_start + i] = chr(ord(dest[dest_start + i]) ^ ord(source[source_start + i]))


Expand All @@ -177,7 +177,7 @@ def f(block_number):
# Not used for scrpyt-based coins, could be removed, but part of a more general solution
if count > 1:
U = [ c for c in U ]
for i in xrange(2, 1 + count):
for i in range(2, 1 + count):
blockxor(prf(passphrase, ''.join(U)), 0, U, 0, len(U))
U = ''.join(U)

Expand Down Expand Up @@ -225,11 +225,11 @@ def salsa20_8(B):
'''Salsa 20/8 stream cypher; Used by BlockMix. See http://en.wikipedia.org/wiki/Salsa20'''

# Convert the character array into an int32 array
B32 = [ make_int32((ord(B[i * 4]) | (ord(B[i * 4 + 1]) << 8) | (ord(B[i * 4 + 2]) << 16) | (ord(B[i * 4 + 3]) << 24))) for i in xrange(0, 16) ]
B32 = [ make_int32((ord(B[i * 4]) | (ord(B[i * 4 + 1]) << 8) | (ord(B[i * 4 + 2]) << 16) | (ord(B[i * 4 + 3]) << 24))) for i in range(0, 16) ]
x = [ i for i in B32 ]

# Salsa... Time to dance.
for i in xrange(8, 0, -2):
for i in range(8, 0, -2):
R(x, 4, 0, 12, 7); R(x, 8, 4, 0, 9); R(x, 12, 8, 4, 13); R(x, 0, 12, 8, 18)
R(x, 9, 5, 1, 7); R(x, 13, 9, 5, 9); R(x, 1, 13, 9, 13); R(x, 5, 1, 13, 18)
R(x, 14, 10, 6, 7); R(x, 2, 14, 10, 9); R(x, 6, 2, 14, 13); R(x, 10, 6, 2, 18)
Expand All @@ -240,10 +240,10 @@ def salsa20_8(B):
R(x, 12, 15, 14, 7); R(x, 13, 12, 15, 9); R(x, 14, 13, 12, 13); R(x, 15, 14, 13, 18)

# Coerce into nice happy 32-bit integers
B32 = [ make_int32(x[i] + B32[i]) for i in xrange(0, 16) ]
B32 = [ make_int32(x[i] + B32[i]) for i in range(0, 16) ]

# Convert back to bytes
for i in xrange(0, 16):
for i in range(0, 16):
B[i * 4 + 0] = chr((B32[i] >> 0) & 0xff)
B[i * 4 + 1] = chr((B32[i] >> 8) & 0xff)
B[i * 4 + 2] = chr((B32[i] >> 16) & 0xff)
Expand All @@ -254,17 +254,17 @@ def blockmix_salsa8(BY, Bi, Yi, r):
'''Blockmix; Used by SMix.'''

start = Bi + (2 * r - 1) * 64
X = [ BY[i] for i in xrange(start, start + 64) ] # BlockMix - 1
X = [ BY[i] for i in range(start, start + 64) ] # BlockMix - 1

for i in xrange(0, 2 * r): # BlockMix - 2
for i in range(0, 2 * r): # BlockMix - 2
blockxor(BY, i * 64, X, 0, 64) # BlockMix - 3(inner)
salsa20_8(X) # BlockMix - 3(outer)
array_overwrite(X, 0, BY, Yi + (i * 64), 64) # BlockMix - 4

for i in xrange(0, r): # BlockMix - 6 (and below)
for i in range(0, r): # BlockMix - 6 (and below)
array_overwrite(BY, Yi + (i * 2) * 64, BY, Bi + (i * 64), 64)

for i in xrange(0, r):
for i in range(0, r):
array_overwrite(BY, Yi + (i * 2 + 1) * 64, BY, Bi + (i + r) * 64, 64)


Expand All @@ -273,11 +273,11 @@ def smix(B, Bi, r, N, V, X):

array_overwrite(B, Bi, X, 0, 128 * r) # ROMix - 1

for i in xrange(0, N): # ROMix - 2
for i in range(0, N): # ROMix - 2
array_overwrite(X, 0, V, i * (128 * r), 128 * r) # ROMix - 3
blockmix_salsa8(X, 0, 128 * r, r) # ROMix - 4

for i in xrange(0, N): # ROMix - 6
for i in range(0, N): # ROMix - 6
j = integerify(X, 0, r) & (N - 1) # ROMix - 7
blockxor(V, j * (128 * r), X, 0, 128 * r) # ROMix - 8(inner)
blockmix_salsa8(X, 0, 128 * r, r) # ROMix - 9(outer)
Expand All @@ -296,7 +296,7 @@ def smix(B, Bi, r, N, V, X):
XY = [ chr(0) ] * (256 * r)
V = [ chr(0) ] * (128 * r * N)

for i in xrange(0, p):
for i in range(0, p):
smix(B, i * 128 * r, r, N, V, XY)

return pbkdf2(password, ''.join(B), 1, dkLen, prf)
Expand Down Expand Up @@ -324,10 +324,10 @@ def set_scrypt_library(library = SCRYPT_LIBRARY_AUTO):
elif library == SCRYPT_LIBRARY_AUTO:
try:
set_scrypt_library(SCRYPT_LIBRARY_LTC)
except Exception, e:
except Exception as e:
try:
set_scrypt_library(SCRYPT_LIBRARY_SCRYPT)
except Exception, e:
except Exception as e:
set_scrypt_library(SCRYPT_LIBRARY_PYTHON)

else:
Expand Down Expand Up @@ -430,14 +430,14 @@ def mine(self, nounce_start = 0, nounce_stride = 1):
t0 = time.time()

# @TODO: test for extranounce != 0... Do I reverse it or not?
for extranounce2 in xrange(0, 0x7fffffff):
for extranounce2 in range(0, 0x7fffffff):

# Must be unique for any given job id, according to http://mining.bitcoin.cz/stratum-mining/ but never seems enforced?
extranounce2_bin = struct.pack('<I', extranounce2)

merkle_root_bin = self.merkle_root_bin(extranounce2_bin)
header_prefix_bin = swap_endian_word(self._version) + swap_endian_words(self._prevhash) + merkle_root_bin + swap_endian_word(self._ntime) + swap_endian_word(self._nbits)
for nounce in xrange(nounce_start, 0x7fffffff, nounce_stride):
for nounce in range(nounce_start, 0x7fffffff, nounce_stride):
# This job has been asked to stop
if self._done:
self._dt += (time.time() - t0)
Expand Down Expand Up @@ -623,15 +623,15 @@ def _handle_incoming_rpc(self):
(line, data) = data.split('\n', 1)
else:
chunk = self._socket.recv(1024)
data += chunk
data += chunk.decode()
continue

log('JSON-RPC Server > ' + line, LEVEL_PROTOCOL)

# Parse the JSON
try:
reply = json.loads(line)
except Exception, e:
except Exception as e:
log("JSON-RPC Error: Failed to parse JSON %r (skipping)" % line, LEVEL_ERROR)
continue

Expand All @@ -641,7 +641,7 @@ def _handle_incoming_rpc(self):
if 'id' in reply and reply['id'] in self._requests:
request = self._requests[reply['id']]
self.handle_reply(request = request, reply = reply)
except self.RequestReplyWarning, e:
except self.RequestReplyWarningas as e:
output = e.message
if e.request:
output += '\n ' + e.request
Expand All @@ -665,7 +665,7 @@ def send(self, method, params):
with self._lock:
self._requests[self._message_id] = request
self._message_id += 1
self._socket.send(message + '\n')
self._socket.send((message + '\n').encode())

log('JSON-RPC Server < ' + message, LEVEL_PROTOCOL)

Expand Down Expand Up @@ -807,7 +807,7 @@ def run(job):
self.send(method = 'mining.submit', params = params)
log("Found share: " + str(params), LEVEL_INFO)
log("Hashrate: %s" % human_readable_hashrate(job.hashrate), LEVEL_INFO)
except Exception, e:
except Exception as e:
log("ERROR: %s" % e, LEVEL_ERROR)

thread = threading.Thread(target = run, args = (self._job, ))
Expand All @@ -819,7 +819,7 @@ def serve_forever(self):
'''Begins the miner. This method does not return.'''

# Figure out the hostname and port
url = urlparse.urlparse(self.url)
url = urllib.parse.urlparse(self.url)
hostname = url.hostname or ''
port = url.port or 9333

Expand Down Expand Up @@ -918,14 +918,14 @@ def test_subscription():
else:
try:
(username, password) = options.userpass.split(':')
except Exception, e:
except Exception as e:
message = 'Could not parse username:password for -O/--userpass'

# Was there an issue? Show the help screen and exit.
if message:
parser.print_help()
print
print message
print(message)
sys.exit(1)

# Set the logging level
Expand Down