From ab7579ccac4c0f19429279c9d086832c6e65ee4d Mon Sep 17 00:00:00 2001 From: Sky Young Date: Fri, 19 Jul 2019 14:51:58 -0600 Subject: [PATCH 1/7] Update fcoin --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index af03cbf..c7ebd77 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "dependencies": { "JSONStream": "^1.3.1", "async": "*", - "fcoin": "1.0.0-beta.20", + "fcoin": "https://github.com/OstlerDev/fcoin#bcoin-1.0.2", "flocore-lib": "0.15.1", "flocore-message": "^1.0.6", "body-parser": "^1.13.3", From 4804e44446c62b6f57185febcfecb872feb5cff9 Mon Sep 17 00:00:00 2001 From: Sky Young Date: Mon, 22 Jul 2019 17:23:52 -0600 Subject: [PATCH 2/7] Increase flocore-lib version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c7ebd77..3675cdd 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "JSONStream": "^1.3.1", "async": "*", "fcoin": "https://github.com/OstlerDev/fcoin#bcoin-1.0.2", - "flocore-lib": "0.15.1", + "flocore-lib": "^0.15.2", "flocore-message": "^1.0.6", "body-parser": "^1.13.3", "compression": "^1.6.1", From 474685d7c197cc81aa8484d380d64982f228b661 Mon Sep 17 00:00:00 2001 From: Sky Young Date: Tue, 23 Jul 2019 12:07:15 -0600 Subject: [PATCH 3/7] Use correct bcoin Block export --- lib/blocks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/blocks.js b/lib/blocks.js index d2ee84d..be04d1d 100644 --- a/lib/blocks.js +++ b/lib/blocks.js @@ -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 From db1152fed93079955755735067741379a939e566 Mon Sep 17 00:00:00 2001 From: Sky Young Date: Tue, 23 Jul 2019 12:20:48 -0600 Subject: [PATCH 4/7] Verify merkle root exists before matching on it --- lib/blocks.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/blocks.js b/lib/blocks.js index be04d1d..e9f82c6 100644 --- a/lib/blocks.js +++ b/lib/blocks.js @@ -155,14 +155,16 @@ BlockController.prototype.transformBlock = function(block, info) { // MerkleRoot is backwards hex data in the block object, flip before returning var merkleRoot = block.merkleRoot; - var strArray = merkleRoot.match(/.{1,2}/g); - var reversedArray = strArray.reverse(); - var builtStr = ""; - for (var str of reversedArray){ - builtStr += str; - } + if (merkleRoot) { + var strArray = merkleRoot.match(/.{1,2}/g); + var reversedArray = strArray.reverse(); + var builtStr = ""; + for (var str of reversedArray){ + builtStr += str; + } - merkleRoot = builtStr + merkleRoot = builtStr + } return { hash: block.rhash(), From 9c0b36b9652a22aef3be69393fd700c2988d6b59 Mon Sep 17 00:00:00 2001 From: Sky Young Date: Tue, 23 Jul 2019 12:23:15 -0600 Subject: [PATCH 5/7] Get the hex version of the blocks merkle root --- lib/blocks.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/blocks.js b/lib/blocks.js index e9f82c6..05a0d91 100644 --- a/lib/blocks.js +++ b/lib/blocks.js @@ -153,19 +153,17 @@ 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'); - if (merkleRoot) { - var strArray = merkleRoot.match(/.{1,2}/g); - var reversedArray = strArray.reverse(); - var builtStr = ""; - for (var str of reversedArray){ - builtStr += str; - } - - merkleRoot = builtStr + var strArray = merkleRoot.match(/.{1,2}/g); + var reversedArray = strArray.reverse(); + var builtStr = ""; + for (var str of reversedArray){ + builtStr += str; } + merkleRoot = builtStr + return { hash: block.rhash(), size: block.getSize(), From e6f902dada2417fe09fd3506b2a850ed613b4cf6 Mon Sep 17 00:00:00 2001 From: Sky Young Date: Thu, 25 Jul 2019 10:43:24 -0600 Subject: [PATCH 6/7] Add a couple pools --- pools.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pools.json b/pools.json index 4405bad..1d88785 100644 --- a/pools.json +++ b/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" + ] } ] From 4948e4e2658e110f9cc787411f6375037a81854e Mon Sep 17 00:00:00 2001 From: Sky Young Date: Thu, 25 Jul 2019 10:45:30 -0600 Subject: [PATCH 7/7] Update fcoin version --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 3675cdd..46610e4 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.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": "https://github.com/OstlerDev/fcoin#bcoin-1.0.2", + "fcoin": "^1.1.0", "flocore-lib": "^0.15.2", - "flocore-message": "^1.0.6", + "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",