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

Remove unsafe 'assert' and replace it with a proper exception #58

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove unsafe 'assert' and replace it with a proper exception #58

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23ee0eb
Remove unsafe 'assert' and replace it with a proper exception
Steve132 Jun 18, 2018
ded1218
Merge branch 'master' into patch-1
Steve132 Jun 25, 2018
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
34 changes: 20 additions & 14 deletions claimer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
b58ab = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
bech32ab = "qpzry9x8gf2tvdw0s3jn54khce6mua7l"

def safeassert(test,reason):
if(not test):
raise RuntimeError(reason)

def bech32_polymod(values):
GEN = [0x3b6a57b2, 0x26508e6d, 0x1ea119fa, 0x3d4233dd, 0x2a1462b3]
chk = 1
Expand All @@ -27,8 +31,8 @@ def bech32decode(addr):
hrp, data = addr.lower().rsplit("1", 1)
data = [bech32ab.index(c) for c in data]

assert bech32_polymod(bech32_hrp_expand(hrp) + data) == 1, "bech32 checksum failed"
assert data[0] == 0, "only support version 0 witness for now"
safeassert(bech32_polymod(bech32_hrp_expand(hrp) + data) == 1, "bech32 checksum failed")
safeassert(data[0] == 0, "only support version 0 witness for now")
data = data[1:-6]

n = 0
Expand Down Expand Up @@ -72,7 +76,7 @@ def b58decode(s, checksum=True):

if checksum:
res, cs = res[:-4], res[-4:]
assert cs == b58csum(res), "base58 checksum failed"
safeassert(cs == b58csum(res), "base58 checksum failed")

return res

Expand Down Expand Up @@ -225,11 +229,11 @@ def sign(privkey, h):

p = scalar_mul(k, Point(gx, gy), N)
r = p.x % R
assert r != 0
safeassert(r != 0,"the x-coordinate of the elliptic curve point cannot be zero in a signature")

ki = modinv(k, R)
s = (ki * (z + r * privkey)) % R
assert s != 0
safeassert(s != 0,"The scalar during signature cannot be zero")
if s > (R / 2):
s = R - s

Expand Down Expand Up @@ -286,7 +290,7 @@ def wif2privkey(s):
def identify_keytype(wifkey, addr):
if addr.startswith("bc1"):
addrh160 = bech32decode(addr)
assert len(addrh160) == 20
safeassert(len(addrh160) == 20,"Unsupported address length detected for bech32 address")

privkeytype, privkey, compressed = wif2privkey(args.wifkey)
pubkey = scalar_mul(privkey, Point(gx, gy), N)
Expand All @@ -296,7 +300,7 @@ def identify_keytype(wifkey, addr):
raise Exception("Unable to identify key type!")
else:
addrh160 = b58decode(addr)[-20:]
assert len(addrh160) == 20
safeassert(len(addrh160) == 20,"Unsupported address length detected for bech32 address")

privkeytype, privkey, compressed = wif2privkey(args.wifkey)
pubkey = scalar_mul(privkey, Point(gx, gy), N)
Expand Down Expand Up @@ -1209,8 +1213,8 @@ def __init__(self):
self.signid = self.signtype
self.bch_fork = True

# https://github.com/bitcoinfile/bitcoinfile/tree/master/bificore
class BitcoinFile(BitcoinFork):
# https://github.com/bitcoinfile/bitcoinfile/tree/master/bificore
class BitcoinFile(BitcoinFork):
def __init__(self):
BitcoinFork.__init__(self)
self.ticker = "BIFI"
Expand All @@ -1227,8 +1231,11 @@ def __init__(self):
self.txversion = 20
self.BCDgarbage = struct.pack("<I", self.txversion)
self.coinratio = 1000.0


assert gen_k_rfc6979(0xc9afa9d845ba75166b5c215767b1d6934e50c3db36e89b127b8a622b120f6721, "sample") == 0xa6e3c57dd01abe90086538398355dd4c3b17aa873382b0f24d6129493d8aad60

safeassert(gen_k_rfc6979(0xc9afa9d845ba75166b5c215767b1d6934e50c3db36e89b127b8a622b120f6721, "sample") == 0xa6e3c57dd01abe90086538398355dd4c3b17aa873382b0f24d6129493d8aad60,"The deterministic signature algorithm is not implemented correctly")


parser = argparse.ArgumentParser()
parser.add_argument("cointicker", help="Coin type", choices=["BTF", "BTW", "BTG", "BCX", "B2X", "UBTC", "SBTC", "BCD", "BPA", "BTN", "BTH", "BTV", "BTT", "BTX", "BTP", "BCK", "CDY", "BTSQ", "WBTC", "BCH", "BTCP", "BCA", "LBTC", "BICC", "BCI", "BCP", "BCBC", "BTCH", "GOD", "BBC", "NBTC", "BCL", "BTCC", "BIFI"])
Expand Down Expand Up @@ -1386,13 +1393,13 @@ def __init__(self):

if destaddr.startswith("bc1"):
rawaddr = bech32decode(destaddr)
assert len(rawaddr) == 20
safeassert(len(rawaddr) == 20,"The segwit address length was not 160 bits")
print "YOU ARE TRYING TO SEND TO A bech32 ADDRESS! THIS IS NOT NORMAL! Are you sure you know what you're doing?"
get_consent("I am aware that the destination address is bech32")
outscript = "\x00\x14" + rawaddr
else:
rawaddr = b58decode(destaddr)
assert len(rawaddr) in (21, coin.address_size)
safeassert(len(rawaddr) in (21, coin.address_size),"The base58 address had an improper length")
if rawaddr[0] == "\x00" or rawaddr.startswith(coin.PUBKEY_ADDRESS):
outscript = "\x76\xa9\x14" + rawaddr[-20:] + "\x88\xac"
elif rawaddr[0] == "\x05" or rawaddr.startswith(coin.SCRIPT_ADDRESS):
Expand Down Expand Up @@ -1494,7 +1501,7 @@ def __init__(self):
res = readline(sc)
j = json.loads(res)
try:
assert j["result"] == txhash[::-1].encode("hex")
safeassert(j["result"] == txhash[::-1].encode("hex"),"The server provided an inconsistent transaction id")
print "Success - server accepted transaction and responded with TXID %s" % j["result"]
except:
print "ERROR when submitting transaction!"
Expand All @@ -1503,4 +1510,3 @@ def __init__(self):
else:
client = Client(coin)
client.send_tx(txhash, tx, args.fee)