asking with more commands

near · Oct 21, 2020 · 9c0d408 · 9c0d408
1 parent fe5a618
commit 9c0d408
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 29 deletions.
diff --git a/commands/add-key.js b/commands/add-key.js
@@ -2,6 +2,8 @@ const exitOnError = require('../utils/exit-on-error');
 const connect = require('../utils/connect');
 const inspectResponse = require('../utils/inspect-response');
 const { utils } = require('near-api-js');
+const eventtracking = require('../utils/eventtracking');
+
 
 module.exports = {
     command: 'add-key <account-id> <access-key>',
@@ -31,6 +33,7 @@ module.exports = {
 };
 
 async function addAccessKey(options) {
+    await eventtracking.askForId(options);
     console.log(`Adding ${options.contractId ? 'function call access' : 'full access'} key = ${options.accessKey} to ${options.accountId}.`);
     const near = await connect(options);
     const account = await near.account(options.accountId);

diff --git a/commands/delete-key.js b/commands/delete-key.js
@@ -1,6 +1,7 @@
 const exitOnError = require('../utils/exit-on-error');
 const connect = require('../utils/connect');
 const inspectResponse = require('../utils/inspect-response');
+const eventtracking = require('../utils/eventtracking');
 
 module.exports = {
     command: 'delete-key <account-id> <access-key>',
@@ -15,6 +16,7 @@ module.exports = {
 };
 
 async function deleteAccessKey(options) {
+    await eventtracking.askForId(options);
     console.log(`Deleting key = ${options.accessKey} on ${options.accountId}.`);
     const near = await connect(options);
     const account = await near.account(options.accountId);

diff --git a/commands/generate-key.js b/commands/generate-key.js
@@ -1,42 +1,48 @@
 const KeyPair = require('near-api-js').KeyPair;
 const exitOnError = require('../utils/exit-on-error');
 const implicitAccountId = require('../utils/implicit-accountid');
+const connect = require('../utils/connect');
+const eventtracking = require('../utils/eventtracking');
 
 module.exports = {
     command: 'generate-key [account-id]',
     desc: 'generate key or show key from Ledger',
     builder: (yargs) => yargs,
-    handler: exitOnError(async (argv) => {
-        let near = await require('../utils/connect')(argv);
+    handler: exitOnError(generateKey)
+};
 
-        if (argv.usingLedger) {
-            if (argv.accountId) {
-                console.log('WARN: Account id is provided but ignored in case of using Ledger.');
-            }
-            const publicKey = await argv.signer.getPublicKey();
-            // NOTE: Command above already prints public key.
-            console.log(`Implicit account: ${implicitAccountId(publicKey.toString())}`);
-            // TODO: query all accounts with this public key here.
-            // TODO: check if implicit account exist, and if the key doen't match already.
-            return;
-        }
+async function generateKey(options) {
+    await eventtracking.askForId(options);
+    const near = await connect(options);
 
-        const { deps: { keyStore } } = near.config;
-        const existingKey = await keyStore.getKey(argv.networkId, argv.accountId);
-        if (existingKey) {
-            console.log(`Account has existing key pair with ${existingKey.publicKey} public key`);
-            return;
+    if (options.usingLedger) {
+        if (options.accountId) {
+            console.log('WARN: Account id is provided but ignored in case of using Ledger.');
         }
+        const publicKey = await options.signer.getPublicKey();
+        // NOTE: Command above already prints public key.
+        console.log(`Implicit account: ${implicitAccountId(publicKey.toString())}`);
+        // TODO: query all accounts with this public key here.
+        // TODO: check if implicit account exist, and if the key doen't match already.
+        return;
+    }
 
-        // If key doesn't exist, create one and store in the keyStore.
-        // Otherwise, it's expected that both key and accountId are already provided in arguments.
-        if (!argv.publicKey) {
-            const keyPair = KeyPair.fromRandom('ed25519');
-            argv.publicKey = keyPair.publicKey.toString();
-            argv.accountId = argv.accountId || implicitAccountId(argv.publicKey);
-            await keyStore.setKey(argv.networkId, argv.accountId, keyPair);
-        }
+    const { deps: { keyStore } } = near.config;
+    const existingKey = await keyStore.getKey(options.networkId, options.accountId);
+    if (existingKey) {
+        console.log(`Account has existing key pair with ${existingKey.publicKey} public key`);
+        return;
+    }
+
+    // If key doesn't exist, create one and store in the keyStore.
+    // Otherwise, it's expected that both key and accountId are already provided in arguments.
+    if (!options.publicKey) {
+        const keyPair = KeyPair.fromRandom('ed25519');
+        options.publicKey = keyPair.publicKey.toString();
+        options.accountId = options.accountId || implicitAccountId(options.publicKey);
+        await keyStore.setKey(options.networkId, options.accountId, keyPair);
+    }
 
-        console.log(`Key pair with ${argv.publicKey} public key for an account "${argv.accountId}"`);
-    })
-};
+    console.log(`Key pair with ${options.publicKey} public key for an account "${options.accountId}"`);
+
+}