rm isTEstnet to network

bit-wallet/bit-status

@@ -17,7 +17,7 @@ client.getStatus(function(err, res) {
   utils.die(err);
 
   var x = res.wallet;
-  console.log('* Wallet %s [%s]: %d-%d %s ', x.name, x.isTestnet ? 'testnet' : 'livenet', x.m, x.n, x.status);
+  console.log('* Wallet %s [%s]: %d-%d %s ', x.name, x.network, x.m, x.n, x.status);
 
   var x = res.balance;
   console.log('* Balance %d (Locked: %d)', x.totalAmount, x.lockedAmount);

lib/client/API.js

@@ -9,6 +9,7 @@ log.debug = log.verbose;
 
 var Bitcore = require('bitcore')
 var SignUtils = require('../signutils');
+var BitcoinUtils = require('../bitcoinutils');
 
 var BASE_URL = 'http://localhost:3001/copay/api';
 
@@ -132,6 +133,7 @@ API.prototype.createWallet = function(walletName, copayerName, m, n, network, cb
     m: m,
     n: n,
     walletPrivKey: privKey.toString(),
+    network: network,
   };
 
   var args = {
@@ -281,7 +283,19 @@ API.prototype.createAddress = function(cb) {
   var data = this._loadAndCheck();
 
   var url = '/v1/addresses/';
-  this._doPostRequest(url, {}, data, cb);
+  this._doPostRequest(url, {}, data, function(err, res) {
+    if (err) return cb(err);
+
+    if (data.publicKeyRing.length != data.n)
+      return cb('Wallet Incomplete, cannot derive address.')
+
+    var address =  BitcoinUtils.deriveAddress(data.publicKeyRing, res.path, data.m, data.network);
+    if (address != address.address)
+      return cb('Server sent a fake address.');
+
+
+    return cb(null, address);
+  });
 };
 
 API.prototype.history = function(limit, cb) {

lib/client/index.js

@@ -2,6 +2,7 @@
 
 var client = module.exports = require('./API');
 client.FileStorage = require('./FileStorage');
+client.Verifier = require('./Verifier');
 
 
 // TODO

lib/model/wallet.js

@@ -3,14 +3,12 @@
 var _ = require('lodash');
 var util = require('util');
 var $ = require('preconditions').singleton();
-
-var Bitcore = require('bitcore');
-var BitcoreAddress = Bitcore.Address;
 var Uuid = require('uuid');
 
 var Address = require('./address');
 var Copayer = require('./copayer');
 var AddressManager = require('./addressmanager');
+var BitcoinUtils = require('../bitcoinutils');
 
 var VERSION = '1.0.0';
 
@@ -28,7 +26,7 @@ function Wallet(opts) {
   this.addressIndex = 0;
   this.copayers = [];
   this.pubKey = opts.pubKey;
-  this.isTestnet = opts.isTestnet;
+  this.network = opts.network;
   this.addressManager = new AddressManager();
 };
 
@@ -76,7 +74,7 @@ Wallet.fromObj = function(obj) {
     return Copayer.fromObj(copayer);
   });
   x.pubKey = obj.pubKey;
-  x.isTestnet = obj.isTestnet;
+  x.network = obj.network;
   x.addressManager = AddressManager.fromObj(obj.addressManager);
 
   return x;
@@ -101,13 +99,8 @@ Wallet.prototype.getCopayer = function(copayerId) {
   });
 };
 
-
 Wallet.prototype.getNetworkName = function() {
-  return this.isTestnet ? 'testnet' : 'livenet';
-};
-
-Wallet.prototype._getBitcoreNetwork = function() {
-  return this.isTestnet ? Bitcore.Networks.testnet : Bitcore.Networks.livenet;
+  return this.network;
 };
 
 
@@ -124,19 +117,7 @@ Wallet.prototype.createAddress = function(isChange) {
   $.checkState(this.isComplete());
 
   var path = this.addressManager.getNewAddressPath(isChange);
-
-  var publicKeys = _.map(this.copayers, function(copayer) {
-    var xpub = new Bitcore.HDPublicKey(copayer.xPubKey);
-    return xpub.derive(path).publicKey;
-  });
-
-  var bitcoreAddress = BitcoreAddress.createMultisig(publicKeys, this.m, this._getBitcoreNetwork());
-
-  return new Address({
-    address: bitcoreAddress.toString(),
-    path: path,
-    publicKeys: _.invoke(publicKeys, 'toString'),
-  });
+  return new Address(BitcoinUtils.deriveAddress(this.publicKeyRing, path, this.m, this.network));
 };
 
 

lib/server.js

@@ -118,7 +118,7 @@ CopayServer.prototype.createWallet = function(opts, cb) {
     name: opts.name,
     m: opts.m,
     n: opts.n,
-    isTestnet: network === 'testnet',
+    network: network,
     pubKey: pubKey,
   });
 
@@ -669,7 +669,6 @@ CopayServer.prototype.signTx = function(opts, cb) {
                 txProposalId: opts.txProposalId,
                 txid: txid
               });
-
               return cb(null, txp);
             });
           });