Merge branch 'release/v1.4.7'

chainpoint · Oct 3, 2018 · 42474cd · 42474cd
2 parents 96d014f 2c4113c
commit 42474cd
Show file tree

Hide file tree

Showing 5 changed files with 124 additions and 634 deletions.
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -5,7  5,7 @@ development on the Chainpoint CLI
 
 ## Development and Test
 
-You will need a recent version of Node.js and the [Yarn](https://yarnpkg.com/en/) tool installed to get started. 
 You will need a recent version of Node.js and the [Yarn](https://yarnpkg.com/en/) tool installed to get started.
 
 Start by installing all `npm.js` dependencies:
 
@@ -19,16  19,6 @@ yarn
 ./chp.js
 ```
 
-### Install w/ NPM
-
-You can install/uninstall the `chp` binary from this repository globally with the following. This will install a Javascript
-binary using NPM:
-
-```
-yarn install-npm
-yarn uninstall-npm
-```
-
 ### Install : Binary Single-File Executables
 
 The following package scripts are provided to build and
@@ -37,18  27,47 @@ be used later for standalone installation without the need
 to install Node.js/npm/yarn.
 
 ```
-# Build all local executable targets
-yarn build
-yarn build-debug
-yarn build-clean
 # Build a local executable targets
 yarn run build
 
-# Install a system binary to `/usr/local/bin`
-yarn install-bin-macos
-yarn install-bin-linux-x64
-yarn install-bin-linux-x86
-yarn install-bin-alpine
 # Install a binary to `/usr/local/bin`
 yarn run install-bin-macos
 
 # Remove binary from `/usr/local/bin`
 yarn uninstall-bin
 ```
 
 ### Install : NPM Global
 
 This will install a Javascript executable using `npm`. Its recommended
 to test with the binary installation method for your platform in most cases.
 
 ```
 yarn run install-npm
 yarn run uninstall-npm
 ```
 
 ## Publishing
 
 ### Version bump
 
 First cut a `git flow` master branch release:
 
 - `git flow release start vX.Y.Z`
 - Modify the `package.json` and README files to bump the version number.
 - Commit version changes
 - `git flow release finish vX.Y.Z`, when asked to tag the release use simple `vX.Y.Z` as the tag annotation messge. See previous releases at [https://github.com/chainpoint/chainpoint-cli/releases](https://github.com/chainpoint/chainpoint-cli/releases)
 - `git push` develop branch
 - `git push origin master` master branch
 - `git push --tags` to push the tag that will trigger a new binary build.
 
 ### Verify Github Release
 
 - Verify that the TravisCI build passed cleanly [https://travis-ci.org/chainpoint/chainpoint-cli](https://travis-ci.org/chainpoint/chainpoint-cli)
 - Verify that the binary release was pushed to [https://github.com/chainpoint/chainpoint-cli/releases](https://github.com/chainpoint/chainpoint-cli/releases)
 
 ### Publish to `npm`
 
 - Ensure you are a collaborator on [https://www.npmjs.com/package/chainpoint-cli](https://www.npmjs.com/package/chainpoint-cli)
 - Run `npm publish`
 - Verify the new release was pushed to [https://www.npmjs.com/package/chainpoint-cli](https://www.npmjs.com/package/chainpoint-cli).
diff --git a/lib/submit.js b/lib/submit.js
@@ -120,7  120,7 @@ async function submitHashesAsync(hashDb, hashArray, baseURI) {
     /* eslint-disable no-unused-vars */
     await retry(
       async bail => {
-        let targetURI = firstAttempt ? baseURI : null
         let targetURI = firstAttempt ? [baseURI] : null
         firstAttempt = false
         submitResponse = await chp.submitHashes(hashArray, targetURI)
       },

diff --git a/lib/verify.js b/lib/verify.js
@@ -181,7  181,7 @@ async function VerifyProofs(proofs, baseURI) {
     /* eslint-disable no-unused-vars */
     await retry(
       async bail => {
-        let targetURI = firstAttempt ? baseURI : null
         let targetURI = firstAttempt ? [baseURI] : null
         firstAttempt = false
         verifyResponse = await chp.verifyProofs(proofs, targetURI)
       },

diff --git a/package.json b/package.json
@@ -1,14  1,14 @@
 {
   "name": "chainpoint-cli",
-  "version": "1.4.6",
   "version": "1.4.7",
   "description": "Chainpoint CLI",
   "main": "chp.js",
   "bin": {
     "chp": "./chp.js"
   },
   "scripts": {
     "build": "yarn run build:clean && pkg . --targets node8-macos-x64,node8-linux-x64,node8-linux-x86,node8-alpine-x64 --out-path ./build/",
-    "build-debug": "yarn build:clean && ./node_modules/.bin/pkg --debug . --targets node8-macos-x64,node8-linux-x64,node8-linux-x86,node8-alpine-x64 --out-path ./build/",
     "build:debug": "yarn build:clean && ./node_modules/.bin/pkg --debug . --targets node8-macos-x64,node8-linux-x64,node8-linux-x86,node8-alpine-x64 --out-path ./build/",
     "build:clean": "rimraf ./build/*",
     "install-npm": "npm install -g --production",
     "uninstall-npm": "npm uninstall -g chainpoint-cli",
@@ -56,7  56,7 @@
     "blake2s-js": "^1.2.2",
     "bluebird": "^3.5.0",
     "chainpoint-binary": "^4.0.0",
-    "chainpoint-client": "^0.1.4",
     "chainpoint-client": "^0.2.3",
     "chainpoint-proof-json-schema": "^1.0.0",
     "envalid": "^3.1.1",
     "get-stdin": "^5.0.1",