From 026992a8123460a209b7236240481c77d0ddc6be Mon Sep 17 00:00:00 2001 From: lza_menace Date: Mon, 17 Aug 2020 23:41:41 -0700 Subject: [PATCH] refactoring for wownero --- monero/address.py | 4 ++-- monero/backends/jsonrpc.py | 4 ++-- monero/const.py | 6 +++--- monero/numbers.py | 2 +- monero/seed.py | 4 ++-- tests/test_jsonrpcdaemon.py | 8 ++++---- utils/daemoninfo.py | 2 +- utils/dumptx.py | 2 +- utils/pushtx.py | 2 +- utils/transfer.py | 2 +- utils/walletdump.py | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/monero/address.py b/monero/address.py index 04a4096..d8321bc 100644 --- a/monero/address.py +++ b/monero/address.py @@ -10,8 +10,8 @@ from . import const from . import ed25519 from . import numbers -_ADDR_REGEX = re.compile(r'^[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{95}$') -_IADDR_REGEX = re.compile(r'^[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{106}$') +_ADDR_REGEX = re.compile(r'^[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{97}$') +_IADDR_REGEX = re.compile(r'^[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{108}$') class BaseAddress(object): label = None diff --git a/monero/backends/jsonrpc.py b/monero/backends/jsonrpc.py index 82ec4fb..9ae549b 100644 --- a/monero/backends/jsonrpc.py +++ b/monero/backends/jsonrpc.py @@ -34,7 +34,7 @@ class JSONRPCDaemon(object): _net = None - def __init__(self, protocol='http', host='127.0.0.1', port=18081, path='/json_rpc', + def __init__(self, protocol='http', host='127.0.0.1', port=34568, path='/json_rpc', user='', password='', timeout=30, verify_ssl_certs=True, proxy_url=None): self.url = '{protocol}://{host}:{port}'.format( protocol=protocol, @@ -209,7 +209,7 @@ class JSONRPCWallet(object): """ _master_address = None - def __init__(self, protocol='http', host='127.0.0.1', port=18088, path='/json_rpc', + def __init__(self, protocol='http', host='127.0.0.1', port=8888, path='/json_rpc', user='', password='', timeout=30, verify_ssl_certs=True, proxy_url=None): self.url = '{protocol}://{host}:{port}/json_rpc'.format( protocol=protocol, diff --git a/monero/const.py b/monero/const.py index 19358e1..4790ef8 100644 --- a/monero/const.py +++ b/monero/const.py @@ -3,9 +3,9 @@ NET_STAGE = "stage" NET_TEST = "test" NETS = (NET_MAIN, NET_TEST, NET_STAGE) -MASTERADDR_NETBYTES = (18, 53, 24) -SUBADDR_NETBYTES = (42, 63, 36) -INTADDRR_NETBYTES = (19, 54, 25) +MASTERADDR_NETBYTES = (4146, 53, 24) +SUBADDR_NETBYTES = (12208, 63, 36) +INTADDRR_NETBYTES = (6810, 54, 25) PRIO_UNIMPORTANT = 1 PRIO_NORMAL = 2 diff --git a/monero/numbers.py b/monero/numbers.py index d52fe69..d2a04e9 100644 --- a/monero/numbers.py +++ b/monero/numbers.py @@ -1,7 +1,7 @@ from decimal import Decimal import six -PICONERO = Decimal('0.000000000001') +PICONERO = Decimal('0.00000000001') EMPTY_KEY = '0' * 64 diff --git a/monero/seed.py b/monero/seed.py index 8509c9a..13be40a 100644 --- a/monero/seed.py +++ b/monero/seed.py @@ -168,12 +168,12 @@ class Seed(object): if net not in const.NETS: raise ValueError( "Invalid net argument '{:s}'. Must be one of monero.const.NET_*".format(net)) - netbyte = (18, 53, 24)[const.NETS.index(net)] + netbyte = const.MASTERADDR_NETBYTES[const.NETS.index(net)] data = "{:x}{:s}{:s}".format(netbyte, self.public_spend_key(), self.public_view_key()) h = keccak_256() h.update(unhexlify(data)) checksum = h.hexdigest() - return address(base58.encode(data + checksum[0:8])) + return address(base58.encode(data + checksum[0:10])) def generate_hex(n_bytes=32): diff --git a/tests/test_jsonrpcdaemon.py b/tests/test_jsonrpcdaemon.py index c42e6d6..df2bdce 100644 --- a/tests/test_jsonrpcdaemon.py +++ b/tests/test_jsonrpcdaemon.py @@ -10,10 +10,10 @@ from monero.transaction import Transaction from .base import JSONTestCase class JSONRPCDaemonTestCase(JSONTestCase): - jsonrpc_url = 'http://127.0.0.1:18081/json_rpc' - mempool_url = 'http://127.0.0.1:18081/get_transaction_pool' - transactions_url = 'http://127.0.0.1:18081/get_transactions' - sendrawtransaction_url = 'http://127.0.0.1:18081/sendrawtransaction' + jsonrpc_url = 'http://127.0.0.1:34568/json_rpc' + mempool_url = 'http://127.0.0.1:34568/get_transaction_pool' + transactions_url = 'http://127.0.0.1:34568/get_transactions' + sendrawtransaction_url = 'http://127.0.0.1:34568/sendrawtransaction' data_subdir = 'test_jsonrpcdaemon' def setUp(self): diff --git a/utils/daemoninfo.py b/utils/daemoninfo.py index 3689515..fac8443 100755 --- a/utils/daemoninfo.py +++ b/utils/daemoninfo.py @@ -15,7 +15,7 @@ def url_data(url): def get_daemon(): argsparser = argparse.ArgumentParser(description="Display daemon info") - argsparser.add_argument('daemon_rpc_url', nargs='?', type=url_data, default='127.0.0.1:18081', + argsparser.add_argument('daemon_rpc_url', nargs='?', type=url_data, default='127.0.0.1:34568', help="Daemon RPC URL [host[:port]]") argsparser.add_argument('-p', dest='proxy_url', nargs='?', type=str, default=None, help="Proxy URL") argsparser.add_argument('-t', dest='timeout', type=int, default=30, help="Request timeout") diff --git a/utils/dumptx.py b/utils/dumptx.py index e3c28fd..266ee2b 100755 --- a/utils/dumptx.py +++ b/utils/dumptx.py @@ -23,7 +23,7 @@ argsparser.add_argument( "-d", dest="daemon_rpc_url", type=url_data, - default="127.0.0.1:18081", + default="127.0.0.1:34568", help="Daemon RPC URL [host[:port]]", ) argsparser.add_argument( diff --git a/utils/pushtx.py b/utils/pushtx.py index 5374d50..471e6c6 100755 --- a/utils/pushtx.py +++ b/utils/pushtx.py @@ -18,7 +18,7 @@ def url_data(url): return dict(filter(operator.itemgetter(1), gs.items())) argsparser = argparse.ArgumentParser(description="Push transaction to network") -argsparser.add_argument('daemon_rpc_url', nargs='?', type=url_data, default='127.0.0.1:18081', +argsparser.add_argument('daemon_rpc_url', nargs='?', type=url_data, default='127.0.0.1:34568', help="Daemon RPC URL [host[:port]]") argsparser.add_argument('-v', dest='verbosity', action='count', default=0, help="Verbosity (repeat to increase; -v for INFO, -vv for DEBUG") diff --git a/utils/transfer.py b/utils/transfer.py index 6487711..06875c5 100755 --- a/utils/transfer.py +++ b/utils/transfer.py @@ -26,7 +26,7 @@ def destpair(s): argsparser = argparse.ArgumentParser(description="Transfer Monero") argsparser.add_argument('-v', dest='verbosity', action='count', default=0, help="Verbosity (repeat to increase; -v for INFO, -vv for DEBUG") -argsparser.add_argument('wallet_rpc_url', nargs='?', type=url_data, default='127.0.0.1:18082', +argsparser.add_argument('wallet_rpc_url', nargs='?', type=url_data, default='127.0.0.1:34562', help="Wallet RPC URL [user[:password]@]host[:port]") argsparser.add_argument('-t', dest='timeout', type=int, default=30, help="Request timeout") argsparser.add_argument('-a', dest='account', default=0, type=int, help="Source account index") diff --git a/utils/walletdump.py b/utils/walletdump.py index 9603367..1ae062a 100755 --- a/utils/walletdump.py +++ b/utils/walletdump.py @@ -16,7 +16,7 @@ def url_data(url): def get_wallet(): argsparser = argparse.ArgumentParser(description="Display wallet contents") - argsparser.add_argument('wallet_rpc_url', nargs='?', type=url_data, default='127.0.0.1:18082', + argsparser.add_argument('wallet_rpc_url', nargs='?', type=url_data, default='127.0.0.1:34562', help="Wallet RPC URL [user[:password]@]host[:port]") argsparser.add_argument('-v', dest='verbosity', action='count', default=0, help="Verbosity (repeat to increase; -v for INFO, -vv for DEBUG")