Merge branch 'master' into nightshade

.gitlab-ci.yml

@@ -1,22 +1,10 @@
 image: node:10
 
 stages:
- - build
  - test
 
-cache:
- paths:
- - node_modules/
-
-install_dependencies:
- stage: build
- script:
- - npm install
- artifacts:
- paths:
- - node_modules/
-
 run_tests:
  stage: test
  script:
- - npm test
+ - yarn
+ - yarn test

bin/near

@@ -46,6 +46,13 @@ const callViewFunction = {
  handler: (argv) => exitOnError(main.callViewFunction(argv))
 };
 
+const viewAccount = {
+ command: 'view_account <accountId>',
+ desc: 'view given account/contract state',
+ builder: (yargs) => yargs,
+ handler: (argv) => exitOnError(main.viewAccount(argv))
+};
+
 const sendTokens = {
  command: 'send <receiver> <amount>',
  desc: 'send tokens to given receiver',
@@ -158,6 +165,7 @@ yargs // eslint-disable-line
  .command(deploy)
  .command(scheduleFunctionCall)
  .command(callViewFunction)
+ .command(viewAccount)
  .command(sendTokens)
  .command(clean)
  .command(newProject)

blank_project/package.json

@@ -1,5 +1,5 @@
 {
- "name": "@wasm/hello_world_ts",
+ "name": "hello_world_ts",
  "description": "",
  "version": "0.0.1",
  "scripts": {

package.json

@@ -1,12 +1,12 @@
 {
  "name": "near-shell",
- "version": "0.6.0",
+ "version": "0.7.0",
  "description": "Command line utilities to interact with near blockchain",
  "main": "index.js",
  "scripts": {
  "build": "echo \"Error: not implemented\" && exit 1",
  "deploy": "echo \"Error: not implemented\" && exit 1",
- "test": "./test/new_project.sh"
+ "test": "./test/index.sh"
  },
  "repository": {
  "type": "git",

test/create_account.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+cd tmp-project
+timestamp=$(date +%s)
+testaccount=testaccount$timestamp
+../bin/near create_account $testaccount
+

test/index.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+set -ex
+./test/new_project.sh
+./test/create_account.sh

test/new_project.sh

@@ -1,29 +1,27 @@
 #!/bin/sh
 set -ex
 
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-
 # remove temporary blank project
-rm -rf test/tmp-project
-cd test/
+rm -rf tmp-project
+
 # test generating new project in cwd
 mkdir tmp-project
 cd tmp-project
-../../bin/near new_project
-npm install
-npm uninstall near-shell
-npm install ../../
-NODE_ENV=development npm run test
+../bin/near new_project
+yarn
+yarn remove near-shell
+yarn add ../
+NODE_ENV=development yarn test
 cd ..
 rm -rf tmp-project
+
 # test generating new project in new dir
-../bin/near new_project 'tmp-project'
+./bin/near new_project 'tmp-project'
 cd tmp-project
 FILE=package.json
 if test -f "$FILE"; then
- echo "${GREEN}$FILE exists. Have a cookie!"
+ echo "$FILE exists. Have a cookie!"
 else
- echo "${RED}ERROR: file not found."
+ echo "ERROR: $FILE not found."
  exit 1
-fi
+fi