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

paypro: use BIP21 object in latest bitcore. fixes #1104. see #1083.

Browse source
This commit is contained in:
Christopher Jeffrey 2014-08-15 17:26:40 -04:00
commit 6246e62962
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,6 @@ var http = require('http');
var EventEmitter = require('events').EventEmitter;
var async = require('async');
var preconditions = require('preconditions').singleton();
var parseBitcoinURI = require('./HDPath').parseBitcoinURI;
var util = require('util');
var bitcore = require('bitcore');
@ -46,7 +45,7 @@ function Wallet(opts) {
this.log('creating ' + opts.requiredCopayers + ' of ' + opts.totalCopayers + ' wallet');
this.id = opts.id || Wallet.getRandomId();
this.lock = new WalletLock(this.storage, this.id, opts.lockTimeOutMin);
this.lock = new WalletLock(this.storage, this.id, opts.lockTimeOutMin);
this.name = opts.name;
@ -777,7 +776,7 @@ Wallet.prototype.createPaymentTx = function(options, cb) {
options.uri = options.uri || options.url;
if (options.uri.indexOf('bitcoin:') === 0) {
options.uri = parseBitcoinURI(options.uri).merchant;
options.uri = new bitcore.BIP21(options.uri).data.merchant;
if (!options.uri) {
return cb(new Error('No URI.'));
}