mirror of
https://github.com/Qortal/piratewallet-light-cli.git
synced 2025-01-30 18:42:15 +00:00
Fix bip39 bug before encryption
This commit is contained in:
parent
27fb3f984b
commit
94e70cc3f7
@ -231,6 +231,16 @@ impl Command for EncryptCommand {
|
||||
return self.help();
|
||||
}
|
||||
|
||||
// Refuse to encrypt if the bip39 bug has not been fixed
|
||||
use crate::lightwallet::bugs::BugBip39Derivation;
|
||||
if BugBip39Derivation::has_bug(lightclient) {
|
||||
let mut h = vec![];
|
||||
h.push("It looks like your wallet has the bop39bug. Please run 'fixbip39bug' to fix it");
|
||||
h.push("before encrypting your wallet.");
|
||||
h.push("ERROR: Cannot encrypt while wallet has the bip39bug.");
|
||||
return h.join("\n");
|
||||
}
|
||||
|
||||
let passwd = args[0].to_string();
|
||||
|
||||
match lightclient.wallet.write().unwrap().encrypt(passwd) {
|
||||
|
12
mkrelease.sh
12
mkrelease.sh
@ -25,8 +25,14 @@ set -- "${POSITIONAL[@]}" # restore positional parameters
|
||||
|
||||
if [ -z $APP_VERSION ]; then echo "APP_VERSION is not set"; exit 1; fi
|
||||
|
||||
# Clean everything first
|
||||
cargo clean
|
||||
# First, do the tests
|
||||
cd lib && cargo test --release
|
||||
retVal=$?
|
||||
if [ $retVal -ne 0 ]; then
|
||||
echo "Error"
|
||||
exit $retVal
|
||||
fi
|
||||
cd ..
|
||||
|
||||
# Compile for mac directly
|
||||
cargo build --release
|
||||
@ -40,7 +46,7 @@ cp target/release/zecwallet-cli target/macOS-zecwallet-cli-v$APP_VERSION/
|
||||
docker run --rm -v $(pwd)/:/opt/zecwallet-light-cli rustbuild:latest bash -c "cd /opt/zecwallet-light-cli && cargo build --release && SODIUM_LIB_DIR='/opt/libsodium-win64/lib/' cargo build --release --target x86_64-pc-windows-gnu"
|
||||
|
||||
# Now sign and zip the binaries
|
||||
#macOS
|
||||
# macOS
|
||||
gpg --batch --output target/macOS-zecwallet-cli-v$APP_VERSION/zecwallet-cli.sig --detach-sig target/macOS-zecwallet-cli-v$APP_VERSION/zecwallet-cli
|
||||
cd target
|
||||
cd macOS-zecwallet-cli-v$APP_VERSION
|
||||
|
Loading…
Reference in New Issue
Block a user