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

Merge pull request #49 from eordano/fix/bitcoinPrefix

Browse source 
Add address sanitizer to proposal creation
This commit is contained in:
Matias Alejo Garcia 2014-10-29 14:15:41 -03:00
commit 7d512a69de
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
js/models/Wallet.js
View file

@ -9,6 +9,7 @@ var async = require('async');
var cryptoUtil = require('../util/crypto'); var cryptoUtil = require('../util/crypto');
var bitcore = require('bitcore'); var bitcore = require('bitcore');
var BIP21 = bitcore.BIP21;
var bignum = bitcore.Bignum; var bignum = bitcore.Bignum;
var coinUtil = bitcore.util; var coinUtil = bitcore.util;
var buffertools = bitcore.buffertools; var buffertools = bitcore.buffertools;
@ -2307,6 +2308,14 @@ Wallet.prototype.createTx = function(toAddress, amountSatStr, comment, opts, cb)
}); });
}; };
// TODO (eordano): Move this to bitcore
var sanitize = function(address) {
if (/^bitcoin:/g.test(address)) {
return new BIP21(address).address;
}
return new Address(address);
};
/** /**
* @desc Create a transaction proposal * @desc Create a transaction proposal
* @TODO: Document more * @TODO: Document more
@ -2315,8 +2324,9 @@ Wallet.prototype.createTxSync = function(toAddress, amountSatStr, comment, utxos
var pkr = this.publicKeyRing; var pkr = this.publicKeyRing;
var priv = this.privateKey; var priv = this.privateKey;
opts = opts || {}; opts = opts || {};
toAddress = sanitize(toAddress);
preconditions.checkArgument(new Address(toAddress).network().name === this.getNetworkName(), 'networkname mismatch'); preconditions.checkArgument(toAddress.network().name === this.getNetworkName(), 'networkname mismatch');
preconditions.checkState(pkr.isComplete(), 'pubkey ring incomplete'); preconditions.checkState(pkr.isComplete(), 'pubkey ring incomplete');
preconditions.checkState(priv, 'no private key'); preconditions.checkState(priv, 'no private key');
if (comment) preconditions.checkArgument(comment.length <= 100); if (comment) preconditions.checkArgument(comment.length <= 100);
@ -2337,7 +2347,7 @@ Wallet.prototype.createTxSync = function(toAddress, amountSatStr, comment, utxos
b = new Builder(opts) b = new Builder(opts)
.setUnspent(utxos) .setUnspent(utxos)
.setOutputs([{ .setOutputs([{
address: toAddress, address: toAddress.data,
amountSatStr: amountSatStr, amountSatStr: amountSatStr,
}]); }]);
} catch (e) { } catch (e) {