mmgen/mmgen-wallet
Watch
1
Fork
You've already forked mmgen-wallet
 0
Code Releases 30 Wiki Activity

MoneroWalletDaemon: new offline param; pass test_user to coin daemon

Browse source
This commit is contained in:
The MMGen Project 2026-11-01 12:51:06 +00:00
commit e555886312
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
mmgen/proto/xmr/daemon.py
View file

@ -96,6 +96,7 @@ class MoneroWalletDaemon(RPCDaemon):
monerod_addr = None,
proxy = None,
datadir = None,
offline = False,
disable_authentication = False,
trust_monerod = False,
test_monerod = False,
@ -120,11 +121,12 @@ class MoneroWalletDaemon(RPCDaemon):
self.logfile = self.proto.network_datadir / (fn_stem + '.log')
self.proxy = proxy
self.monerod_addr = monerod_addr
self.monerod_addr = None if offline else monerod_addr
self.monerod_port = (
None if monerod_addr else
None if offline or monerod_addr else
CoinDaemon(
cfg = self.cfg,
test_user = test_user,
proto = proto).rpc_port)
if test_monerod and self.monerod_port:
@ -144,19 +146,20 @@ class MoneroWalletDaemon(RPCDaemon):
self.daemon_args = list_gen(
['--disable-rpc-login', self.disable_authentication],
['--trusted-daemon', trust_monerod],
['--untrusted-daemon', not trust_monerod],
['--trusted-daemon', not offline and trust_monerod],
['--untrusted-daemon', not offline and not trust_monerod],
[f'--rpc-bind-port={self.rpc_port}'],
[f'--wallet-dir={self.wallet_dir}'],
[f'--log-file={self.logfile}'],
[f'--rpc-login={self.user}:{self.passwd}', not self.disable_authentication],
[f'--daemon-address={self.monerod_addr}', self.monerod_addr],
[f'--daemon-port={self.monerod_port}', not self.monerod_addr],
[f'--proxy={self.proxy}', self.proxy],
[f'--pidfile={self.pidfile}', self.use_pidfile],
['--detach', not (self.opt.no_daemonize or gc.platform=='win32')],
['--stagenet', self.network == 'testnet'],
['--allow-mismatched-daemon-version', self.test_suite])
[f'--daemon-port={self.monerod_port}', self.monerod_port],
[f'--proxy={self.proxy}', self.proxy],
[f'--pidfile={self.pidfile}', self.use_pidfile],
['--stagenet', self.network == 'testnet'],
['--detach', not (self.opt.no_daemonize or gc.platform=='win32')],
['--offline', offline],
['--allow-mismatched-daemon-version', not offline and self.test_suite])
from .rpc import MoneroWalletRPCClient
self.rpc = MoneroWalletRPCClient(

4
mmgen/xmrwallet/ops/wallet.py
View file

@ -66,15 +66,13 @@ class OpWallet(OpBase):
proto = self.proto,
monerod_addr = self.cfg.daemon or None,
disable_authentication = self.disable_authentication,
offline = self.wallet_offline,
trust_monerod = self.trust_monerod,
test_monerod = not self.wallet_offline)
if self.is_create and self.cfg.compat:
self.wd.wallet_dir.mkdir(parents=True, exist_ok=True)
if self.wallet_offline:
self.wd.usr_daemon_args = ['--offline']
self.c = MoneroWalletRPCClient(
cfg = self.cfg,
daemon = self.wd,