From 79468ec8a3f53a02249ac9211238ed6b31578c21 Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Fri, 15 Apr 2016 17:37:27 -0400 Subject: [PATCH 01/10] build: update packages for v4 --- .travis.yml | 24 +++++++++++++++--------- package.json | 10 +++++----- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 867d38cb144..b9ddf237673 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,19 @@ -language: node_js sudo: false +language: node_js +env: + - CXX=g++-4.8 CC=gcc-4.8 +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + - gcc-4.8 + - libzmq3-dev node_js: -- '0.12' -before_install: - - npm install -g bower - - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start + - '0.12' + - '4' install: - - bower install - npm install -after_script: - - gulp coveralls +script: + - npm run test diff --git a/package.json b/package.json index bf49b3d051c..df833fc79d1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bitcore", - "version": "3.0.0", + "version": "4.0.0", "description": "A platform to build bitcoin and blockchain-based applications.", "author": "BitPay ", "main": "index.js", @@ -81,10 +81,10 @@ "request": "browser-request" }, "dependencies": { - "bitcore-lib": "^0.13.12", - "bitcore-node": "^2.0.0", - "insight-api": "^0.3.2", - "insight-ui": "^0.3.0" + "bitcore-lib": "^0.13.14", + "bitcore-node": "braydonf/bitcore-node#73197fdc755d689b2048781b8d508a3377e26033", + "insight-api": "braydonf/insight-api#61f0c3063a0d101cdbd7776a39a0429ab0abc8dd", + "insight-ui": "braydonf/insight-ui#d7c161d7b659b39d3929ea863b9bc388419ec57b" }, "license": "MIT", "devDependencies": { From f9e5121b63ce5842358a404d5421fa44ebe3b53b Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Mon, 25 Apr 2016 16:57:14 -0400 Subject: [PATCH 02/10] build: scripts to build debian package --- .gitignore | 5 +- package.json | 3 +- scripts/build-deb | 92 +++++++++++++++++++ scripts/debian/control | 8 ++ scripts/debian/postinst | 37 ++++++++ scripts/debian/prerm | 14 +++ scripts/debian/systemd.service | 20 ++++ .../debian/upstart.conf | 3 - 8 files changed, 174 insertions(+), 8 deletions(-) create mode 100755 scripts/build-deb create mode 100644 scripts/debian/control create mode 100644 scripts/debian/postinst create mode 100644 scripts/debian/prerm create mode 100644 scripts/debian/systemd.service rename etc/init/bitcored.conf => scripts/debian/upstart.conf (70%) diff --git a/.gitignore b/.gitignore index efe72ace6d6..61b58ad4491 100644 --- a/.gitignore +++ b/.gitignore @@ -15,9 +15,6 @@ bower_components report .DS_Store +build -bitcore.js -bitcore.min.js -bitcore.js.sig -bitcore.min.js.sig tests.js diff --git a/package.json b/package.json index df833fc79d1..cb4423228ce 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "author": "BitPay ", "main": "index.js", "scripts": { - "test": "./node_modules/.bin/mocha test/** --recursive" + "test": "./node_modules/.bin/mocha test/** --recursive", + "build-deb": "./scripts/build-deb" }, "bin": { "bitcore": "./bin/bitcore", diff --git a/scripts/build-deb b/scripts/build-deb new file mode 100755 index 00000000000..8f203b419ef --- /dev/null +++ b/scripts/build-deb @@ -0,0 +1,92 @@ +#!/bin/bash +set -e +set -o pipefail + +log_title() { + local code="\033[" + local color="${code}1;34m" + [ -z "$text" ] && local text="$color$1${code}0m" + echo -e "\n$text" +} + +root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/.." + +package_arch="amd64" +package_version=$(jq -r ".version" "${root_dir}/package.json") +package_maintainer=$(jq -r ".author" "${root_dir}/package.json") +package_description=$(jq -r ".description" "${root_dir}/package.json") + +deb_dir="${root_dir}/build/bitcore_${package_version}_${package_arch}" + +log_title "Making Debian package:\n" +echo -e " Name: bitcore" +echo -e " Version: ${package_version}" +echo -e " Maintainer: ${package_maintainer}" +echo -e " Description: ${package_description}" +echo -e "" + +if [ -e "$deb_dir" ]; then rm -rf "$deb_dir"; fi + +escape() { + sed -e 's/[]\/$*.^|[]/\\&/g' -e 's/&/\\&/g' <<< "$@" +} + +replace_vars() { + declare -r file="$1" + declare -r target_file="$2" + + sed < "$file" \ + -e "s/{{ deb_package_version }}/$(escape $package_version)/g" \ + -e "s/{{ deb_package_description }}/$(escape $package_description)/g" \ + -e "s/{{ deb_package_maintainer }}/$(escape $package_maintainer)/g" \ + -e "s/{{ deb_package_arch }}/$(escape $package_arch)/g" \ + > "$target_file" +} + +log_title "Setting up Debian package:" +mkdir -vp "$deb_dir/DEBIAN" \ + "$deb_dir/etc/bitcore" \ + "$deb_dir/usr/opt/bitcore" \ + "$deb_dir/usr/bin" + +mkdir -vp "$deb_dir/etc/init" +mkdir -vp "$deb_dir/etc/systemd/system" +replace_vars "${root_dir}/scripts/debian/control" "$deb_dir/DEBIAN/control" +replace_vars "${root_dir}/scripts/debian/postinst" "$deb_dir/DEBIAN/postinst" +replace_vars "${root_dir}/scripts/debian/prerm" "$deb_dir/DEBIAN/prerm" +replace_vars "${root_dir}/scripts/debian/upstart.conf" "$deb_dir/etc/init/bitcore.conf" +replace_vars "${root_dir}/scripts/debian/systemd.service" "$deb_dir/etc/systemd/system/bitcore.service" +chmod -vR 0755 "$deb_dir/DEBIAN/" + +log_title "Copying Bitcore" + +app_dir="$deb_dir/usr/opt/bitcore/" + +rsync -vr "${root_dir}/bin" "${app_dir}" +chmod -vR 0755 "${app_dir}/bin/bitcore" "${app_dir}/bin/bitcored" +cp -v "${root_dir}/package.json" "${app_dir}" +cp -v "${root_dir}/README.md" "${app_dir}" +cp -v "${root_dir}/index.js" "${app_dir}" +pushd "${deb_dir}/usr/bin" +ln -vs "../opt/bitcore/bin/bitcore" +ln -vs "../opt/bitcore/bin/bitcored" +popd + +log_title "Installing Bitcore Modules" +pushd "${app_dir}" +VERIFY_BITCOIN_DOWNLOAD=1 npm install --production +echo "Cleanup Node.js addon binaries before packaging:" +find "${app_dir}" -type f -name '*.node' -print -delete +find "${app_dir}" -type f -name '*.o' -print -delete +echo "Cleanup intermediate files:" +rm -v "${deb_dir}/usr/opt/bitcore/node_modules/bitcore-node/bin/bitcoin-0.12.0-linux64.tar.gz" +npm shrinkwrap --dev +popd + +log_title "Building Debian package" +dpkg-deb -Z gzip --verbose --build "$deb_dir" + +log_title "Signing Debian package" +dpkg-sig --sign builder "${deb_dir}.deb" + +echo -e "Success.\n" diff --git a/scripts/debian/control b/scripts/debian/control new file mode 100644 index 00000000000..8ad682591da --- /dev/null +++ b/scripts/debian/control @@ -0,0 +1,8 @@ +Package: bitcore +Version: {{ deb_package_version }} +Section: base +Priority: optional +Architecture: {{ deb_package_arch }} +Depends: nodejs, nodejs-legacy, npm, build-essential, libzmq3-dev +Maintainer: {{ deb_package_maintainer }} +Description: {{ deb_package_description }} diff --git a/scripts/debian/postinst b/scripts/debian/postinst new file mode 100644 index 00000000000..e1271c40bfb --- /dev/null +++ b/scripts/debian/postinst @@ -0,0 +1,37 @@ +#!/bin/bash +set -e +set -o pipefail + +# add group +if ! getent group | grep -q "^bitcore:" ; then + echo "Creating system group: bitcore" + groupadd --system bitcore +fi + +# add user +if ! getent passwd | grep -q "^bitcore:"; then + echo "Creating bitcore system user" + useradd --gid "bitcore" --system -m bitcore +fi + +# build nodejs addons +cd "/usr/opt/bitcore" +SKIP_BITCOIN_DOWNLOAD=1 npm rebuild + +# setup log directory +mkdir -p "/var/log/bitcore" +chown -R bitcore:bitcore "/var/log/bitcore" + +# start bitcore +if hash service 2> /dev/null; then + service bitcore start || echo "bitcore could not be registered or started" +elif hash start 2> /dev/null; then + start bitcore || echo "bitcore could not be registered or started" +elif hash systemctl 2> /dev/null; then + { + systemctl enable "bitcore.service" && \ + systemctl start "bitcore.service" + } || echo "bitcore could not be registered or started" +else + echo 'Your system does not appear to use upstart or systemd, so bitcore could not be started' +fi diff --git a/scripts/debian/prerm b/scripts/debian/prerm new file mode 100644 index 00000000000..23bbee6cd8d --- /dev/null +++ b/scripts/debian/prerm @@ -0,0 +1,14 @@ +#!/bin/bash + +set -e +set -o pipefail + +if hash service 2> /dev/null; then + service bitcore stop || echo "bitcore wasn't running!" +elif hash stop 2> /dev/null; then + stop "$service_name" || echo "bitcore wasn't running!" +elif hash systemctl 2> /dev/null; then + systemctl disable "bitcore.service" || echo "bitcore wasn't running!" +else + echo "Your system does not appear to use upstart or systemd, so bitcore could not be stopped" +fi diff --git a/scripts/debian/systemd.service b/scripts/debian/systemd.service new file mode 100644 index 00000000000..dc83ed6c2a0 --- /dev/null +++ b/scripts/debian/systemd.service @@ -0,0 +1,20 @@ +[Unit] +Description={{ deb_package_description }} +Requires=network.target + +[Service] +Type=simple +WorkingDirectory=/usr/opt/bitcore +ExecStart=/usr/opt/bitcore/bin/bitcored +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-failure +RestartSec=15 +User=bitcore +ExecStartPre=/bin/mkdir -p /run/bitcore +ExecStartPre=/bin/chown bitcore:bitcore /run/bitcore +ExecStartPre=/bin/chmod 755 /run/bitcore +PermissionsStartOnly=true +TimeoutStopSec=300 + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/etc/init/bitcored.conf b/scripts/debian/upstart.conf similarity index 70% rename from etc/init/bitcored.conf rename to scripts/debian/upstart.conf index 99adce836b6..657f0abe5bf 100644 --- a/etc/init/bitcored.conf +++ b/scripts/debian/upstart.conf @@ -18,9 +18,6 @@ setgid bitcore # home dir of the bitcore daemon user env HOME=/home/bitcore -# path should include the correct version of node -env PATH=/home/bitcore/.nvm/versions/node/v0.12.7/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin - respawn respawn limit 5 15 From 92c0c11c65840096f05679f82353188896f6cda1 Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Wed, 27 Apr 2016 15:02:57 -0400 Subject: [PATCH 03/10] build: include bitcoind service --- scripts/build-deb | 13 ++++++---- scripts/debian/bitcore-bitcoind.conf | 24 +++++++++++++++++++ scripts/debian/bitcore-bitcoind.service | 20 ++++++++++++++++ scripts/debian/{upstart.conf => bitcore.conf} | 2 -- .../{systemd.service => bitcore.service} | 0 scripts/debian/postinst | 6 ++--- 6 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 scripts/debian/bitcore-bitcoind.conf create mode 100644 scripts/debian/bitcore-bitcoind.service rename scripts/debian/{upstart.conf => bitcore.conf} (93%) rename scripts/debian/{systemd.service => bitcore.service} (100%) diff --git a/scripts/build-deb b/scripts/build-deb index 8f203b419ef..83f4f723c08 100755 --- a/scripts/build-deb +++ b/scripts/build-deb @@ -47,6 +47,7 @@ log_title "Setting up Debian package:" mkdir -vp "$deb_dir/DEBIAN" \ "$deb_dir/etc/bitcore" \ "$deb_dir/usr/opt/bitcore" \ + "$deb_dir/usr/opt/bitcore/bin" \ "$deb_dir/usr/bin" mkdir -vp "$deb_dir/etc/init" @@ -54,15 +55,18 @@ mkdir -vp "$deb_dir/etc/systemd/system" replace_vars "${root_dir}/scripts/debian/control" "$deb_dir/DEBIAN/control" replace_vars "${root_dir}/scripts/debian/postinst" "$deb_dir/DEBIAN/postinst" replace_vars "${root_dir}/scripts/debian/prerm" "$deb_dir/DEBIAN/prerm" -replace_vars "${root_dir}/scripts/debian/upstart.conf" "$deb_dir/etc/init/bitcore.conf" -replace_vars "${root_dir}/scripts/debian/systemd.service" "$deb_dir/etc/systemd/system/bitcore.service" +replace_vars "${root_dir}/scripts/debian/bitcore.conf" "$deb_dir/etc/init/bitcore.conf" +replace_vars "${root_dir}/scripts/debian/bitcore.service" "$deb_dir/etc/systemd/system/bitcore.service" +replace_vars "${root_dir}/scripts/debian/bitcore-bitcoind.conf" "$deb_dir/etc/init/bitcore-bitcoind.conf" +replace_vars "${root_dir}/scripts/debian/bitcore-bitcoind.service" "$deb_dir/etc/systemd/system/bitcore-bitcoind.service" chmod -vR 0755 "$deb_dir/DEBIAN/" log_title "Copying Bitcore" -app_dir="$deb_dir/usr/opt/bitcore/" +app_dir="$deb_dir/usr/opt/bitcore" -rsync -vr "${root_dir}/bin" "${app_dir}" +cp -v "${root_dir}/bin/bitcored" "${app_dir}/bin/bitcored" +cp -v "${root_dir}/bin/bitcore" "${app_dir}/bin/bitcore" chmod -vR 0755 "${app_dir}/bin/bitcore" "${app_dir}/bin/bitcored" cp -v "${root_dir}/package.json" "${app_dir}" cp -v "${root_dir}/README.md" "${app_dir}" @@ -70,6 +74,7 @@ cp -v "${root_dir}/index.js" "${app_dir}" pushd "${deb_dir}/usr/bin" ln -vs "../opt/bitcore/bin/bitcore" ln -vs "../opt/bitcore/bin/bitcored" +ln -vs "../opt/bitcore/node_modules/.bin/bitcoind" "bitcore-bitcoind" popd log_title "Installing Bitcore Modules" diff --git a/scripts/debian/bitcore-bitcoind.conf b/scripts/debian/bitcore-bitcoind.conf new file mode 100644 index 00000000000..b07bccb5451 --- /dev/null +++ b/scripts/debian/bitcore-bitcoind.conf @@ -0,0 +1,24 @@ +description "Bitcoin Core for Bitcore" +author "BitPay, Inc." + +limit nofile 20000 30000 + +start on runlevel [2345] +stop on runlevel [016] + +kill timeout 300 +kill signal SIGINT + +# user/group for bitcore daemon to run as +setuid bitcore +setgid bitcore + +# home dir of the bitcore daemon user +env HOME=/home/bitcore + +respawn +respawn limit 5 15 + +script + exec bitcore-bitcored -datadir=/home/bitcore/.bitcore/data/ +end script diff --git a/scripts/debian/bitcore-bitcoind.service b/scripts/debian/bitcore-bitcoind.service new file mode 100644 index 00000000000..8c1ab19578e --- /dev/null +++ b/scripts/debian/bitcore-bitcoind.service @@ -0,0 +1,20 @@ +[Unit] +Description=Bitcoin Core for Bitcore +Requires=network.target + +[Service] +Type=simple +WorkingDirectory=/usr/opt/bitcore +ExecStart=/usr/bin/bitcore-bitcoind -datadir=/home/bitcore/.bitcore/data/ +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-failure +RestartSec=15 +User=bitcore +ExecStartPre=/bin/mkdir -p /run/bitcore +ExecStartPre=/bin/chown bitcore:bitcore /run/bitcore +ExecStartPre=/bin/chmod 755 /run/bitcore +PermissionsStartOnly=true +TimeoutStopSec=300 + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/scripts/debian/upstart.conf b/scripts/debian/bitcore.conf similarity index 93% rename from scripts/debian/upstart.conf rename to scripts/debian/bitcore.conf index 657f0abe5bf..a534786683e 100644 --- a/scripts/debian/upstart.conf +++ b/scripts/debian/bitcore.conf @@ -1,5 +1,3 @@ -# Bitcored Upstart script - description "Bitcore Daemon" author "BitPay, Inc." diff --git a/scripts/debian/systemd.service b/scripts/debian/bitcore.service similarity index 100% rename from scripts/debian/systemd.service rename to scripts/debian/bitcore.service diff --git a/scripts/debian/postinst b/scripts/debian/postinst index e1271c40bfb..63ec2eb4f96 100644 --- a/scripts/debian/postinst +++ b/scripts/debian/postinst @@ -18,9 +18,9 @@ fi cd "/usr/opt/bitcore" SKIP_BITCOIN_DOWNLOAD=1 npm rebuild -# setup log directory -mkdir -p "/var/log/bitcore" -chown -R bitcore:bitcore "/var/log/bitcore" +# setup data directory +mkdir -p "/home/bitcore/.bitcore/data" +chown -R bitcore:bitcore "/home/bitcore/.bitcore" # start bitcore if hash service 2> /dev/null; then From ebfbb8218a59e65571b3f24020b07433d6de60c3 Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Wed, 25 May 2016 16:07:43 -0400 Subject: [PATCH 04/10] Update insight-api and bitcore-node commit hashes - Includes fix for var self = this for insight-api - And increased test coverage for bitcore-node --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index cb4423228ce..5119295d3dc 100644 --- a/package.json +++ b/package.json @@ -83,8 +83,8 @@ }, "dependencies": { "bitcore-lib": "^0.13.14", - "bitcore-node": "braydonf/bitcore-node#73197fdc755d689b2048781b8d508a3377e26033", - "insight-api": "braydonf/insight-api#61f0c3063a0d101cdbd7776a39a0429ab0abc8dd", + "bitcore-node": "braydonf/bitcore-node#88c15f6844d7e7f8f97b2da43e78c92c4fc508fb", + "insight-api": "braydonf/insight-api#72fe25aff9d9cd79c8a9a788b77a7d92ab2cc988", "insight-ui": "braydonf/insight-ui#d7c161d7b659b39d3929ea863b9bc388419ec57b" }, "license": "MIT", From 52465081eb070757b55ee361e54a11ef4cc9ce6c Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Wed, 25 May 2016 17:23:04 -0400 Subject: [PATCH 05/10] Update insight-api and bitcore-node commit hashes - Includes fix for bitcore-node out.scriptPubKey.addresses being undefined - And fixes insight-api remote ip --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5119295d3dc..d20e6a91198 100644 --- a/package.json +++ b/package.json @@ -83,8 +83,8 @@ }, "dependencies": { "bitcore-lib": "^0.13.14", - "bitcore-node": "braydonf/bitcore-node#88c15f6844d7e7f8f97b2da43e78c92c4fc508fb", - "insight-api": "braydonf/insight-api#72fe25aff9d9cd79c8a9a788b77a7d92ab2cc988", + "bitcore-node": "braydonf/bitcore-node#f38fa1324fd480d23992d84fd90f4cb9ab8f4850", + "insight-api": "braydonf/insight-api#2448ad1779da7ae8d4cf78a86260446f40d3f21c", "insight-ui": "braydonf/insight-ui#d7c161d7b659b39d3929ea863b9bc388419ec57b" }, "license": "MIT", From 463147aa792e82747e67752bb3346bb73f90d6cc Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Thu, 26 May 2016 10:29:11 -0400 Subject: [PATCH 06/10] Update bitcore-node commit hash - Includes fix for block argument handling of block height --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d20e6a91198..af5111a9278 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ }, "dependencies": { "bitcore-lib": "^0.13.14", - "bitcore-node": "braydonf/bitcore-node#f38fa1324fd480d23992d84fd90f4cb9ab8f4850", + "bitcore-node": "braydonf/bitcore-node#aa7f0d7c605212eb8415e1de10721df43ae179c0", "insight-api": "braydonf/insight-api#2448ad1779da7ae8d4cf78a86260446f40d3f21c", "insight-ui": "braydonf/insight-ui#d7c161d7b659b39d3929ea863b9bc388419ec57b" }, From ce8f71aed9a23da1d682e27f8d8ba99daf396e87 Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Thu, 26 May 2016 11:27:54 -0400 Subject: [PATCH 07/10] Update insight-api commit hash - Includes cache updates and block argument validation --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index af5111a9278..aa25e980517 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "dependencies": { "bitcore-lib": "^0.13.14", "bitcore-node": "braydonf/bitcore-node#aa7f0d7c605212eb8415e1de10721df43ae179c0", - "insight-api": "braydonf/insight-api#2448ad1779da7ae8d4cf78a86260446f40d3f21c", + "insight-api": "braydonf/insight-api#667a38053b63694b76a85570241310590e8c074f", "insight-ui": "braydonf/insight-ui#d7c161d7b659b39d3929ea863b9bc388419ec57b" }, "license": "MIT", From b802073971149778e775800aa86b4aaaee73fc3e Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Fri, 27 May 2016 14:09:04 -0400 Subject: [PATCH 08/10] docs: update Node.js version in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ffc158ad58..f93c6731046 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Infrastructure to build Bitcoin and blockchain-based applications for the next g ## Getting Started -Before you begin you'll need to have Node.js v0.12 installed. There are several options for installation. One method is to use [nvm](https://github.com/creationix/nvm) to easily switch between different versions, or download directly from [Node.js](https://nodejs.org/). +Before you begin you'll need to have Node.js v4 or v0.12 installed. There are several options for installation. One method is to use [nvm](https://github.com/creationix/nvm) to easily switch between different versions, or download directly from [Node.js](https://nodejs.org/). ```bash npm install -g bitcore From d38860fce3d3fe8c87fcad8dbdc133d7f3a02d1a Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Fri, 27 May 2016 14:10:46 -0400 Subject: [PATCH 09/10] docs: add kleetus public key to readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f93c6731046..7b406c3bd31 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,7 @@ You can also use our pre-generated files, provided for each release along with a To verify signatures, use the following PGP keys: - @braydonf: https://pgp.mit.edu/pks/lookup?op=get&search=0x9BBF07CAC07A276D +- @kleetus: https://pgp.mit.edu/pks/lookup?op=get&search=0x33195D27EF6BDB7F - @pnagurny: https://pgp.mit.edu/pks/lookup?op=get&search=0x0909B33F0AA53013 ## License From 3ce344a2318c222442b35fb84c021d630d1f43fb Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Fri, 27 May 2016 14:33:02 -0400 Subject: [PATCH 10/10] build: update package.json with released versions - bitcore-node@3.0.0 - insight-api@0.4.0 - insight-ui@0.4.0 --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index aa25e980517..4a9544c3916 100644 --- a/package.json +++ b/package.json @@ -83,9 +83,9 @@ }, "dependencies": { "bitcore-lib": "^0.13.14", - "bitcore-node": "braydonf/bitcore-node#aa7f0d7c605212eb8415e1de10721df43ae179c0", - "insight-api": "braydonf/insight-api#667a38053b63694b76a85570241310590e8c074f", - "insight-ui": "braydonf/insight-ui#d7c161d7b659b39d3929ea863b9bc388419ec57b" + "bitcore-node": "~3.0.0", + "insight-api": "^0.4.0", + "insight-ui": "^0.4.0" }, "license": "MIT", "devDependencies": {