Don't overwrite existing key in near generate-key

near · Nov 5, 2019 · f9a0b19 · f9a0b19
1 parent 69e520b
commit f9a0b19
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/commands/generate-key.js b/commands/generate-key.js
@@ -9,9 +9,14 @@ module.exports = {
         let near = await require('../utils/connect')(argv);
         if (argv.accountId) {
             const { deps: { keyStore }} = near.config;
-            const keyPair = KeyPair.fromRandom('ed25519');
-            await keyStore.setKey(argv.networkId, argv.accountId, keyPair);
-            console.log(`Generated key pair with ${keyPair.publicKey} public key`);
+            const existingKey = await keyStore.getKey(argv.networkId, argv.accountId);
+            if (existingKey) {
+                console.log(`Account has existing key pair with ${existingKey.publicKey} public key`)
+            } else {
+                const keyPair = KeyPair.fromRandom('ed25519');
+                await keyStore.setKey(argv.networkId, argv.accountId, keyPair);
+                console.log(`Generated key pair with ${keyPair.publicKey} public key`);
+            }
         }
     })
 };
diff --git a/test/test_generate_key.sh b/test/test_generate_key.sh
@@ -2,7 +2,7 @@
 #!/bin/bash
 set -ex
 KEY_FILE=neardev/default/generate-key-test.json
-rm -f KEY_FILE
+rm -f "$KEY_FILE"
 
 RESULT=$(./bin/near generate-key generate-key-test --networkId default)
 echo $RESULT
@@ -16,4 +16,13 @@ EXPECTED=".*Generated key pair with ed25519:.+ public key.*"
 if [[ ! "$RESULT" =~ $EXPECTED ]]; then
     echo FAILURE Unexpected output from near generate-key
     exit 1
+fi
+
+RESULT2=$(./bin/near generate-key generate-key-test --networkId default)
+echo $RESULT2
+
+EXPECTED2=".*Account has existing key pair with ed25519:.+ public key.*"
+if [[ ! "$RESULT2" =~ $EXPECTED2 ]]; then
+    echo FAILURE Unexpected output from near generate-key when key already exists
+    exit 1
 fi