From 0f6ef910b0f2e65d257dc8ea496c77e5900dec47 Mon Sep 17 00:00:00 2001 From: Nodar Chkuaselidze Date: Fri, 17 May 2019 20:23:40 +0400 Subject: [PATCH] addrindexer: use network for getPrefix. --- lib/indexer/addrindexer.js | 6 +++--- lib/mempool/addrindexer.js | 7 +++++-- lib/mempool/mempool.js | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/indexer/addrindexer.js b/lib/indexer/addrindexer.js index ce2478dd..d864be6b 100644 --- a/lib/indexer/addrindexer.js +++ b/lib/indexer/addrindexer.js @@ -141,7 +141,7 @@ class AddrIndexer extends Indexer { let hasAddress = false; for (const addr of tx.getAddresses(view)) { - const prefix = addr.getPrefix(); + const prefix = addr.getPrefix(this.network); if (prefix < 0) continue; @@ -178,7 +178,7 @@ class AddrIndexer extends Indexer { let hasAddress = false; for (const addr of tx.getAddresses(view)) { - const prefix = addr.getPrefix(); + const prefix = addr.getPrefix(this.network); if (prefix < 0) continue; @@ -223,7 +223,7 @@ class AddrIndexer extends Indexer { throw new Error('Limit above max of ${this.maxTxs}.'); const hash = Address.getHash(addr); - const prefix = addr.getPrefix(); + const prefix = addr.getPrefix(this.network); const opts = { limit, diff --git a/lib/mempool/addrindexer.js b/lib/mempool/addrindexer.js index e28353b6..f2d4b34f 100644 --- a/lib/mempool/addrindexer.js +++ b/lib/mempool/addrindexer.js @@ -20,9 +20,12 @@ class AddrIndexer { /** * Create TX address index. * @constructor + * @param {Network} network */ - constructor() { + constructor(network) { + this.network = network; + // Map of addr->entries. this.index = new BufferMap(); @@ -36,7 +39,7 @@ class AddrIndexer { } getKey(addr) { - const prefix = addr.getPrefix(); + const prefix = addr.getPrefix(this.network); if (prefix < 0) return null; diff --git a/lib/mempool/mempool.js b/lib/mempool/mempool.js index 5492a9c1..fbf3ab8a 100644 --- a/lib/mempool/mempool.js +++ b/lib/mempool/mempool.js @@ -73,7 +73,7 @@ class Mempool extends EventEmitter { this.spents = new BufferMap(); this.rejects = new RollingFilter(120000, 0.000001); - this.addrindex = new AddrIndexer(); + this.addrindex = new AddrIndexer(this.network); } /**