Skip to content

Fixed _setDataPath when the bitcore node is using the regtest network and some bugs related with newer electron versions. #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bethnull wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed _setDataPath when the bitcore node is using the regtest network and some bugs related with newer electron versions. #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f394fd0
Fixed _setDataPath when the bitcore node is using the regtest network.
bethnull Sep 5, 2016
401e0fd
Fixed some bugs related with newer electron versions.
bethnull Sep 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
'use strict';
var app = require('app'); // Module to control application life.
var BrowserWindow = require('browser-window'); // Module to create native browser window.
var app = require('electron').app; // Module to control application life.
var BrowserWindow = require('electron').BrowserWindow; // Module to create native browser window.

// Report crashes to our server.
require('crash-reporter').start();
require('electron').crashReporter.start({
productName: 'YourName',
companyName: 'YourCompany',
submitURL: 'https://change-that-to-your-company-domain.com/url-to-submit',
autoSubmit: true
});

// Keep a global reference of the window object, if you don't, the window will
// be closed automatically when the JavaScript object is garbage collected.
Expand All @@ -25,7 +30,7 @@ app.on('ready', function() {
mainWindow = new BrowserWindow({width: 725, height: 680, resizable: false});

// and load the index.html of the app.
mainWindow.loadUrl('file://' + __dirname + '/index.html');
mainWindow.loadURL('file://' + __dirname + '/index.html');

// Open the DevTools.
//mainWindow.openDevTools();
Expand Down
4 changes: 2 additions & 2 deletions stampingservice/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ StampingService.PREFIX = String.fromCharCode(0xff);
StampingService.prototype._setDataPath = function() {
$.checkState(this.node.services.bitcoind.spawn.datadir, 'bitcoind is expected to have a "spawn.datadir" property');
var datadir = this.node.services.bitcoind.spawn.datadir;
if (this.node.network === Networks.livenet) {
if (this.node.network.name === Networks.livenet.name) {
this.dataPath = datadir + '/bitcore-stamps.db';
} else if (this.node.network === Networks.testnet) {
} else if (this.node.network.name === Networks.testnet.name) {
if (this.node.network.regtestEnabled) {
this.dataPath = datadir + '/regtest/bitcore-stamps.db';
} else {
Expand Down