Merge branch 'fix-issues-yf' into master

near · Nov 4, 2019 · 26aaaa6 · 26aaaa6
2 parents 79323f8 + 8c80fec
commit 26aaaa6
Show file tree

Hide file tree

Showing 22 changed files with 94 additions and 425 deletions.
diff --git a/README.md b/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> <stakingKey> <amount>  # create staking transaction (stakingKey is 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
+  near clean                                   # clean the smart contract build locally(remove ./out )
+```
 
+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]|                       |
diff --git a/bin/near b/bin/near
@@ -1,2 +1,3 @@
 #!/bin/sh
-node --experimental-repl-await "$(dirname "$0")"/cli.js  "$@"
+node --experimental-repl-await "$(dirname "$0")"/cli.js  "$@"
+
diff --git a/blank_project/.gitattributes b/blank_project/.gitattributes
diff --git a/blank_project/README.md b/blank_project/README.md
diff --git a/blank_project/assembly/main.ts b/blank_project/assembly/main.ts
diff --git a/blank_project/assembly/model.ts b/blank_project/assembly/model.ts
diff --git a/blank_project/assembly/tsconfig.json b/blank_project/assembly/tsconfig.json
diff --git a/blank_project/gulpfile.js b/blank_project/gulpfile.js
diff --git a/blank_project/neardev/shared-test-staging/test.near.json b/blank_project/neardev/shared-test-staging/test.near.json
diff --git a/blank_project/neardev/shared-test/test.near.json b/blank_project/neardev/shared-test/test.near.json
diff --git a/blank_project/out/.gitignore b/blank_project/out/.gitignore
diff --git a/blank_project/package.json b/blank_project/package.json
diff --git a/blank_project/src/index.html b/blank_project/src/index.html
diff --git a/blank_project/src/main.js b/blank_project/src/main.js
diff --git a/blank_project/src/test.js b/blank_project/src/test.js
diff --git a/blank_project/src/wallet/login/index.html b/blank_project/src/wallet/login/index.html
diff --git a/blank_project/src/config.js → config.js b/blank_project/src/config.js → config.js
diff --git a/get-config.js b/get-config.js
@@ -8,7 +8,7 @@ module.exports = function getConfig() {
     } catch (e) {
         if (e.code == 'MODULE_NOT_FOUND') {
             console.warn(`[WARNING] Didn't find config at ${configPath}, using default shell config`);
-            const defaultConfig = require('./blank_project/src/config')(process.env.NODE_ENV || 'development');
+            const defaultConfig = require('./config')(process.env.NODE_ENV || 'development');
             console.log(defaultConfig);
             return defaultConfig;
         }