diff --git a/lib/bitcoind.js b/lib/bitcoind.js index db31ff8a..cfe25aef 100644 --- a/lib/bitcoind.js +++ b/lib/bitcoind.js @@ -269,12 +269,12 @@ Bitcoin.prototype._pollMempool = function() { tx = bitcoin.tx(tx); // XXX Bad workaround - if (self._emitted[tx.hash]) { + if (self._emitted[tx.txid]) { return setImmediate(function() { return nextTx(); }); } - self._emitted[tx.hash] = true; + self._emitted[tx.txid] = true; self.emit('mptx', tx); self.emit('tx', tx); @@ -559,7 +559,6 @@ Transaction.fill = function(tx, options) { }; // NOTE: Could just call tx.GetHash().ToString() in C++ -Transaction.prototype.hash = Transaction.prototype.getHash = function(enc) { if (!this._hash) { this._hash = utils.dsha256(this.toBinary(), 'hex'); diff --git a/src/bitcoindjs.cc b/src/bitcoindjs.cc index f986d3aa..35771b30 100644 --- a/src/bitcoindjs.cc +++ b/src/bitcoindjs.cc @@ -2456,6 +2456,7 @@ cblock_to_jsblock(const CBlock& cblock, const CBlockIndex* cblock_index, LocalSet(NanNew("hex"), NanNew(strHex)); jstx->Set(NanNew("txid"), NanNew(ctx.GetHash().GetHex())); + jstx->Set(NanNew("hash"), NanNew(ctx.GetHash().GetHex())); jstx->Set(NanNew("version"), NanNew(ctx.nVersion)); jstx->Set(NanNew("locktime"), NanNew(ctx.nLockTime));