From 3fc655daadf5bed0ccd36b7383f1eb646d394918 Mon Sep 17 00:00:00 2001 From: Ryno Mathee Date: Thu, 3 Nov 2016 14:11:05 +0200 Subject: [PATCH 1/4] Umbra network/block config --- lib/services/bitcoind.js | 4 ++-- package.json | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/services/bitcoind.js b/lib/services/bitcoind.js index 21480251a..5ac43e2d8 100644 --- a/lib/services/bitcoind.js +++ b/lib/services/bitcoind.js @@ -488,10 +488,10 @@ Bitcoin.prototype._initChain = function(callback) { Bitcoin.prototype._getDefaultConf = function() { var networkOptions = { - rpcport: 8332 + rpcport: 51737 }; if (this.node.network === bitcore.Networks.testnet) { - networkOptions.rpcport = 18332; + networkOptions.rpcport = 51997; } return networkOptions; }; diff --git a/package.json b/package.json index 4e02b7cf0..90967f4b2 100644 --- a/package.json +++ b/package.json @@ -31,8 +31,6 @@ "bitcoind": "./bin/bitcoind" }, "scripts": { - "preinstall": "./scripts/download", - "verify": "./scripts/download --skip-bitcoin-download --verify-bitcoin-download", "test": "mocha -R spec --recursive", "regtest": "./scripts/regtest", "jshint": "jshint --reporter=node_modules/jshint-stylish ./lib", From 8478118e0a9e380b27541504064c8f5f4fc623a4 Mon Sep 17 00:00:00 2001 From: Ryno Mathee Date: Thu, 3 Nov 2016 14:18:37 +0200 Subject: [PATCH 2/4] use correct bitcore-lib --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 90967f4b2..d4f4741cf 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "dependencies": { "async": "^1.3.0", "bitcoind-rpc": "^0.6.0", - "bitcore-lib": "^0.13.13", + "bitcore-lib": "shadowproject/bitcore-lib", "body-parser": "^1.13.3", "colors": "^1.1.2", "commander": "^2.8.1", From 2733ac2d87eb02122d91e1921ecd7c6a29951bae Mon Sep 17 00:00:00 2001 From: Ryno Mathee Date: Thu, 3 Nov 2016 14:25:37 +0200 Subject: [PATCH 3/4] Umbra bitcore changes --- lib/scaffold/create.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/scaffold/create.js b/lib/scaffold/create.js index c521602eb..e321ebe5a 100644 --- a/lib/scaffold/create.js +++ b/lib/scaffold/create.js @@ -19,8 +19,10 @@ var BASE_PACKAGE = { license: 'MIT', readme: 'README.md', dependencies: { - 'bitcore-lib': '^' + bitcore.version, - 'bitcore-node': version + //'bitcore-lib': '^' + bitcore.version, + //'bitcore-node': version + 'bitcore-lib': 'shadowproject/bitcore-lib', + 'bitcore-node': 'shadowproject/bitcore-node' } }; From 0cec6f9aaf845b10f4c500c573f50658d8cda3f5 Mon Sep 17 00:00:00 2001 From: Ryno Mathee Date: Thu, 3 Nov 2016 14:38:16 +0200 Subject: [PATCH 4/4] Use shadowcoind --- lib/scaffold/default-base-config.js | 4 ++-- lib/scaffold/default-config.js | 2 +- lib/scaffold/start.js | 2 +- package.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/scaffold/default-base-config.js b/lib/scaffold/default-base-config.js index 1f584b55a..556ab982b 100644 --- a/lib/scaffold/default-base-config.js +++ b/lib/scaffold/default-base-config.js @@ -22,8 +22,8 @@ function getDefaultBaseConfig(options) { servicesConfig: { bitcoind: { spawn: { - datadir: options.datadir || path.resolve(process.env.HOME, '.bitcoin'), - exec: path.resolve(__dirname, '../../bin/bitcoind') + datadir: options.datadir || path.resolve(process.env.HOME, '.shadowcoin'), + exec: path.resolve(__dirname, '../../bin/shadowcoind') } } } diff --git a/lib/scaffold/default-config.js b/lib/scaffold/default-config.js index 7075a7fce..2e0b5456e 100644 --- a/lib/scaffold/default-config.js +++ b/lib/scaffold/default-config.js @@ -38,7 +38,7 @@ function getDefaultConfig(options) { bitcoind: { spawn: { datadir: path.resolve(defaultPath, './data'), - exec: path.resolve(__dirname, '../../bin/bitcoind') + exec: path.resolve(__dirname, '../../bin/shadowcoind') } } } diff --git a/lib/scaffold/start.js b/lib/scaffold/start.js index e86545759..d244bca36 100644 --- a/lib/scaffold/start.js +++ b/lib/scaffold/start.js @@ -34,7 +34,7 @@ function checkConfigVersion2(fullConfig) { bitcoind: { spawn: { datadir: fullConfig.datadir, - exec: path.resolve(__dirname, '../../bin/bitcoind') + exec: path.resolve(__dirname, '../../bin/shadowcoind') } } } diff --git a/package.json b/package.json index d4f4741cf..d88b6ba74 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ ], "bin": { "bitcore-node": "./bin/bitcore-node", - "bitcoind": "./bin/bitcoind" + "bitcoind": "./bin/shadowcoind" }, "scripts": { "test": "mocha -R spec --recursive",