Merge branch 'master' of https://github.com/ch4ot1c/bitcore-install into ch4ot1c-master

# Conflicts:
#	btcp_store_demo.sh

btcp_store_demo.sh

@@ -25,7 +25,7 @@ make_swapfile() {
 
 local PREV=$PWD
 cd /
-sudo dd if=/dev/zero of=swapfile bs=1M count=3000
+sudo dd if=/dev/zero of=swapfile bs=1M count=$1
 sudo mkswap swapfile
 sudo chmod 0600 /swapfile
 sudo swapon swapfile
@@ -37,16 +37,21 @@ cd $PREV
 prompt_swapfile() {
 
 echo ""
-echo "Can we make you a 3gb swapfile? EC2 Micro needs it because it takes a lot of memory to build BTCP."
+echo "Can we make you a swapfile? EC2 Micro has limited RAM."
-echo ""
+echo "1) 1GB - recommended for running Bitcore + MongoDB"
-read -r -p "[y/N] " response
+echo "2) 3GB - required when building btcpd from source"
+echo "3) No Swapfile - not recommended on EC2 Micro"
+read -r -p "[1/2/3] " response
 case "$response" in
-    [yY][eE][sS]|[yY]) 
+  [1])
-        make_swapfile
+    make_swapfile 1024
-        ;;
+    ;;
-    *)
+  [2])
-        echo "Not creating swapfile."
+    make_swapfile 3072
-        ;;
+    ;;
+  *)
+    echo "Not creating swapfile."
+    ;;
 esac
 
 }
@@ -84,7 +89,7 @@ fi
 if [ ! -e ~/.btcprivate/btcprivate.conf ]
 then
 
-local RPCPASSWORD=$(head -c 32 /dev/urandom | base64)
+local RPCPASSWORD=$(openssl rand -base64 32 | tr -d /=+ | cut -c -30)
 touch ~/.btcprivate/btcprivate.conf
 cat << EOF > ~/.btcprivate/btcprivate.conf
 #gen=1
@@ -109,11 +114,6 @@ EOF
 
 fi
 
-cd ~/.btcprivate
-
-# Download + decompress blockchain.tar.gz (blocks/, chainstate/) to quickly sync past block 300,000
-fetch_btcp_blockchain
-
 }
 
 fetch_zcash_params() {
@@ -122,6 +122,7 @@ wget -qO- https://raw.githubusercontent.com/BTCPrivate/BitcoinPrivate/master/btc
 
 }
 
+# Download + decompress blockchain.tar.gz (blocks/, chainstate/) to quickly sync past block 300,000
 fetch_btcp_blockchain() {
 
 cd ~/.btcprivate
@@ -151,8 +152,6 @@ rm -rf $FILE
 
 install_nvm_npm() {
 
-cd ~
-
 # Install npm 
 sudo apt-get -y install npm
 
@@ -198,7 +197,7 @@ npm install BTCPrivate/bitcore-node-btcp
 cd btcp-explorer
 
 # Install Insight API / UI (Explorer) (Headless)
-../node_modules/bitcore-node-btcp/bin/bitcore-node install BTCPrivate/insight-api-btcp BTCPrivate/insight-ui-btcp BTCPrivate/store-demo # BTCPrivate/address-watch, BTCPrivate/bitcore-wallet-service (untested)
+../node_modules/bitcore-node-btcp/bin/bitcore-node install ch4ot1c/store-demo #BTCPrivate/insight-api-btcp BTCPrivate/insight-ui-btcp BTCPrivate/store-demo BTCPrivate/address-watch, BTCPrivate/bitcore-wallet-service (untested)
 
 # Symlink to bitcore-node to btcp-explorer dir
 ln -s node_modules/bitcore-node-btcp/bin/bitcore-node bitcore-node
@@ -213,7 +212,7 @@ cat << EOF > bitcore-node.json
   "port": $PORT,
   "services": [
     "bitcoind",
-    "insight-api-btcp",
+    "$BITCORE_SERVICE_APP",
     "web"
   ],
   "servicesConfig": {
@@ -223,8 +222,8 @@ cat << EOF > bitcore-node.json
         "exec": "$HOME/BitcoinPrivate/src/btcpd"
        }
      },
-     "insight-api-btcp": {
+     "store-demo": {
-       "routePrefix": "api"
+       "mongoURL": "mongodb://localhost:27017/store-demo"
      }
   }
 }
@@ -232,18 +231,23 @@ EOF
 
 #TODO Prompt option + Automate SSL Setup (LetsEncrypt)
 #"https": true,
-#"privateKeyFile": "/etc/ssl/bws.bitpay.com.key",
+#"privateKeyFile": "/etc/ssl/x.key",
-#"certificateFile": "/etc/ssl/bws.bitpay.com.crt",
+#"certificateFile": "/etc/ssl/x.crt",
 
 }
 
-install_bower_browserify_js_libs() {
+install_bower_browserify_uglify_js_libs() {
-  echo "Globally installing bower, browserify"
+  echo "Globally installing bower, browserify, uglify"
-  npm install -g bower browserify
+  npm install -g bower browserify uglify
-  #sudo npm install -g pm2
 
-  # Build bitcore-lib-btcp.js + copy to invoice server's js/ dir
   cd ~/btcp-explorer/node_modules/store-demo
+  bower install
+
+  # Build bitcore-lib.js + uglify + copy to widget's js/ dir
+  cd node_modules/bitcore-lib
+  browserify --require ./index.js:bitcore-lib -o bitcore-lib.js
+  uglify -s bitcore-lib.js -o bitcore-lib.min.js
+  cp {bitcore-lib.js,bitcore-lib.min.js} ~/btcp-explorer/node_modules/store-demo/static/js/bitcore-lib
   bower install --allow-root
   cd node_modules/bitcore-lib-btcp
   browserify --require ./index.js:bitcore-lib-btcp -o bitcore-lib-btcp.js
@@ -253,11 +257,17 @@ install_bower_browserify_js_libs() {
 
 run_install() {
 
+echo ---
 echo ""
 echo "BTCP Merchant Backend Setup - Installing dependencies."
 echo ""
+echo ---
 
-install_ubuntu > /dev/null
+install_ubuntu
+
+echo ""
+
+prompt_swapfile
 
 echo ""
 echo "How would you like to fetch BTCP (btcpd and btcp-cli):"
@@ -271,7 +281,6 @@ case "$response" in
         fetch_btcp_binaries
         ;;
     [2])
-        prompt_swapfile
         clone_and_build_btcp
         ;;
     *)
@@ -281,13 +290,20 @@ esac
 
 init_btcprivate_dotdir
 
+fetch_btcp_blockchain
+
+
 install_nvm_npm
 
 install_mongodb
 
+cd ~
+
 install_bitcore
 
-install_bower_browserify_js_libs
+install_bower_browserify_uglify_js_libs
+
+cd ~
 
 echo "Installation Complete."
 echo "" 
@@ -302,6 +318,9 @@ echo "cd ~/btcp-explorer; ./bitcore-node start"
 echo ""
 echo "Runs on port $PORT (bitcore-node.json)."
 echo ""
+echo "Note - MongoDB needs to be running in the background for store-demo:"
+echo "mongod &"
+echo ""
 
 }