Adds new gateway' status fn retrieving a PeerId from HTTP /node/status API.

Updates to version 0.22.0

Author: EnchanterIO

build/src/gateway/storage.js

@@ -20,6 +20,7 @@ var ADD_RAW_WITH_ACL_PATH = "/storage/add-raw-with-acl";
 var FETCH_FILE_PATH = "/storage/fetch";
 var STREAM_FILE_PATH = "/storage/stream";
 var META_PATH = "/storage/meta";
+var STATUS_PATH = "/storage/status";
 
 var request = require('../http/request');
 
@@ -251,6 +252,19 @@ module.exports = function (gwDomain) {
           'Content-Type': 'application/json'
         }
       });
+    },
+
+    /**
+     * Fetch information about the Smart Vault node.
+     *
+     * @returns {Promise<{ peer_id: <string>, }>}
+     */
+    status: function status() {
+      return request.get("".concat(gwDomain).concat(STATUS_PATH), {}, {
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      });
     }
   };
 };

build/src/gsn/index.js

@@ -157,6 +157,8 @@ function () {
             throw new Error("Invalid \"amountInPht\" value ".concat(amountInPht, ". Expected a float number"));
 
           case 11:
+            // IMPORTANT: Amount cannot be higher than 10% relay server address balance
+            // @TODO: Verify assumption and implement validation
             maxFundingValueInPht = 100;
 
             if (!(parseFloat(amountInPht) > maxFundingValueInPht)) {
@@ -173,7 +175,6 @@ function () {
               from: from,
               recipient: recipient,
               relayHubAddress: relayHub,
-              // IMPORTANT: Amount cannot be higher than relay server address balance (@TODO: Implement validation)
               amount: web3Utils.toWei(amountInPht, "ether")
             });
 

build/src/leth/storage.js

@@ -1,5 +1,7 @@
 "use strict";
 
+function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure undefined"); }
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -67,4 +69,41 @@ function () {
   return function (_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };
+}();
+/**
+ * Fetch information about the Smart Vault node.
+ *
+ * @returns {Promise<{ peer_id: <string>, }>}
+ */
+
+
+module.exports.status =
+/*#__PURE__*/
+function () {
+  var _ref3 = _asyncToGenerator(
+  /*#__PURE__*/
+  regeneratorRuntime.mark(function _callee2(web3, gatewayStorage, _ref4) {
+    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _objectDestructuringEmpty(_ref4);
+
+            _context2.next = 3;
+            return gatewayStorage.status();
+
+          case 3:
+            return _context2.abrupt("return", _context2.sent);
+
+          case 4:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+
+  return function (_x4, _x5, _x6) {
+    return _ref3.apply(this, arguments);
+  };
 }();

build/src/leth/token.js

@@ -17,12 +17,12 @@ function () {
   var _ref = _asyncToGenerator(
   /*#__PURE__*/
   regeneratorRuntime.mark(function _callee2(web3, _ref2) {
-    var address, tokenBlocksLifespan;
+    var address, tokenBlocksLifespan, peerId;
     return regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            address = _ref2.address, tokenBlocksLifespan = _ref2.tokenBlocksLifespan;
+            address = _ref2.address, tokenBlocksLifespan = _ref2.tokenBlocksLifespan, peerId = _ref2.peerId;
             return _context2.abrupt("return", new Promise(
             /*#__PURE__*/
             function () {
@@ -42,7 +42,8 @@ function () {
                         currentBlock = _context.sent;
                         expirationBlock = currentBlock + tokenBlocksLifespan;
                         claims = {
-                          blockchain: "ETH",
+                          blockchain: "PHT",
+                          peer_id: peerId,
                           eth_address: address,
                           iat: currentBlock,
                           eat: expirationBlock

example/gateway-browser/src/index.jsx

@@ -20,7 +20,7 @@ const root = document.getElementById('root');
 // AWFUL HACK caused of a unknown issue with Webpack-dotenv
 window.process = {
   'env': {
-    WEB3_PROVIDER: 'http://localhost:8545'
+    WEB3_PROVIDER: 'http://localhost:8645'
     // WEB3_PROVIDER: 'ws://localhost:8546'
   }
 };

example/gateway-browser/src/pages/Storage.jsx

@@ -21,6 +21,7 @@ class SimpleReactFileUpload extends Component {
     this.onStorageFormFileChange = this.onStorageFormFileChange.bind(this);
 
     this.onACLFormSubmit = this.onACLFormSubmit.bind(this);
+    this.onStatusFormSubmit = this.onStatusFormSubmit.bind(this);
 
     this.onACLGrantRead = this.onACLGrantRead.bind(this);
     this.onACLGrantWrite = this.onACLGrantWrite.bind(this);
@@ -32,6 +33,7 @@ class SimpleReactFileUpload extends Component {
     this.onHasRead = this.onHasRead.bind(this);
     this.onHasAdmin = this.onHasAdmin.bind(this);
     this.onGetOwner = this.onGetOwner.bind(this);
+    this.onGetStatus = this.onGetStatus.bind(this);
   }
 
   componentDidMount() {
@@ -74,6 +76,10 @@ class SimpleReactFileUpload extends Component {
     e.preventDefault();
   }
 
+  onStatusFormSubmit(e) {
+    e.preventDefault();
+  }
+
   onACLGrantRead() {
     const { web3, owner, account, acl } = this.state;
 
@@ -164,12 +170,24 @@ class SimpleReactFileUpload extends Component {
       .catch(console.log)
   }
 
+  onGetStatus() {
+    const { peerId } = this.state;
+
+    Leth.Storage.status(web3, this.gateway.storage)
+      .then((res) => {
+        console.log(res);
+
+        this.setState({ peerId: res.peer_id });
+      })
+      .catch(console.log)
+  }
+
   onStorageFormFileChange(e) {
     this.setState({ file: e.target.files[0] })
   }
 
   render() {
-    const {owner, account, gatewayUrl, meta, acl, grantReadMsg } = this.state;
+    const {owner, account, gatewayUrl, meta, peerId, acl, grantReadMsg } = this.state;
 
     return (
       <div>
@@ -207,6 +225,14 @@ class SimpleReactFileUpload extends Component {
           <p>
             <strong>{grantReadMsg}</strong>
           </p>
+
+        <h3>Status:</h3>
+        <p>PeerId: {peerId}</p>
+        <p>
+          <form onSubmit={this.onStatusFormSubmit}>
+            <button type="submit" onClick={this.onGetStatus}>What's the node's status?</button>
+          </form>
+          </p>
         </p>
       </div>
     )

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lightstreams-js-sdk",
-  "version": "0.20.0",
+  "version": "0.22.0",
   "description": "Lightstreams JS SDK for building mainstream DApps with support for Programmable Decentralized Private Storage.",
   "author": "Gabriel Garrido",
   "contributors": [

src/gateway/storage.js

@@ -12,6 +12,7 @@ const ADD_RAW_WITH_ACL_PATH = `/storage/add-raw-with-acl`;
 const FETCH_FILE_PATH = `/storage/fetch`;
 const STREAM_FILE_PATH = `/storage/stream`;
 const META_PATH = `/storage/meta`;
+const STATUS_PATH = `/storage/status`;
 
 const request = require('../http/request');
 const {validateCid} = require('../leth/cid');
@@ -230,5 +231,18 @@ module.exports = (gwDomain) => ({
       },
     });
   },
+
+  /**
+   * Fetch information about the Smart Vault node.
+   *
+   * @returns {Promise<{ peer_id: <string>, }>}
+   */
+  status: () => {
+    return request.get(`${gwDomain}${STATUS_PATH}`, {
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    });
+  },
 });
 

src/leth/storage.js

@@ -27,3 +27,12 @@ module.exports.add = async (web3, gatewayStorage, { from, owner, file, isPublic
 
   return await gatewayStorage.addWithAcl(owner, receipt.contractAddress, file);
 };
+
+/**
+ * Fetch information about the Smart Vault node.
+ *
+ * @returns {Promise<{ peer_id: <string>, }>}
+ */
+module.exports.status = async (web3, gatewayStorage) => {
+  return await gatewayStorage.status();
+};