diff --git a/lib/mempool/mempool.js b/lib/mempool/mempool.js index 2e52c124..795fe155 100644 --- a/lib/mempool/mempool.js +++ b/lib/mempool/mempool.js @@ -118,6 +118,11 @@ Mempool.prototype._open = co(function* open() { entry = entries[i]; this.trackEntry(entry); } + + for (i = 0; i < entries.length; i++) { + entry = entries[i]; + this.updateAncestors(entry); + } } this.logger.info('Mempool loaded (maxsize=%dkb).', size); @@ -2301,7 +2306,7 @@ function MempoolCache(options) { this.db = LDB(options); } -MempoolCache.VERSION = 0; +MempoolCache.VERSION = 1; MempoolCache.prototype.getVersion = co(function* getVersion() { var data = yield this.db.get(layout.V); diff --git a/lib/mempool/mempoolentry.js b/lib/mempool/mempoolentry.js index 2a6d290f..4a53086f 100644 --- a/lib/mempool/mempoolentry.js +++ b/lib/mempool/mempoolentry.js @@ -195,7 +195,7 @@ MempoolEntry.prototype.isFree = function isFree(height) { */ MempoolEntry.prototype.getSize = function getSize() { - return this.tx.getSize() + 53; + return this.tx.getSize() + 41; }; /** @@ -214,8 +214,6 @@ MempoolEntry.prototype.toRaw = function toRaw() { bw.writeU32(this.ts); bw.writeU64(this.value); bw.writeU8(this.dependencies ? 1 : 0); - bw.writeU64(this.descFee); - bw.writeU32(this.descSize); return bw.render(); }; @@ -237,8 +235,8 @@ MempoolEntry.prototype.fromRaw = function fromRaw(data) { this.ts = br.readU32(); this.value = br.readU64(); this.dependencies = br.readU8() === 1; - this.descFee = br.readU64(); - this.descSize = br.readU32(); + this.descFee = this.fee; + this.descSize = this.size; return this; };