diff --git a/.gitignore b/.gitignore index 6e7db3614..4642caf33 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,10 @@ console/bx /release/bx /release/bx.exe *.zpl + +build-libbitcoin-explorer +libbitcoin_explorer_test_runner.sh.log +libbitcoin_explorer_test_runner.sh.trs +test-suite.log +test.log +test/libbitcoin_explorer_test diff --git a/include/bitcoin/explorer/commands/electrum-new.hpp b/include/bitcoin/explorer/commands/electrum-new.hpp index d7b7da227..7268f915f 100644 --- a/include/bitcoin/explorer/commands/electrum-new.hpp +++ b/include/bitcoin/explorer/commands/electrum-new.hpp @@ -58,8 +58,10 @@ namespace commands { /** * Various localizable strings. */ -#define BX_EC_ELECTRUM_NEW_UNSUPPORTED \ - "The electrum-new command requires an ICU build." +#define BX_ELECTRUM_NEW_INVALID_SEED \ + "The seed size is not supported." +#define BX_ELECTRUM_REQUIRES_ICU \ + "The command requires an ICU build." /** * Class to implement the electrum-new command. diff --git a/include/bitcoin/explorer/commands/electrum-to-seed.hpp b/include/bitcoin/explorer/commands/electrum-to-seed.hpp index 9836cc10e..85ffd08f3 100644 --- a/include/bitcoin/explorer/commands/electrum-to-seed.hpp +++ b/include/bitcoin/explorer/commands/electrum-to-seed.hpp @@ -58,7 +58,7 @@ namespace commands { /** * Various localizable strings. */ -#define BX_EC_ELECTRUM_TO_SEED_PASSPHRASE_UNSUPPORTED \ +#define BX_ELECTRUM_TO_SEED_REQUIRES_ICU \ "The passphrase option requires an ICU build." /** diff --git a/include/bitcoin/explorer/commands/mnemonic-decode.hpp b/include/bitcoin/explorer/commands/mnemonic-decode.hpp index 3ff5e2220..8e373001b 100644 --- a/include/bitcoin/explorer/commands/mnemonic-decode.hpp +++ b/include/bitcoin/explorer/commands/mnemonic-decode.hpp @@ -59,7 +59,7 @@ namespace commands { * Various localizable strings. */ #define BX_MNEMONIC_DECODE_OBSOLETE \ - "Electrum style key functions are obsolete. Use mnemonic-to-seed (BIP39) command instead." + "Electrum version 1 functions are obsolete. Use electrum-to-seed or mnemonic-to-seed (BIP39) command instead." /** * Class to implement the mnemonic-decode command. diff --git a/include/bitcoin/explorer/commands/mnemonic-encode.hpp b/include/bitcoin/explorer/commands/mnemonic-encode.hpp index c061cfd0d..806d975eb 100644 --- a/include/bitcoin/explorer/commands/mnemonic-encode.hpp +++ b/include/bitcoin/explorer/commands/mnemonic-encode.hpp @@ -59,7 +59,7 @@ namespace commands { * Various localizable strings. */ #define BX_MNEMONIC_ENCODE_OBSOLETE \ - "Electrum style key functions are obsolete. Use mnemonic-new (BIP39) command instead." + "Electrum version 1 functions are obsolete. Use electrum-new or mnemonic-new (BIP39) command instead." /** * Class to implement the mnemonic-encode command. diff --git a/include/bitcoin/explorer/commands/mnemonic-new.hpp b/include/bitcoin/explorer/commands/mnemonic-new.hpp index 88e517ff8..d4646e8b1 100644 --- a/include/bitcoin/explorer/commands/mnemonic-new.hpp +++ b/include/bitcoin/explorer/commands/mnemonic-new.hpp @@ -58,7 +58,7 @@ namespace commands { /** * Various localizable strings. */ -#define BX_EC_MNEMONIC_NEW_INVALID_ENTROPY \ +#define BX_EC_MNEMONIC_NEW_INVALID_SEED \ "The seed length in bytes is not evenly divisible by 32 bits." /** diff --git a/include/bitcoin/explorer/commands/mnemonic-to-seed.hpp b/include/bitcoin/explorer/commands/mnemonic-to-seed.hpp index 5eb1abdc4..341518405 100644 --- a/include/bitcoin/explorer/commands/mnemonic-to-seed.hpp +++ b/include/bitcoin/explorer/commands/mnemonic-to-seed.hpp @@ -60,7 +60,7 @@ namespace commands { */ #define BX_EC_MNEMONIC_TO_SEED_LENGTH_INVALID_SENTENCE \ "The number of words must be divisible by 3." -#define BX_EC_MNEMONIC_TO_SEED_PASSPHRASE_UNSUPPORTED \ +#define BX_EC_MNEMONIC_TO_SEED_REQUIRES_ICU \ "The passphrase option requires an ICU build." #define BX_EC_MNEMONIC_TO_SEED_INVALID_IN_LANGUAGE \ "The specified words are not a valid mnemonic in the specified dictionary." diff --git a/install.sh b/install.sh index b4b443a60..d1a4d4f6b 100755 --- a/install.sh +++ b/install.sh @@ -279,8 +279,8 @@ fi # Set the prefix-based package config directory. PREFIX_PKG_CONFIG_DIR="$PREFIX/lib/pkgconfig" -# Augment PKG_CONFIG_PATH search path with our prefix. -export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PREFIX_PKG_CONFIG_DIR" +# Prioritize prefix package config in PKG_CONFIG_PATH search path. +export PKG_CONFIG_PATH="$PREFIX_PKG_CONFIG_DIR:$PKG_CONFIG_PATH" # Set a package config save path that can be passed via our builds. with_pkgconfigdir="--with-pkgconfigdir=$PREFIX_PKG_CONFIG_DIR" diff --git a/model/generate.xml b/model/generate.xml index d4685a63b..7ef8f4d28 100644 --- a/model/generate.xml +++ b/model/generate.xml @@ -208,14 +208,15 @@