RanchiMall/flosight-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from oipwg/update-fcoin

Browse Source 
Update fcoin to 1.1.0
This commit is contained in:
Sky Young 2019-07-25 10:47:54 -06:00 committed by GitHub
commit 1169352233
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/blocks.js
View File

@ -153,7 +153,7 @@ BlockController.prototype.transformBlock = function(block, info) {
}); });
// MerkleRoot is backwards hex data in the block object, flip before returning // 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 strArray = merkleRoot.match(/.{1,2}/g);
var reversedArray = strArray.reverse(); var reversedArray = strArray.reverse();
@ -238,7 +238,7 @@ BlockController.prototype._getBlockSummary = function(hash, moreTimestamp, next)
return 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, // 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 // but possible if there was a very recent reorg and the header

10
package.json
View File

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

15
pools.json
View File

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