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

advancing with m-n script

Browse source
This commit is contained in:
Manuel Araoz 2014-05-21 15:14:48 -03:00
commit 73e7d2a827
3 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -440,9 +440,8 @@ Wallet.prototype.sendTx = function(ntxid, cb) {
this.log('[Wallet.js.261:txHex:]', txHex); //TODO
var self = this;
this.blockchain.sendRawTransaction(txHex, function(txid) {
self.log('BITCOND txid:', txid); //TODO
self.log('BITCOIND txid:', txid); //TODO
if (txid) {
self.txProposals.setSent(ntxid, txid);
self.sendTxProposals(null, ntxid);
@ -545,8 +544,6 @@ Wallet.prototype.getUnspent = function(cb) {
Wallet.prototype.createTx = function(toAddress, amountSatStr, opts, cb) {
var self = this;
alert(amountSatStr);
alert(JSON.stringify(opts));
if (typeof opts === 'function') {
cb = opts;
opts = {};
@ -565,7 +562,7 @@ Wallet.prototype.createTx = function(toAddress, amountSatStr, opts, cb) {
self.store();
self.emit('txProposalsUpdated');
}
return cb();
return cb(ntxid);
});
};