.nvmrc

@@ -0,0 +1 @@
+lts/*

.travis.yml

@@ -12,7 +12,7 @@ addons:
       - g++-4.8
       - clang
 node_js:
-  - "6.9.1"
+  - "8"
 before_install:
   - export CXX="g++-4.8" CC="gcc-4.8"
 after_script:

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 Contributing
 ============
 
-Want to contribute, but not sure where to start? Check out our [issue board](http://waffle.io/storj/core)! 
+Want to contribute? Read on! 
 
 Contributor License Agreement
 -----------------------------
@@ -12,17 +12,16 @@ You also assert that you have completed the [Contributor License Agreement](http
 Pull Requests for Swag
 ----------------------
 We love pull requests, so to encourage more of them we are offering
-awesome swag. Only SIGNIFICANT pull requests count. Fixing a comma
+awesome swag. Only significant pull requests count. Fixing a comma
 doesn’t count, but fixing a bug, adding more test coverage, or writing
-guides & documentation does.
+guides and documentation does.
 
 - Make 1x pull requests to get into the contributors list and website
-- Make 2x pull requests, we will send you a packet of stickers
-- Make 5x pull requests, and we will send you a t-shirt and more stickers
-- Make 10x pull requests, and you get a job interview with James + other swag
+- Make 2x pull requests and we will send you a packet of stickers
+- Make 5x pull requests and we will send you a t-shirt and more stickers
+- Make 10x pull requests, and you'll get a job interview + other swag
 
-If we miss a milestones (probably because we are working hard), just let
-us know so we can get you your swag. 
+If we miss a milestone, just let us know so we can get you your swag. 
 
 Style Guide
 -----------

ISSUE_TEMPLATE.md

@@ -9,7 +9,7 @@ Replace the values below using the output from `storjshare --version`.
 Replace the values below using the output from `node --version`.
 
 ```
-6.9.1
+v8.x.x
 ```
 
 ### Expected Behavior

README.md

@@ -1,3 +1,5 @@
+_**Notice**: Development on this repo is on pause until we finish our v3 rearchitecture. Please see https://github.com/storj/storj for ongoing v3 development._
+
 Storj Share Daemon
 ==================
 
@@ -19,7 +21,7 @@ storjshare daemon is also available for Arch Linux as a package on the AUR as [s
 Make sure you have the following prerequisites installed:
 
 * Git
-* Node.js LTS (6.9.x)
+* Node.js LTS (8.x.x)
 * NPM
 * Python 2.7
 * GCC/G++/Make
@@ -63,7 +65,7 @@ Red Hat / Centos
 ```
 yum groupinstall 'Development Tools'
 ```
-You might also find yourself lacking a C++11 compiler - [see this](http://hiltmon.com/blog/2015/08/09/c-plus-plus-11-on-centos-6-dot-6/)
+You might also find yourself lacking a C++11 compiler - [see this](https://hiltmon.com/blog/2015/08/09/c-plus-plus-11-on-centos-6-dot-6/)
 
 #### Mac OSX
 
@@ -79,6 +81,8 @@ npm install --global windows-build-tools
 
 ---
 
+### Install ###
+
 Once build dependencies have been installed for your platform, install the
 package globally using Node Package Manager:
 

bin/storjshare-create.js

@@ -43,11 +43,11 @@ function whichEditor() {
 }
 
 storjshare_create
-  .description('generates a new share configuration')
+  .description('generates a new node configuration')
   .option('--storj <addr>', 'specify the STORJ address (required)')
   .option('--key <privkey>', 'specify the private key')
   .option('--storage <path>', 'specify the storage path')
-  .option('--size <maxsize>', 'specify share size (ex: 10GB, 1TB)')
+  .option('--size <maxsize>', 'specify node size (ex: 10GB, 1TB)')
   .option('--rpcport <port>', 'specify the rpc port number')
   .option('--rpcaddress <addr>', 'specify the rpc address')
   .option('--maxtunnels <tunnels>', 'specify the max tunnels')

bin/storjshare-destroy.js

@@ -7,8 +7,8 @@ const utils = require('../lib/utils');
 const storjshare_destroy = require('commander');
 
 storjshare_destroy
-  .description('stops a running share and removes it from status')
-  .option('-i, --nodeid <nodeid>', 'id of the managed share')
+  .description('stops a running node and removes it from status')
+  .option('-i, --nodeid <nodeid>', 'id of the managed node')
   .option('-r, --remote <hostname:port>',
     'hostname and optional port of the daemon')
   .parse(process.argv);

bin/storjshare-killall.js

@@ -7,7 +7,7 @@ const utils = require('../lib/utils');
 const storjshare_killall = require('commander');
 
 storjshare_killall
-  .description('destroys all running shares and stop daemon')
+  .description('destroys all running nodes and stop daemon')
   .option('-r, --remote <hostname:port>',
     'hostname and optional port of the daemon')
   .parse(process.argv);

bin/storjshare-load.js

@@ -9,7 +9,7 @@ const utils = require('../lib/utils');
 const storjshare_load = require('commander');
 
 storjshare_load
-  .description('loads a snapshot of shares and starts all of them')
+  .description('loads a snapshot of nodes and starts all of them')
   .option('-s, --snapshot <path>', 'path to load the snapshot file')
   .option('-r, --remote <hostname:port>',
     'hostname and optional port of the daemon')

bin/storjshare-logs.js

@@ -12,8 +12,8 @@ const path = require('path');
 const FsLogger = require('fslogger');
 
 storjshare_logs
-  .description('tails the logs for the given share id')
-  .option('-i, --nodeid <nodeid>', 'id of the running share')
+  .description('tails the logs for the given node id')
+  .option('-i, --nodeid <nodeid>', 'id of the running node')
   .option('-l, --lines <num>', 'lines back to print')
   .option('-r, --remote <hostname:port>',
     'hostname and optional port of the daemon')

bin/storjshare-restart.js

@@ -7,9 +7,9 @@ const utils = require('../lib/utils');
 const storjshare_restart = require('commander');
 
 storjshare_restart
-  .description('restarts the running share specified')
-  .option('-i, --nodeid <nodeid>', 'id of the running share')
-  .option('-a, --all', 'restart all running shares')
+  .description('restarts the running node specified')
+  .option('-i, --nodeid <nodeid>', 'id of the running node')
+  .option('-a, --all', 'restart all running nodes')
   .option('-r, --remote <hostname:port>',
     'hostname and optional port of the daemon')
   .parse(process.argv);
@@ -30,7 +30,7 @@ if (storjshare_restart.remote) {
 
 utils.connectToDaemon(port, function(rpc, sock) {
   if (storjshare_restart.all) {
-    console.info('\n  * restarting all managed shares');
+    console.info('\n  * restarting all managed nodes');
   }
 
   rpc.restart(storjshare_restart.nodeid || '*', (err) => {
@@ -42,7 +42,7 @@ utils.connectToDaemon(port, function(rpc, sock) {
     if (storjshare_restart.nodeid) {
       console.info(`\n  * share ${storjshare_restart.nodeid} restarted`);
     } else {
-      console.info('\n  * all shares restarted successfully');
+      console.info('\n  * all nodes restarted successfully');
     }
 
     sock.end();

bin/storjshare-save.js

@@ -9,7 +9,7 @@ const utils = require('../lib/utils');
 const storjshare_save = require('commander');
 
 storjshare_save
-  .description('saves a snapshot of shares')
+  .description('saves a snapshot of nodes')
   .option('-s, --snapshot <path>', 'path to write the snapshot file')
   .option('-r, --remote <hostname:port>',
     'hostname and optional port of the daemon')

bin/storjshare-start.js

@@ -9,9 +9,9 @@ const config = require('../lib/config/daemon');
 const storjshare_start = require('commander');
 
 storjshare_start
-  .description('starts a new network share')
+  .description('starts a new network node')
   .option('-c, --config <path>', 'specify the configuration path')
-  .option('-d, --detached', 'run share without management from daemon')
+  .option('-d, --detached', 'run node without management from daemon')
   .option('-u, --unsafe', 'ignore system resource guards')
   .option('-r, --remote <hostname:port>',
     'hostname and optional port of the daemon')
@@ -49,10 +49,10 @@ function runManagedShare() {
   utils.connectToDaemon(port, function(rpc, sock) {
     rpc.start(configPath, (err) => {
       if (err) {
-        console.error(`\n  failed to start share, reason: ${err.message}`);
+        console.error(`\n  failed to start node, reason: ${err.message}`);
         return sock.end();
       }
-      console.info(`\n  * starting share with config at ${configPath}`);
+      console.info(`\n  * starting node with config at ${configPath}`);
       sock.end();
     }, storjshare_start.unsafe);
   }, address);

bin/storjshare-status.js

@@ -10,20 +10,23 @@ const colors = require('colors/safe');
 const storjshare_status = require('commander');
 
 storjshare_status
-  .description('prints the status of all managed shares')
+  .description('prints the status of all managed nodes')
   .option('-r, --remote <hostname:port>',
     'hostname and optional port of the daemon')
   .option('-j, --json',
-    'JSON formatted status of all managed shares')
+    'JSON formatted status of all managed nodes')
   .parse(process.argv);
 
 function getColoredValue(status, value) {
   switch (status) {
     case 0:
+      // good to go
       return colors.green(value);
     case 1:
-      return colors.yellow(value);
+      //mark Tunnel Connections as bad
+      return colors.red(value);
     case 2:
+      //Not Connected - Private NET
       return colors.red(value);
     default:
       return value;
@@ -80,7 +83,7 @@ function prepareJson(shares) {
     json[i].uptime = prettyMs(share.meta.uptimeMs);
     json[i].restarts = share.meta.numRestarts || 0;
     json[i].peers = share.meta.farmerState.totalPeers || 0;
-    json[i].offers = fixContractValue(
+    json[i].allocs = fixContractValue(
       share.meta.farmerState.contractCount
     );
     json[i].dataReceivedCount = fixContractValue(
@@ -122,8 +125,8 @@ utils.connectToDaemon(port, function(rpc, sock) {
       console.log(json);
     } else {
       let table = new Table({
-        head: ['Share', 'Status', 'Uptime', 'Restarts', 'Peers',
-          'Offers', 'Delta', 'Port', 'Shared', 'Bridges'],
+        head: ['Node', 'Status', 'Uptime', 'Restarts', 'Peers',
+          'Allocs', 'Delta', 'Port', 'Shared', 'Bridges'],
         style: {
           head: ['cyan', 'bold'],
           border: []

bin/storjshare-stop.js

@@ -7,8 +7,8 @@ const utils = require('../lib/utils');
 const storjshare_stop = require('commander');
 
 storjshare_stop
-  .description('stops the running share specified')
-  .option('-i, --nodeid <nodeid>', 'id of the running share')
+  .description('stops the running node specified')
+  .option('-i, --nodeid <nodeid>', 'id of the running node')
   .option('-r, --remote <hostname:port>',
     'hostname and optional port of the daemon')
   .parse(process.argv);

bin/storjshare.js

@@ -26,10 +26,10 @@ storjshare
   .command('status', 'check status of node(s)')
   .command('logs', 'tail the logs for a node')
   .command('create', 'create a new configuration')
-  .command('save', 'snapshot the currently managed shares')
-  .command('load', 'load a snapshot of previously managed shares')
+  .command('save', 'snapshot the currently managed node')
+  .command('load', 'load a snapshot of previously managed nodes')
   .command('destroy', 'kills the farming node')
-  .command('killall', 'kills all shares and stops the daemon')
+  .command('killall', 'kills all nodes and stops the daemon')
   .command('daemon', 'starts the daemon')
   .parse(process.argv);
 

dockerfiles/get_dep_ver.ps1

@@ -17,7 +17,7 @@ $version = $version.Substring($pos+1)
 Write-Host "Found Latest Version of Git for Windows - ${version}"
 $env:MINGIT_VERSION = "${version}"
 
-$node_base_ver = 6
+$node_base_ver = 8
 $arch_ver = "-x64"
 $uri = "https://nodejs.org/dist/latest-v${node_base_ver}.x/"
 $site = invoke-webrequest $uri -DisableKeepAlive -UseBasicParsing

dockerfiles/storjshare-daemon-alpine.dockerfile

@@ -1,4 +1,4 @@
-FROM node:boron-alpine
+FROM node:alpine
 MAINTAINER Storj Labs (storj.io)
 
 RUN apk add --no-cache bash g++ git make openssl-dev python vim && \

dockerfiles/storjshare-daemon-ubuntu.dockerfile

@@ -3,7 +3,7 @@ MAINTAINER Storj Labs (www.storj.io)
 
 RUN apt-get update && \
 apt-get -y install apt-utils curl && \
-curl -sL https://deb.nodesource.com/setup_6.x | bash - && \
+curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
 apt-get -y install build-essential git libssl-dev nodejs python vim && \
 npm install --global storjshare-daemon --unsafe-perm && \
 apt-get --purge remove -y apt-utils build-essential curl git libssl-dev python vim && \

example/farmer.config.json

@@ -34,14 +34,14 @@
   "doNotTraverseNat": false,
   // Maximum number of tunnels to provide to the network
   // Tunnels help nodes with restrictive network configurations participate
-  "maxTunnels": 3,
+  "maxTunnels": 0,
   // Maximum number of concurrent connections to allow
   "maxConnections": 150,
   // If providing tunnels, the starting and ending port range to open for
   // them
   "tunnelGatewayRange": {
-    "min": 4001,
-    "max": 4003
+    "min": 0,
+    "max": 0
   },
   // Number of times to retry joining the network and the wait time between
   "joinRetry": {