diff --git a/js/models/core/PrivateKey.js b/js/models/core/PrivateKey.js index 66102e8db..bf8cfa9de 100644 --- a/js/models/core/PrivateKey.js +++ b/js/models/core/PrivateKey.js @@ -32,8 +32,6 @@ PrivateKey.fromObj = function(obj) { }; PrivateKey.prototype.toObj = function() { - -console.log('[PrivateKey.js.35] TODO TODO: PRIV: ', this.getExtendedPrivateKeyString()); //TODO return { extendedPrivateKeyString: this.getExtendedPrivateKeyString(), networkName: this.network.name, diff --git a/js/models/core/TxProposals.js b/js/models/core/TxProposals.js index 20c8ee6aa..e3f087af7 100644 --- a/js/models/core/TxProposals.js +++ b/js/models/core/TxProposals.js @@ -66,7 +66,6 @@ TxProposals.fromObj = function(o) { o.txps.forEach(function(o2) { var t = TxProposal.fromObj(o2); var id = t.builder.build().getNormalizedHash().toString('hex'); -console.log('[TxProposals.js.65:id:]',id, o2); //TODO ret.txps[id] = t; }); return ret; @@ -129,7 +128,6 @@ TxProposals.prototype._mergeMetadata = function(myTxps, theirTxps, mergeInfo) { Object.keys(toMerge).forEach(function(hash) { var v0 = myTxps[hash]; var v1 = toMerge[hash]; -console.log('[TxProposals.js.127:v0:]',v0, v1); //TODO Object.keys(v1.seenBy).forEach(function(k) { if (!v0.seenBy[k] || v0.seenBy[k] !== v1.seenBy[k]) { @@ -152,7 +150,6 @@ console.log('[TxProposals.js.127:v0:]',v0, v1); //TODO } }); -console.log('[TxProposals.js.131:hasChanged:]',hasChanged); //TODO return hasChanged; }; @@ -171,20 +168,17 @@ TxProposals.prototype._mergeBuilder = function(myTxps, theirTxps, mergeInfo) { var after = JSON.stringify(v0.toObj()); if (after !== before) hasChanged ++; } -console.log('[TxProposals.js.149:hasChanged:]',hasChanged); //TODO }; TxProposals.prototype.add = function(data) { var id = data.builder.build().getNormalizedHash().toString('hex'); -console.log('[TxProposals.js.175:data: ADD]',data); //TODO this.txps[id] = new TxProposal(data); }; -TxProposals.prototype.setSent = function(ntxid) { +TxProposals.prototype.setSent = function(ntxid,txid) { //sent TxProposals are local an not broadcasted. -console.log('[TxProposals.js.147] SET SENT:', ntxid); //TODO - this.txps[ntxid].setSent(); + this.txps[ntxid].setSent(txid); }; diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js index 869b851c3..388656018 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -357,7 +357,7 @@ Wallet.prototype.sendTx = function(ntxid, cb) { this.blockchain.sendRawTransaction(txHex, function(txid) { self.log('BITCOND txid:',txid); //TODO if (txid) { - self.txProposals.setSent(ntxid); + self.txProposals.setSent(ntxid, txid); } self.sendTxProposals(); self.store();