From 57cc7950d8c0540cef40eec1bcd7acc8437da38d Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Fri, 14 May 2021 11:26:33 +0000 Subject: [PATCH] Monero: use stagenet for testnet --- mmgen/daemon.py | 10 ++++++---- mmgen/protocol.py | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mmgen/daemon.py b/mmgen/daemon.py index cf4e71cc..2a1ab071 100755 --- a/mmgen/daemon.py +++ b/mmgen/daemon.py @@ -283,7 +283,7 @@ class MoneroWalletDaemon(Daemon): [f'--proxy={self.proxy}', self.proxy], [f'--pidfile={self.pidfile}', self.platform == 'linux'], ['--detach', not 'no_daemonize' in self.opts], - ['--testnet', testnet], + ['--stagenet', testnet], ) self.usr_daemon_args = [] @@ -382,8 +382,8 @@ class CoinDaemon(Daemon): 'monerod', 'monerod', 'bitmonero.conf', - 'testnet', - 18081, 28081, None), + 'stagenet', + 18081, 38081, None), 'eth': cd( 'openethereum', 'Ethereum', @@ -609,6 +609,8 @@ class MoneroDaemon(CoinDaemon): datadir_is_subdir = True def subclass_init(self): + if self.network == 'testnet': + self.net_desc = f'{self.coin} stagenet' self.p2p_port = self.rpc_port - 1 self.zmq_port = self.rpc_port + 1 @@ -620,7 +622,7 @@ class MoneroDaemon(CoinDaemon): [f'--p2p-bind-port={self.p2p_port}'], [f'--rpc-bind-port={self.rpc_port}'], [f'--zmq-rpc-bind-port={self.zmq_port}'], - ['--testnet', self.network == 'testnet'], + ['--stagenet', self.network == 'testnet'], ) self.coind_args = list_gen( diff --git a/mmgen/protocol.py b/mmgen/protocol.py index 429299a1..c71d6c57 100755 --- a/mmgen/protocol.py +++ b/mmgen/protocol.py @@ -500,8 +500,8 @@ class CoinProtocol(MMGenObject): return self.parse_addr_bytes(ret) - class MoneroTestnet(Monero): - addr_ver_bytes = { '35': 'monero', '3f': 'monero_sub' } + class MoneroTestnet(Monero): # use stagenet for testnet + addr_ver_bytes = { '18': 'monero', '24': 'monero_sub' } # testnet is ('35','3f') def init_proto(coin=None,testnet=False,regtest=False,network=None,network_id=None,tokensym=None):