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

Merge pull request #1105 from chjj/paypro_uri

Browse source 
WIP: paypro: use BIP21 object in latest bitcore. fixes #1104. see #1083.
This commit is contained in:
Matias Alejo Garcia 2014-08-18 14:40:34 -04:00
commit 563da59e60
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/controllers/send.js
View file

@ -112,7 +112,7 @@ angular.module('copayApp.controllers').controller('SendController',
var uri; var uri;
if (address.indexOf('bitcoin:') === 0) { if (address.indexOf('bitcoin:') === 0) {
uri = copay.HDPath.parseBitcoinURI(address); uri = new bitcore.BIP21(address).data;
} else if (address.indexOf('Merchant: ') === 0) { } else if (address.indexOf('Merchant: ') === 0) {
uri = { uri = {
merchant: address.split(/\s+/)[1] merchant: address.split(/\s+/)[1]
@ -411,7 +411,7 @@ angular.module('copayApp.controllers').controller('SendController',
merchant: value merchant: value
}; };
} else { } else {
uri = copay.HDPath.parseBitcoinURI(value); uri = new bitcore.BIP21(value).data;
} }
if (!uri || !uri.merchant) { if (!uri || !uri.merchant) {
return; return;
@ -476,7 +476,7 @@ angular.module('copayApp.controllers').controller('SendController',
// delete the `merchant` property from the scope. // delete the `merchant` property from the scope.
var unregister = scope.$watch('address', function() { var unregister = scope.$watch('address', function() {
var val = scope.sendForm.address.$viewValue || ''; var val = scope.sendForm.address.$viewValue || '';
var uri = copay.HDPath.parseBitcoinURI(val); var uri = new bitcore.BIP21(val).data;
if (!uri || !uri.merchant) { if (!uri || !uri.merchant) {
delete $rootScope.merchant; delete $rootScope.merchant;
scope.sendForm.amount.$setViewValue(''); scope.sendForm.amount.$setViewValue('');

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

@ -1,10 +1,8 @@
'use strict'; 'use strict';
var http = require('http');
var EventEmitter = require('events').EventEmitter; var EventEmitter = require('events').EventEmitter;
var async = require('async'); var async = require('async');
var preconditions = require('preconditions').singleton(); var preconditions = require('preconditions').singleton();
var parseBitcoinURI = require('./HDPath').parseBitcoinURI;
var util = require('util'); var util = require('util');
var bitcore = require('bitcore'); var bitcore = require('bitcore');
@ -46,7 +44,7 @@ function Wallet(opts) {
this.log('creating ' + opts.requiredCopayers + ' of ' + opts.totalCopayers + ' wallet'); this.log('creating ' + opts.requiredCopayers + ' of ' + opts.totalCopayers + ' wallet');
this.id = opts.id || Wallet.getRandomId(); 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; this.name = opts.name;
@ -777,7 +775,7 @@ Wallet.prototype.createPaymentTx = function(options, cb) {
options.uri = options.uri || options.url; options.uri = options.uri || options.url;
if (options.uri.indexOf('bitcoin:') === 0) { if (options.uri.indexOf('bitcoin:') === 0) {
options.uri = parseBitcoinURI(options.uri).merchant; options.uri = new bitcore.BIP21(options.uri).data.merchant;
if (!options.uri) { if (!options.uri) {
return cb(new Error('No URI.')); return cb(new Error('No URI.'));
} }