improve transaction method

This commit is contained in:
Javier 2015-10-05 09:30:00 -03:00
parent 8dc05e4a0e
commit 6af1da85b5
1 changed files with 19 additions and 23 deletions

View File

@ -51,35 +51,31 @@ angular.module('copayApp.controllers').controller('paperWalletController',
fc.decryptBIP38PrivateKey(privateKey, passphrase, null, function(err, privateKey) {
if (err) return cb(err);
fc.getBalanceFromPrivateKey(privateKey, function(err, utxos) {
self.getRawTxFromPrivateKey(privateKey, function(err) {
if (err) return cb(err);
addressService.getAddress(fc.credentials.walletId, true, function(err, destinationAddress) {
if (err) return cb(err);
fc.buildTxFromPrivateKey(privateKey, destinationAddress, null, function(err, tx) {
if (err) return cb(err);
return cb(null, tx.serialize(), utxos);
});
});
});
});
} else {
fc.getBalanceFromPrivateKey(privateKey, function(err, utxos) {
if (err) return cb(err)
addressService.getAddress(fc.credentials.walletId, true, function(err, destinationAddress) {
if (err) return cb(err);
fc.buildTxFromPrivateKey(privateKey, destinationAddress, null, function(err, tx) {
if (err) return cb(err);
return cb(null, tx.serialize(), utxos);
});
});
} else
self.getRawTxFromPrivateKey(privateKey, function(err) {
if (err) return cb(err);
});
}
};
self.getRawTxFromPrivateKey = function(privateKey, cb) {
fc.getBalanceFromPrivateKey(privateKey, function(err, utxos) {
if (err) return cb(err)
addressService.getAddress(fc.credentials.walletId, true, function(err, destinationAddress) {
if (err) return cb(err);
fc.buildTxFromPrivateKey(privateKey, destinationAddress, null, function(err, tx) {
if (err) return cb(err);
return cb(null, tx.serialize(), utxos);
});
});
});
}
self.transaction = function() {
self.error = null;
self.sending = true;