anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #865 from maraoz/feature/force-testnet

Browse source 
Feature: allow to force network from config
This commit is contained in:
Matias Alejo Garcia 2014-07-08 15:35:31 -03:00
commit b0ff5494e0
6 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
js/controllers/settings.js
View file

@ -12,6 +12,7 @@ angular.module('copayApp.controllers').controller('SettingsController',
$scope.networkPort = config.network.port;
$scope.networkSecure = config.network.secure || false;
$scope.disableVideo = typeof config.disableVideo === undefined ? true : config.disableVideo;
$scope.forceNetwork = config.forceNetwork;
$scope.unitOpts = [{
name: 'Satoshis (100,000,000 satoshis = 1BTC)',

4
js/models/core/Wallet.js
View file

@ -19,6 +19,7 @@ var AddressIndex = require('./AddressIndex');
var PublicKeyRing = require('./PublicKeyRing');
var TxProposals = require('./TxProposals');
var PrivateKey = require('./PrivateKey');
var copayConfig = require('../../../config');
function Wallet(opts) {
var self = this;
@ -33,6 +34,9 @@ function Wallet(opts) {
throw new Error('missing required option for Wallet: ' + k);
self[k] = opts[k];
});
if (copayConfig.forceNetwork && opts.networkName !== copayConfig.networkName)
throw new Error('Network forced to '+copayConfig.networkName+
' and tried to create a Wallet with network '+opts.networkName);
this.log('creating ' + opts.requiredCopayers + ' of ' + opts.totalCopayers + ' wallet');