Browse Source

use Bitcore instance from BWU

activeAddress
Ivan Socolsky 10 years ago
parent
commit
97d4809f68
  1. 2
      lib/model/address.js
  2. 5
      lib/model/copayer.js
  3. 2
      lib/model/txproposal.js
  4. 4
      lib/server.js
  5. 1
      package.json
  6. 2
      test/integration/server.js
  7. 2
      test/models/txproposal.js

2
lib/model/address.js

@ -1,6 +1,6 @@
'use strict';
var Bitcore = require('bitcore');
var Bitcore = require('bitcore-wallet-utils').Bitcore;
function Address() {
this.version = '1.0.0';

5
lib/model/copayer.js

@ -4,12 +4,11 @@ var $ = require('preconditions').singleton();
var _ = require('lodash');
var util = require('util');
var Bitcore = require('bitcore');
var HDPublicKey = Bitcore.HDPublicKey;
var Uuid = require('uuid');
var AddressManager = require('./addressmanager');
var WalletUtils = require('bitcore-wallet-utils');
var Bitcore = WalletUtils.Bitcore;
var HDPublicKey = Bitcore.HDPublicKey;
function Copayer() {
this.version = '1.0.0';

2
lib/model/txproposal.js

@ -2,7 +2,7 @@
var _ = require('lodash');
var Uuid = require('uuid');
var Bitcore = require('bitcore');
var Bitcore = require('bitcore-wallet-utils').Bitcore;
var Address = Bitcore.Address;
var TxProposalAction = require('./txproposalaction');

4
lib/server.js

@ -8,7 +8,8 @@ var inherits = require('inherits');
var events = require('events');
var nodeutil = require('util');
var Bitcore = require('bitcore');
var WalletUtils = require('bitcore-wallet-utils');
var Bitcore = WalletUtils.Bitcore;
var PublicKey = Bitcore.PublicKey;
var HDPublicKey = Bitcore.HDPublicKey;
var Address = Bitcore.Address;
@ -17,7 +18,6 @@ var Explorers = require('bitcore-explorers');
var ClientError = require('./clienterror');
var Utils = require('./utils');
var Storage = require('./storage');
var WalletUtils = require('bitcore-wallet-utils');
var Wallet = require('./model/wallet');
var Copayer = require('./model/copayer');

1
package.json

@ -19,7 +19,6 @@
},
"dependencies": {
"async": "^0.9.0",
"bitcore": "^0.11.2",
"bitcore-wallet-utils": "0.0.3",
"bitcore-explorers": "^0.9.1",
"body-parser": "^1.11.0",

2
test/integration/server.js

@ -11,10 +11,10 @@ var levelup = require('levelup');
var memdown = require('memdown');
var log = require('npmlog');
log.debug = log.verbose;
var Bitcore = require('bitcore');
var Utils = require('../../lib/utils');
var WalletUtils = require('bitcore-wallet-utils');
var Bitcore = WalletUtils.Bitcore;
var Storage = require('../../lib/storage');
var Wallet = require('../../lib/model/wallet');

2
test/models/txproposal.js

@ -5,7 +5,7 @@ var chai = require('chai');
var sinon = require('sinon');
var should = chai.should();
var TXP = require('../../lib/model/txproposal');
var Bitcore = require('bitcore');
var Bitcore = require('bitcore-wallet-utils').Bitcore;
describe('TXProposal', function() {

Loading…
Cancel
Save