Add warning to save seed before encryption

skycoin · Apr 22, 2018 · 89b0f67 · 89b0f67
1 parent da70625
commit 89b0f67
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 6 deletions.
diff --git a/ci-scripts/integration-test-live.sh b/ci-scripts/integration-test-live.sh
@@ -14,7 +14,7 @@ RPC_ADDR="127.0.0.1:$RPC_PORT"
 MODE="live"
 TEST=""
 UPDATE=""
-TIMEOUT="5m"
+TIMEOUT="10m"
 # run go test with -v flag
 VERBOSE=""
 # run go test with -run flag
@@ -63,13 +63,13 @@ fi
 if [[ -z $TEST || $TEST = "gui" ]]; then
 
 SKYCOIN_INTEGRATION_TESTS=1 SKYCOIN_INTEGRATION_TEST_MODE=$MODE SKYCOIN_NODE_HOST=$HOST \
-    go test ./src/gui/integration/... $FAILFAST $UPDATE -timeout=3m $VERBOSE $RUN_TESTS $TEST_LIVE_WALLET
+    go test ./src/gui/integration/... $FAILFAST $UPDATE -timeout=$TIMEOUT $VERBOSE $RUN_TESTS $TEST_LIVE_WALLET
 
 fi
 
 if [[ -z $TEST || $TEST = "cli" ]]; then
 
 SKYCOIN_INTEGRATION_TESTS=1 SKYCOIN_INTEGRATION_TEST_MODE=$MODE RPC_ADDR=$RPC_ADDR SKYCOIN_NODE_HOST=$HOST \
-    go test ./src/api/cli/integration/... $FAILFAST $UPDATE -timeout=3m $VERBOSE $RUN_TESTS $TEST_LIVE_WALLET
+    go test ./src/api/cli/integration/... $FAILFAST $UPDATE -timeout=$TIMEOUT $VERBOSE $RUN_TESTS $TEST_LIVE_WALLET
 
 fi
diff --git a/run-live-integration-test-node.sh b/run-live-integration-test-node.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Runs the node with configuration necessary for running the live integration tests
+
+set -x
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+echo "skycoin binary dir:" "$DIR"
+pushd "$DIR" >/dev/null
+
+COMMIT=$(git rev-parse HEAD)
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
+GOLDFLAGS="-X main.Commit=${COMMIT} -X main.Branch=${BRANCH}"
+
+go run -ldflags "${GOLDFLAGS}" cmd/skycoin/skycoin.go \
+    -gui-dir="${DIR}/src/gui/static/" \
+    -launch-browser=true \
+    -enable-wallet-api=true \
+    -enable-seed-api=true \
+    $@
+
+popd >/dev/null
diff --git a/src/gui/integration/integration_test.go b/src/gui/integration/integration_test.go
@@ -1843,12 +1843,18 @@ func TestLivePendingTransactions(t *testing.T) {
 }
 
 func TestLiveWalletSpend(t *testing.T) {
+	fmt.Println("TestLiveWalletSpend")
+
 	if !doLive(t) {
 		return
 	}
 
+	fmt.Println("TestLiveWalletSpend live enabled")
+
 	requireWalletEnv(t)
 
+	fmt.Println("TestLiveWalletSpend required wallet env found")
+
 	c := gui.NewClient(nodeAddress())
 	w, totalCoins, _, password := prepareAndCheckWallet(t, c, 2e6, 2)
 
@@ -3077,6 +3083,10 @@ func prepareAndCheckWallet(t *testing.T, c *gui.Client, miniCoins, miniCoinHours
 		t.Fatalf("Load wallet %v failed: %v", walletPath, err)
 	}
 
+	if w.IsEncrypted() && password == "" {
+		t.Fatalf("Wallet is encrypted, must set WALLET_PASSWORD env var")
+	}
+
 	// Generate more addresses if address entries less than 2.
 	if len(w.Entries) < 2 {
 		_, err := c.NewWalletAddress(w.Filename(), 2-len(w.Entries), password)

diff --git a/src/gui/static/dist/index.html b/src/gui/static/dist/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><title>Skycoin</title><base href="/"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/x-icon" href="favicon.ico"><link href="styles.a44d4407dcffa726eab9.bundle.css" rel="stylesheet"/></head><body><app-root></app-root><script type="text/javascript" src="inline.318b50c57b4eba3d437b.bundle.js"></script><script type="text/javascript" src="polyfills.3a729e0e3b6954c3800a.bundle.js"></script><script type="text/javascript" src="scripts.8c1255aec48c8ec38c00.bundle.js"></script><script type="text/javascript" src="main.27e77aa8417043bbd56c.bundle.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><title>Skycoin</title><base href="/"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/x-icon" href="favicon.ico"><link href="styles.a44d4407dcffa726eab9.bundle.css" rel="stylesheet"/></head><body><app-root></app-root><script type="text/javascript" src="inline.318b50c57b4eba3d437b.bundle.js"></script><script type="text/javascript" src="polyfills.3a729e0e3b6954c3800a.bundle.js"></script><script type="text/javascript" src="scripts.8c1255aec48c8ec38c00.bundle.js"></script><script type="text/javascript" src="main.94b3c1f81a98efa4f2c1.bundle.js"></script></body></html>
diff --git a/.../dist/main.27e77aa8417043bbd56c.bundle.js → .../dist/main.94b3c1f81a98efa4f2c1.bundle.js b/.../dist/main.27e77aa8417043bbd56c.bundle.js → .../dist/main.94b3c1f81a98efa4f2c1.bundle.js
diff --git a/src/gui/static/src/app/components/pages/wallets/create-wallet/create-wallet.component.html b/src/gui/static/src/app/components/pages/wallets/create-wallet/create-wallet.component.html
@@ -26,6 +26,7 @@
         <p class="-info">
           We suggest that you encrypt each one of your wallets with a password.
           If you forget your password, you can reset it with your seed.
+          Make sure you have your seed saved somewhere safe before encrypting your wallet.
         </p>
       </div>
       <div class="col-md-6" [ngClass]="{ '-hidden': !encrypt }">

diff --git a/src/gui/static/src/app/components/pages/wallets/wallet-detail/wallet-detail.component.ts b/src/gui/static/src/app/components/pages/wallets/wallet-detail/wallet-detail.component.ts
@@ -50,7 +50,8 @@ export class WalletDetailComponent {
 
     if (!this.wallet.encrypted) {
       config.data['description'] = 'We suggest that you encrypt each one of your wallets with a password. ' +
-        'If you forget your password, you can reset it with your seed.';
+        'If you forget your password, you can reset it with your seed. ' +
+        'Make sure you have your seed saved somewhere safe before encrypting your wallet.';
     }
 
     this.dialog.open(PasswordDialogComponent, config).componentInstance.passwordSubmit