Merge pull request #2 from oipwg/update-fcoin

Update fcoin to 1.1.0

lib/blocks.js

@@ -153,7 +153,7 @@ BlockController.prototype.transformBlock = function(block, info) {
   });
 
   // MerkleRoot is backwards hex data in the block object, flip before returning
-  var merkleRoot = block.merkleRoot;
+  var merkleRoot = block.getMerkleRoot('hex');
 
   var strArray = merkleRoot.match(/.{1,2}/g);
   var reversedArray = strArray.reverse();
@@ -238,7 +238,7 @@ BlockController.prototype._getBlockSummary = function(hash, moreTimestamp, next)
         return next();
       }
 
-      var block = bcoin.block.fromRaw(blockBuffer, 'hex');
+      var block = bcoin.Block.fromRaw(blockBuffer, 'hex');
 
       // if we don't we a block header back, this is highly unusual,
       // but possible if there was a very recent reorg and the header

package.json

@@ -1,7 +1,7 @@
 {
   "name": "flosight-api",
   "description": "A Florincoin blockchain REST and web socket API service for Flocore Node.",
-  "version": "5.0.0-beta.72",
+  "version": "5.0.0-beta.73",
   "repository": "git://github.com/bitpay/flosight-api.git",
   "bugs": {
     "url": "https://github.com/bitpay/flosight-api/issues"
@@ -30,9 +30,9 @@
   "dependencies": {
     "JSONStream": "^1.3.1",
     "async": "*",
-    "fcoin": "1.0.0-beta.20",
-    "flocore-lib": "0.15.1",
-    "flocore-message": "^1.0.6",
+    "fcoin": "^1.1.0",
+    "flocore-lib": "^0.15.2",
+    "flocore-message": "^1.0.7",
     "body-parser": "^1.13.3",
     "compression": "^1.6.1",
     "lodash": "^2.4.1",
@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "florincoind-rpc": "0.7.1",
-    "flocore-p2p": "5.0.0-beta.5",
+    "flocore-p2p": "^5.0.0-beta.8",
     "chai": "^3.5.0",
     "mkdirp": "^0.5.1",
     "mocha": "^2.4.5",

pools.json

@@ -59,10 +59,25 @@
     "poolName": "Medici Land",
     "url": "https://pool.mediciland.com",
     "searchStrings": [
+      "mlg",
       "MLG",
       "medici",
       "Medici",
       "https://pool.mediciland.com"
     ]
+  },
+  {
+    "poolName": "hashing.com",
+    "url": "https://hashing.com",
+    "searchStrings": [
+      "hashing.com"
+    ]
+  },
+  {
+    "poolName": "coinminerz",
+    "url": "https://coinminerz.com",
+    "searchStrings": [
+      "https://coinminerz.com"
+    ]
   }
 ]