delete blank project and fix issues 161, 164, 165

README.md

@@ -21,23 +21,31 @@ near <command>
 
 ### Commands
 
+For account:
+```bash
+  near login                                   # create a developer account
+  near create_account <accountId>              # create a developer account with masterAccount, publicKey and initialBalance
+  near view <accountId>                        # view account state
+  near keys <accountId>                        # view account public keys
+  near send <sender> <receiver> <amount>       # send tokens to given receiver
+  near stake <accountId> <publicKey> <amount>  # create staking transaction (base58 encoded)
+  near delete <accountId> <beneficiaryId>      # delete an account and transfer funds to beneficiary account
+```
+
+For smart contract:
 ```bash
-  near create_account <accountId>              # create a developer account
-  near state <accountId>                       # view account
-  near tx-status <hash>                        # lookup transaction status by hash
   near build                                   # build your smart contract
   near deploy                                  # deploy your smart contract
   near call <contractName> <methodName>        # schedule smart contract call which
   [args]                                       # can modify state
   near view <contractName> <methodName>        # make smart contract call which can
   [args]                                       # view state
-  near state <accountId>                       # view account
-  near send <receiver> <amount>                # send tokens to given receiver
   near clean                                   # clean the build environment
-  near new_project [projectDir]                # create a new blank project
-  near stake [accountId] [publicKey] [amount]  # create staking transaction
-  near login                                   # create a developer account
+```
 
+For transactions:
+```bash
+  near tx-status <hash>                        # lookup transaction status by hash
 ```
 
 ### Options
@@ -51,4 +59,7 @@ near <command>
 | --helperUrl               | NEAR contract helper URL                      | [string]  |                       |
 | --keyPath                 | Path to master account key                    | [string]  |                       |
 | --homeDir                 | Where to look for master account              | [string]  |"~/.near"              |
-| --accountId, --account_id | Unique identifier for the account             | [string]  |                       |
+| --accountId, --account_id | Unique identifier for the account             | [string]  [required]|                       |
+| --masterAccount           | Account used to create requested account.     | [string]  [required]|                       |
+| --publicKey               | Public key to initialize the account with     | [string]  [required]|                       |
+| --initialBalance          | Number of tokens to transfer to newly account | [string]  [required]|                       |

bin/near

@@ -12,6 +12,25 @@ const exitOnError = async function(promise) {
   }
 }
 
+//For smart contract:
+const { spawn } = require('child_process');
+const build = {
+  command: 'build',
+  desc: 'build your smart contract',
+  handler: (argv) => {
+    const gulp = spawn('gulp');
+    gulp.stdout.on('data', function (data) {
+      console.log(data.toString());
+    });
+    gulp.stderr.on('data', function (data) {
+      console.log(data.toString());
+    });
+    gulp.on('exit', function (code) {
+      process.exit(code);
+    });
+  }
+};
+
 const deploy = {
   command: 'deploy',
   desc: 'deploy your smart contract',
@@ -46,34 +65,22 @@ const callViewFunction = {
   handler: (argv) => exitOnError(main.callViewFunction(argv))
 };
 
-const sendMoney = {
-  command: 'send <sender> <receiver> <amount>',
-  desc: 'send tokens to given receiver',
-  builder: (yargs) => yargs,
-  handler: (argv) => exitOnError(main.sendMoney(argv))
-};
-
-const { spawn } = require('child_process');
-const build = {
-  command: 'build',
-  desc: 'build your smart contract',
-  handler: (argv) => {
-    const gulp = spawn('gulp');
-    gulp.stdout.on('data', function (data) {
-      console.log(data.toString());
-    });
-    gulp.stderr.on('data', function (data) {
-      console.log(data.toString());
-    });
-    gulp.on('exit', function (code) {
-      process.exit(code);
-    });
-  }
+const clean = {
+  command: 'clean',
+  desc: 'clean the build environment',
+  builder: (yargs) => yargs
+    .option('outDir', {
+      desc: 'build directory',
+      type: 'string',
+      default: './out'
+    }),
+  handler: (argv) => exitOnError(main.clean(argv))
 };
 
+//For Account:
 const createAccount = {
   command: 'create_account <accountId>',
-  desc: 'create a developer account',
+  desc: 'create a developer account with --masterAccount, --publicKey and --initialBalance',
   builder: (yargs) => yargs
     .option('accountId', {
       desc: 'Unique identifier for the newly created account',
@@ -100,14 +107,14 @@ const createAccount = {
 
 const login = {
   command: 'login',
-  desc: 'create a developer account',
+  desc: 'logging into NEAR wallet',
   builder: (yargs) => yargs,
   handler: (argv) => exitOnError(main.login(argv))
 };
 
 const viewAccount = {
-  command: 'state <accountId>',
-  desc: 'view account',
+  command: 'view <accountId>',
+  desc: 'view account state',
   builder: (yargs) => yargs
     .option('accountId', {
       desc: 'Account to view',
@@ -118,8 +125,8 @@ const viewAccount = {
 };
 
 const deleteAccount = {
-  command: 'delete_account <accountId> <beneficiaryId>',
-  desc: 'delete an account and transfer funds to beneficiary account.',
+  command: 'delete <accountId> <beneficiaryId>',
+  desc: 'delete an account and transfer funds to beneficiary account',
   builder: (yargs) => yargs
     .option('accountId', {
       desc: 'Account to view',
@@ -146,52 +153,16 @@ const keys = {
   handler: (argv) => exitOnError(main.keys(argv))
 };
 
-const txStatus = {
-  command: 'tx-status <hash>',
-  desc: 'lookup transaction status by hash',
-  builder: (yargs) => yargs
-    .option('hash', {
-      desc: 'base58-encoded hash',
-      type: 'string',
-      required: true
-    }),
-  handler: (argv) => exitOnError(main.txStatus(argv))
-};
-
-const clean = {
-  command: 'clean',
-  desc: 'clean the build environment',
-  builder: (yargs) => yargs
-    .option('outDir', {
-      desc: 'build directory',
-      type: 'string',
-      default: './out'
-    }),
-  handler: (argv) => exitOnError(main.clean(argv))
-};
-
-const newProject = {
-  command: 'new_project [projectDir]',
-  desc: 'create a new blank project',
-  builder: (yargs) => yargs
-    .option('projectDir', {
-      desc: 'project directory',
-      type: 'string',
-      default: '.'
-    }),
-  handler: (argv) => exitOnError(main.newProject(argv))
-};
-
 const stake = {
-  command: 'stake [accountId] [publicKey] [amount]',
+  command: 'stake <accountId> <stakeKey> <amount>',
   desc: 'create staking transaction',
   builder: (yargs) => yargs
     .option('accountId', {
       desc: 'Account to stake on',
       type: 'string',
       required: true,
     })
-    .option('publicKey', {
+    .option('stakeKey', {
       descr: 'Public key to stake with (base58 encoded)',
       type: 'string',
       required: true,
@@ -202,7 +173,27 @@ const stake = {
       required: true,
     }),
     handler: (argv) => exitOnError(main.stake(argv))
-}
+};
+
+const sendMoney = {
+  command: 'send <sender> <receiver> <amount>',
+  desc: 'send tokens to given receiver',
+  builder: (yargs) => yargs,
+  handler: (argv) => exitOnError(main.sendMoney(argv))
+};
+
+//For transaction:
+const txStatus = {
+  command: 'tx-status <hash>',
+  desc: 'lookup transaction status by hash',
+  builder: (yargs) => yargs
+    .option('hash', {
+      desc: 'base58-encoded hash',
+      type: 'string',
+      required: true
+    }),
+  handler: (argv) => exitOnError(main.txStatus(argv))
+};
 
 let config = require('../get-config')();
 yargs // eslint-disable-line
@@ -245,7 +236,6 @@ yargs // eslint-disable-line
   .command(viewAccount)
   .command(sendMoney)
   .command(clean)
-  .command(newProject)
   .command(stake)
   .command(login)
   .config(config)