From 00ee28aea79476fe2ac14655afa931c60f1e331b Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Mon, 19 May 2025 09:23:50 +0000 Subject: [PATCH] minor cleanups --- eth-requirements.txt | 1 - mmgen/main_txcreate.py | 2 +- mmgen/main_txdo.py | 2 +- nix/user-packages.nix | 1 - setup.cfg | 1 - test/cmdtest_d/ethdev.py | 1 + 6 files changed, 3 insertions(+), 5 deletions(-) diff --git a/eth-requirements.txt b/eth-requirements.txt index ecbbdfe8..d73f640f 100644 --- a/eth-requirements.txt +++ b/eth-requirements.txt @@ -2,4 +2,3 @@ # installed. py_ecc -mypy_extensions diff --git a/mmgen/main_txcreate.py b/mmgen/main_txcreate.py index 02a459e6..c6338651 100755 --- a/mmgen/main_txcreate.py +++ b/mmgen/main_txcreate.py @@ -80,7 +80,7 @@ opts_data = { -s -S, --list-assets List available swap assets -- -v, --verbose Produce more verbose output b- -V, --vsize-adj= f Adjust transaction's estimated vsize by factor 'f' - -s -x, --proxy=P Fetch the swap quote via SOCKS5 proxy ‘P’ (host:port). + -s -x, --proxy=P Fetch the swap quote via SOCKS5h proxy ‘P’ (host:port). + Use special value ‘env’ to honor *_PROXY environment + vars instead. -- -y, --yes Answer 'yes' to prompts, suppress non-essential output diff --git a/mmgen/main_txdo.py b/mmgen/main_txdo.py index 4524855d..6b9d63d6 100755 --- a/mmgen/main_txdo.py +++ b/mmgen/main_txdo.py @@ -106,7 +106,7 @@ opts_data = { -- -v, --verbose Produce more verbose output b- -V, --vsize-adj= f Adjust transaction's estimated vsize by factor 'f' e- -w, --wait Wait for transaction confirmation - -s -x, --proxy=P Fetch the swap quote via SOCKS5 proxy ‘P’ (host:port). + -s -x, --proxy=P Fetch the swap quote via SOCKS5h proxy ‘P’ (host:port). + Use special value ‘env’ to honor *_PROXY environment + vars instead. e- -X, --cached-balances Use cached balances diff --git a/nix/user-packages.nix b/nix/user-packages.nix index 8bf0faa4..04a92f81 100644 --- a/nix/user-packages.nix +++ b/nix/user-packages.nix @@ -41,7 +41,6 @@ rec { python-packages = with python.pkgs; { # pycryptodome = pycryptodome; # altcoins # py-ecc = py-ecc; # ETH, ETC - # mypy-extensions = mypy-extensions; # ETH, ETC # pysocks = pysocks; # XMR # monero = monero; # XMR (test suite) # eth-keys = eth-keys; # ETH, ETC (test suite) diff --git a/setup.cfg b/setup.cfg index 2e79fc2e..6c46dc35 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,7 +31,6 @@ project_urls = Twitter = https://x.com/TheMMGenProject Keybase = https://keybase.io/mmgen classifiers = - License :: OSI Approved :: GNU General Public License v3 (GPLv3) Operating System :: POSIX :: Linux Operating System :: Microsoft :: Windows Operating System :: MacOS diff --git a/test/cmdtest_d/ethdev.py b/test/cmdtest_d/ethdev.py index e726d107..7ed0fe6d 100755 --- a/test/cmdtest_d/ethdev.py +++ b/test/cmdtest_d/ethdev.py @@ -197,6 +197,7 @@ class CmdTestEthdevMethods: return self._fund_mmgen_addr(arg=f'{dfl_sid}:E:21,{self.fund_amt}') def _fund_mmgen_addr(self, arg): + self.mining_delay() return self._txdo( args = [f'--keys-from-file={joinpath(self.tmpdir, dfl_devkey_fn)}', arg, dfl_words_file], acct = '10')