d0s3t3ch/wownero-python
1
0
Fork 0
mirror of https://git.wownero.com/lza_menace/wownero-python.git synced 2024-08-15 03:25:25 +00:00
Code Issues Projects Releases Wiki Activity

Add SubAddress class

Browse source
This commit is contained in:
Michał Sałaban 2017-11-30 03:43:34 +01:00
parent 40fd464a12
commit 45516ec33f
3 changed files with 68 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
monero/address.py
View file

@ -4,6 +4,9 @@ from sha3 import keccak_256
from . import base58
class Address(object):
_valid_netbytes = (18, 53)
# NOTE: _valid_netbytes order is (real, testnet)
def __init__(self, address):
address = str(address)
if len(address) != 95:
@ -15,9 +18,13 @@ class Address(object):
checksum = self._decoded[-4:]
if checksum != keccak_256(self._decoded[:-4]).digest()[:4]:
raise ValueError("Invalid checksum")
if self._decoded[0] not in self._valid_netbytes:
raise ValueError("Invalid address netbyte {nb}. Allowed values are: {allowed}".format(
nb=hexlify(bytes(self._decoded[0])),
allowed=", ".join(map(lambda b: '%02x' % b, self._valid_netbytes))))
def is_testnet(self):
return self._decoded[0] in bytes([53, 54])
return self._decoded[0] == self._valid_netbytes[1]
def get_view_key(self):
return hexlify(self._decoded[33:65]).decode()
@ -46,7 +53,16 @@ class Address(object):
return super()
class SubAddress(Address):
_valid_netbytes = (42, 63)
def with_payment_id(self):
raise TypeError("SubAddress cannot be merged with payment ID into IntegratedAddress")
class IntegratedAddress(Address):
_valid_netbytes = (19, 54)
def __init__(self, address):
address = str(address)
if len(address) != 106:
@ -66,7 +82,16 @@ class IntegratedAddress(Address):
def address(addr):
addr = str(addr)
if len(addr) == 95:
return Address(addr)
netbyte = unhexlify(base58.decode(addr))[0]
if netbyte in Address._valid_netbytes:
return Address(addr)
elif netbyte in SubAddress._valid_netbytes:
return SubAddress(addr)
raise ValueError("Invalid address netbyte {nb}. Allowed values are: {allowed}".format(
nb=hexlify(self._decoded[0]),
allowed=", ".join(map(
lambda b: '%02x' % b,
sorted(Address._valid_netbytes + SubAddress._valid_netbytes)))))
elif len(addr) == 106:
return IntegratedAddress(addr)
raise ValueError("Address must be either 95 or 106 characters long")

4
monero/backends/jsonrpc.py
View file

@ -7,7 +7,7 @@ import requests
from .. import exceptions
from ..account import Account
from ..address import Address
from ..address import address
from ..numbers import from_atomic, to_atomic
_log = logging.getLogger(__name__)
@ -79,7 +79,7 @@ class JSONRPC(object):
data = {
'account_index': account,
'destinations': list(map(
lambda dst: {'address': str(Address(dst[0])), 'amount': to_atomic(dst[1])},
lambda dst: {'address': str(address(dst[0])), 'amount': to_atomic(dst[1])},
destinations)),
'mixin': mixin,
'priority': priority,