From 39e63bd75fb72c4726d2ebc98e0e23fd140c1bf6 Mon Sep 17 00:00:00 2001 From: MMGen Date: Thu, 14 Feb 2019 14:33:58 +0000 Subject: [PATCH] Minor changes --- doc/wiki/using-mmgen/Altcoin-and-Forkcoin-Support.md | 4 ++-- mmgen/tx.py | 2 +- test/gentest.py | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/wiki/using-mmgen/Altcoin-and-Forkcoin-Support.md b/doc/wiki/using-mmgen/Altcoin-and-Forkcoin-Support.md index c50399b3..14791254 100644 --- a/doc/wiki/using-mmgen/Altcoin-and-Forkcoin-Support.md +++ b/doc/wiki/using-mmgen/Altcoin-and-Forkcoin-Support.md @@ -51,7 +51,7 @@ dependencies: *Note: Ubuntu Xenial users will have to upgrade the Python interpreter and Python dependencies listed in the [Install wiki][iw] from version 3.5 to 3.6 before proceeding. This can be done by adding the Bionic repository to -'sources.list' and installing the relevant packages with '-t bionic'* +'sources.list' and reinstalling the relevant packages with '-t bionic'* $ sudo -H pip3 install wheel future pysha3 PyYAML py_ecc rlp @@ -148,7 +148,7 @@ Clone the repository and build: $ git clone --recursive https://github.com/ethereum/solidity.git $ cd solidity - $ git checkout v0.5.1 # v0.5.3 doesn't build on Raspbian Stretch + $ git checkout v0.5.1 # or v0.5.3, if not Raspbian Stretch $ ./scripts/install_deps.sh # Raspbian Stretch: add `DISTRO='Debian'` after line 55 $ mkdir build $ cd build diff --git a/mmgen/tx.py b/mmgen/tx.py index 65d9007d..c74a5840 100755 --- a/mmgen/tx.py +++ b/mmgen/tx.py @@ -86,7 +86,7 @@ def segwit_is_active(exit_on_error=False): d = g.rpch.getblockchaininfo() if d['chain'] == 'regtest': return True - if ( 'bip9_softforks' in d + if ( 'bip9_softforks' in d and 'segwit' in d['bip9_softforks'] and d['bip9_softforks']['segwit']['status'] == 'active'): return True diff --git a/test/gentest.py b/test/gentest.py index e6c6b5c9..6c757d13 100755 --- a/test/gentest.py +++ b/test/gentest.py @@ -161,7 +161,8 @@ def match_error(sec,wif,a_addr,b_addr,a,b): def compare_test(): for k in ('segwit','compressed'): if addr_type.name == k and g.coin not in ci.external_tests_segwit_compressed[k]: - msg('{} testing not supported for coin {}'.format(addr_type.name.capitalize(),g.coin)) + m = 'skipping - external program does not support {} for coin {}' + msg(m.format(addr_type.name.capitalize(),g.coin)) return if 'ext_lib' in globals(): if g.coin not in ci.external_tests[('mainnet','testnet')[g.testnet]][ext_lib]: