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

Support valid-address testnet/livenet

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-08-23 10:30:29 -03:00
commit e2413ff620
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
public/views/modals/addressbook.html
View file

@ -67,7 +67,8 @@
<input type="text" <input type="text"
id="address" id="address"
name="address" name="address"
ng-model="addressbookEntry.address" required> ng-model="addressbookEntry.address"
valid-address required>
</div> </div>
</label> </label>

15
src/js/directives/directives.js
View file

@ -8,10 +8,6 @@ angular.module('copayApp.directives')
var URI = bitcore.URI; var URI = bitcore.URI;
var Address = bitcore.Address var Address = bitcore.Address
var validator = function(value) { var validator = function(value) {
var networkName = attrs.networkName;
if (!networkName)
throw 'validAddress should provide network name';
// Regular url // Regular url
if (/^https?:\/\//.test(value)) { if (/^https?:\/\//.test(value)) {
@ -21,13 +17,14 @@ angular.module('copayApp.directives')
// Bip21 uri // Bip21 uri
if (/^bitcoin:/.test(value)) { if (/^bitcoin:/.test(value)) {
var uri, isAddressValid; var uri, isAddressValidLivenet, isAddressValidTestnet;
var isUriValid = URI.isValid(value); var isUriValid = URI.isValid(value);
if (isUriValid) { if (isUriValid) {
uri = new URI(value); uri = new URI(value);
isAddressValid = Address.isValid(uri.address.toString(), networkName) isAddressValidLivenet = Address.isValid(uri.address.toString(), 'livenet')
isAddressValidTestnet = Address.isValid(uri.address.toString(), 'testnet')
} }
ctrl.$setValidity('validAddress', isUriValid && isAddressValid); ctrl.$setValidity('validAddress', isUriValid && (isAddressValidLivenet || isAddressValidTestnet));
return value; return value;
} }
@ -37,7 +34,9 @@ angular.module('copayApp.directives')
} }
// Regular Address // Regular Address
ctrl.$setValidity('validAddress', Address.isValid(value, networkName)); var regularAddressLivenet = Address.isValid(value, 'livenet');
var regularAddressTestnet = Address.isValid(value, 'testnet');
ctrl.$setValidity('validAddress', (regularAddressLivenet || regularAddressTestnet));
return value; return value;
}; };