From a4404e432a7370a2958192a45f38be87fb5c37fd Mon Sep 17 00:00:00 2001
From: Sky Young <sky@alexandria.io>
Date: Fri, 18 May 2018 15:53:45 -0700
Subject: [PATCH] Update pool matching

---
 lib/blocks.js |   4 +-
 package.json  |   2 +-
 pools.json    | 237 ++------------------------------------------------
 3 files changed, 12 insertions(+), 231 deletions(-)

diff --git a/lib/blocks.js b/lib/blocks.js
index e8756bf..5ab967f 100644
--- a/lib/blocks.js
+++ b/lib/blocks.js
@@ -342,10 +342,10 @@ BlockController.prototype.getPoolInfo = function(tx) {
   if (!tx) {
     return {};
   }
-  var coinbaseBuffer = tx.inputs[0].script.raw;
+  var strFloData = tx.inputs[0].floData;
 
   for(var k in this.poolStrings) {
-    if (coinbaseBuffer.toString('utf-8').match(k)) {
+    if (strFloData.match(k)) {
       return this.poolStrings[k];
     }
   }
diff --git a/package.json b/package.json
index b4a3418..08dc49d 100644
--- a/package.json
+++ b/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.54",
+  "version": "5.0.0-beta.55",
   "repository": "git://github.com/bitpay/flosight-api.git",
   "bugs": {
     "url": "https://github.com/bitpay/flosight-api/issues"
diff --git a/pools.json b/pools.json
index a1d840e..cd0f0ad 100644
--- a/pools.json
+++ b/pools.json
@@ -1,242 +1,23 @@
 [
   {
-    "poolName": "50BTC",
-    "url": "https://50btc.com/",
+    "poolName": "Mining Dutch",
+    "url": "https://www.mining-dutch.nl",
     "searchStrings": [
-      "50BTC.com",
-      "50btc.com"
+      "https://www.mining-dutch.nl"
     ]
   },
   {
-    "poolName": "175btc",
-    "url": "http://www.175btc.com/",
+    "poolName": "SuprNova",
+    "url": "https://flo.suprnova.cc",
     "searchStrings": [
-      "Mined By 175btc.com"
+      "https://flo.suprnova.cc"
     ]
   },
   {
-    "poolName": "ASICminer",
-    "url": "https://florincointalk.org/index.php?topic=99497.0",
+    "poolName": "TheCoin",
+    "url": "http://thecoin.pw",
     "searchStrings": [
-      "Mined By ASICMiner"
-    ]
-  },
-  {
-    "poolName": "AntMiner",
-    "url": "https://bitmaintech.com/",
-    "searchStrings": [
-      "AntPool"
-    ]
-  },
-  {
-    "poolName": "agentD",
-    "url": "http://",
-    "searchStrings": [
-      "agentD"
-    ]
-  },
-  {
-    "poolName": "Bitfury",
-    "url": "http://bitfury.org/",
-    "searchStrings": [
-      "2av0id51pct"
-    ]
-  },
-  {
-    "poolName": "BitMinter",
-    "url": "https://bitminter.com/",
-    "searchStrings": [
-      "BitMinter"
-    ]
-  },
-  {
-    "poolName": "Bitparking",
-    "url": "http://bitparking.com/",
-    "searchStrings": [
-      "bitparking"
-    ]
-  },
-  {
-    "poolName": "BTC Guild",
-    "url": "https://www.btcguild.com/",
-    "searchStrings": [
-      "Mined by BTC Guild",
-      "BTC Guild"
-    ]
-  },
-  {
-    "poolName": "bcpool.io",
-    "url": "https://bcpool.io/",
-    "searchStrings": [
-      "bcpool"
-    ]
-  },
-  {
-    "poolName": "Discus Fish",
-    "url": "http://f2pool.com/",
-    "searchStrings": [
-      "七彩神仙鱼",
-      "Made in China",
-      "Mined by user"
-    ]
-  },
-  {
-    "poolName": "Discus Fish Solo",
-    "url": "http://f2pool.com/",
-    "searchStrings": [
-      "For Pierce and Paul"
-    ]
-  },
-  {
-    "poolName": "Cointerra",
-    "url": "http://cointerra.com/",
-    "searchStrings": [
-      "cointerra"
-    ]
-  },
-  {
-    "poolName": "Eligius",
-    "url": "http://eligius.st/",
-    "searchStrings": [
-      "Eligius"
-    ]
-  },
-  {
-    "poolName": "EclipseMC",
-    "url": "https://eclipsemc.com/",
-    "searchStrings": [
-      "Josh Zerlan was here!",
-      "EclipseMC",
-      "Aluminum Falcon"
-    ]
-  },
-  {
-    "poolName": "GIVE-ME-COINS",
-    "url": "https://give-me-coins.com/",
-    "searchStrings": [
-      "Mined at GIVE-ME-COINS.com"
-    ]
-  },
-  {
-    "poolName": "ghash.io",
-    "url": "https://ghash.io/",
-    "searchStrings": [
-      "ghash.io",
-      "GHash.IO"
-    ]
-  },
-  {
-    "poolName": "HHTT",
-    "url": "http://hhtt.1209k.com/",
-    "searchStrings": [
-      "HHTT"
-    ]
-  },
-  {
-    "poolName": "KNCminer",
-    "url": "https://www.kncminer.com/",
-    "searchStrings": [
-      "KnCMiner"
-    ]
-  },
-  {
-    "poolName": "Megabigpower",
-    "url": "http://megabigpower.com/",
-    "searchStrings": [
-      "megabigpower.com"
-    ]
-  },
-  {
-    "poolName": "MultiCoin",
-    "url": "https://multicoin.co/",
-    "searchStrings": [
-      "MultiCoin.co"
-    ]
-  },
-  {
-    "poolName": "Mt Red",
-    "url": "https://mtred.com/‎",
-    "searchStrings": [
-      "/mtred/"
-    ]
-  },
-  {
-    "poolName": "MaxBTC",
-    "url": "https://www.maxbtc.com",
-    "searchStrings": [
-      "MaxBTC"
-    ]
-  },
-  {
-    "poolName": "NMCbit",
-    "url": "http://nmcbit.com/",
-    "searchStrings": [
-      "nmcbit.com"
-    ]
-  },
-  {
-    "poolName": "ozcoin",
-    "url": "https://ozco.in/",
-    "searchStrings": [
-      "ozco.in",
-      "ozcoin"
-    ]
-  },
-  {
-    "poolName": "Polmine.pl",
-    "url": "https://polmine.pl",
-    "searchStrings": [
-      "by polmine.pl"
-    ]
-  },
-  {
-    "poolName": "simplecoin",
-    "url": "http://simplecoin.us/",
-    "searchStrings": [
-      "simplecoin.us ftw"
-    ]
-  },
-  {
-    "poolName": "SlushPool",
-    "url": "https://slushpool.com/",
-    "searchStrings": [
-      "/slush/"
-    ]
-  },
-  {
-    "poolName": "TripleMining",
-    "url": "https://www.triplemining.com/",
-    "searchStrings": [
-      "Triplemining.com"
-    ]
-  },
-  {
-    "poolName": "wizkid057",
-    "url": "http://wizkid057.com/btc",
-    "searchStrings": [
-      "wizkid057"
-    ]
-  },
-  {
-    "poolName": "Yourbtc.net",
-    "url": "http://yourbtc.net/",
-    "searchStrings": [
-      "yourbtc.net"
-    ]
-  },
-  {
-    "poolName": "BTCChina Pool",
-    "url": "https://pool.btcchina.com/",
-    "searchStrings": [
-      "BTCChina Pool",
-      "btcchina.com"
-    ]
-  },
-  {
-    "poolName":"BTCC Pool",
-    "url":"https://pool.btcc.com/",
-    "searchStrings":[
-      "/BTCC/"
+      "http://thecoin.pw"
     ]
   }
 ]