From d8da495b385a41e0ee23b50d0aa585b3f7de2876 Mon Sep 17 00:00:00 2001 From: Sky Young Date: Wed, 8 Jan 2020 16:14:59 -0700 Subject: [PATCH 1/4] Fix Regtest Support! --- lib/services/header/index.js | 7 +++++++ lib/services/p2p/index.js | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/services/header/index.js b/lib/services/header/index.js index d4e57dac..b4c2fb1c 100644 --- a/lib/services/header/index.js +++ b/lib/services/header/index.js @@ -159,6 +159,13 @@ HeaderService.prototype._setGenesisBlock = function(callback) { merkleRoot: '730f0c8ddc5a592d5512566890e2a73e45feaa6748b24b849d1c29a7ab2b2300' }; + if (this.GENESIS_HASH === 'ec42fa26ca6dcb1103b59a1d24b161935ea4566f8d5736db8917d5b9a8dee0d7') { + genesisHeader.bits = 0x207fffff + genesisHeader.timestamp = 1371387277 + genesisHeader.nonce = 0 + genesisHeader.chainwork = '0000000000000000000000000000000000000000000000000000000000000000' + } + this._lastHeader = genesisHeader; var dbOps = [ diff --git a/lib/services/p2p/index.js b/lib/services/p2p/index.js index 322a50cb..9748ceff 100644 --- a/lib/services/p2p/index.js +++ b/lib/services/p2p/index.js @@ -443,7 +443,7 @@ P2P.prototype._startBcoin = function(callback) { port = this._configPeers[0].port || 17312; } else { network = this.node.network; - port = this._configPeers[0].port || 48444; + port = this._configPeers[0].port || 17412; } this._bcoin = new Bcoin({ From 1eb2dbf29a12812d85d44a7be1cf7697335b5e4d Mon Sep 17 00:00:00 2001 From: Sky Young Date: Thu, 9 Jan 2020 09:11:32 -0700 Subject: [PATCH 2/4] v5.0.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c0546454..076c5b19 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "node": ">=8.0.0" }, "author": "BitPay ", - "version": "5.0.6", + "version": "5.0.7", "main": "./index.js", "repository": "git://github.com/oipwg/flocore-node.git", "homepage": "https://github.com/oipwg/flocore-node", From 80912cc83fc6e002367cfc678688a5cdb1d3f7ee Mon Sep 17 00:00:00 2001 From: Sky Young Date: Thu, 9 Jan 2020 11:52:03 -0700 Subject: [PATCH 3/4] bump fcoin version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 076c5b19..eeea683c 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "commander": "^2.8.1", "errno": "^0.1.4", "express": "^4.13.3", - "fcoin": "^1.1.2", + "fcoin": "^1.1.3", "flocore-lib": "^0.15.2", "flocore-message": "^1.0.7", "flocore-p2p": "^5.0.0-beta.8", From a7c8cd456316fd96240ecf7372f33326c5145c7e Mon Sep 17 00:00:00 2001 From: Sky Young Date: Thu, 9 Jan 2020 12:02:17 -0700 Subject: [PATCH 4/4] Revert changes to header service --- lib/services/header/index.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/services/header/index.js b/lib/services/header/index.js index b4c2fb1c..d4e57dac 100644 --- a/lib/services/header/index.js +++ b/lib/services/header/index.js @@ -159,13 +159,6 @@ HeaderService.prototype._setGenesisBlock = function(callback) { merkleRoot: '730f0c8ddc5a592d5512566890e2a73e45feaa6748b24b849d1c29a7ab2b2300' }; - if (this.GENESIS_HASH === 'ec42fa26ca6dcb1103b59a1d24b161935ea4566f8d5736db8917d5b9a8dee0d7') { - genesisHeader.bits = 0x207fffff - genesisHeader.timestamp = 1371387277 - genesisHeader.nonce = 0 - genesisHeader.chainwork = '0000000000000000000000000000000000000000000000000000000000000000' - } - this._lastHeader = genesisHeader; var dbOps = [