* Add missing null check in Client._onHeadChanged()

* Fix memory leak on block/tx request timeout
* Fix a few warnings

Author: styppo

clients/nodejs/modules/MetricsServer.js

@@ -141,8 +141,8 @@ class MetricsServer {
     async _networkMetrics(res) {
         /** @type {Map.<string, number>} */
         const peers = new Map();
-        for (let peer of (await this._client.network.getPeers())) {
-            let o = {};
+        for (const peer of (await this._client.network.getPeers())) {
+            const o = {};
             switch (peer.peerAddress ? peer.peerAddress.protocol : -1) {
                 case Nimiq.Protocol.DUMB:
                     o.type = 'dumb';
@@ -191,7 +191,7 @@ class MetricsServer {
         }
         /** @type {Map.<string, number>} */
         const addresses = new Map();
-        for (let address of (await this._client.network.getAddresses())) {
+        for (const address of (await this._client.network.getAddresses())) {
             let type = 'unknown';
             switch (address.peerAddress.protocol) {
                 case Nimiq.Protocol.DUMB:
@@ -213,10 +213,10 @@ class MetricsServer {
             }
         }
 
-        for (let os of peers.keys()) {
+        for (const os of peers.keys()) {
             MetricsServer._metric(res, 'network_peers', this._with(JSON.parse(os)), peers.get(os));
         }
-        for (let type of addresses.keys()) {
+        for (const type of addresses.keys()) {
             MetricsServer._metric(res, 'network_known_addresses', this._with({type: type}), addresses.get(type));
         }
         const stats = await this._client.network.getStatistics();

src/main/generic/api/Client.js

@@ -266,11 +266,13 @@ class Client {
                     if (block.isFull()) {
                         revertedTxs.addAll(block.transactions);
                     }
-                    // FIXME
-                    for (const tx of this._transactionConfirmWaiting.get(this._txConfirmsAt(block.height)).valueIterator()) {
-                        revertedTxs.add(tx);
+                    const set = this._transactionConfirmWaiting.get(this._txConfirmsAt(block.height));
+                    if (set) {
+                        for (const tx of set.valueIterator()) {
+                            revertedTxs.add(tx);
+                        }
+                        this._transactionConfirmWaiting.remove(this._txConfirmsAt(block.height));
                     }
-                    this._transactionConfirmWaiting.remove(this._txConfirmsAt(block.height));
                 }
 
                 // Gather applied transactions

src/main/generic/api/NetworkClient.js

@@ -14,7 +14,7 @@ Client.Network = class Network {
     async getPeers() {
         const consensus = await this._client._consensus;
         const infos = [];
-        for (let connection of consensus.network.connections.valueIterator()) {
+        for (const connection of consensus.network.connections.valueIterator()) {
             infos.push(new Client.PeerInfo(connection));
         }
         return infos;
@@ -39,7 +39,7 @@ Client.Network = class Network {
     async getAddresses() {
         const consensus = await this._client._consensus;
         const infos = [];
-        for (let addressState of consensus.network.addresses.iterator()) {
+        for (const addressState of consensus.network.addresses.iterator()) {
             infos.push(new Client.AddressInfo(addressState));
         }
         return infos;
@@ -129,7 +129,7 @@ Client.Network = class Network {
         } else if (address instanceof Client.BasicAddress) {
             peerAddress = consensus.network.addresses.get(address.peerAddress);
         } else if (typeof address === 'string') {
-            for (let peerAddressState of consensus.network.addresses.iterator()) {
+            for (const peerAddressState of consensus.network.addresses.iterator()) {
                 if (peerAddressState.peerAddress.toString() === address) {
                     peerAddress = peerAddressState.peerAddress;
                     break;

src/main/generic/consensus/BaseConsensusAgent.js

@@ -243,10 +243,16 @@ class BaseConsensusAgent extends Observable {
                 this._pendingRequests.get(vector).push({resolve, reject});
             } else {
                 this._pendingRequests.put(vector, [{resolve, reject}]);
+
                 this._peer.channel.getData([vector]);
+
                 this._timers.setTimeout(`block-request-${vector.hash.toBase64()}`, () => {
-                    if (!this._pendingRequests.get(vector)) return;
-                    for (const {reject} of this._pendingRequests.get(vector)) {
+                    const requests = this._pendingRequests.get(vector);
+                    if (!requests) return;
+
+                    this._pendingRequests.remove(vector);
+
+                    for (const {reject} of requests) {
                         reject(new Error('Timeout'));
                     }
                 }, BaseConsensusAgent.REQUEST_TIMEOUT);
@@ -265,12 +271,19 @@ class BaseConsensusAgent extends Observable {
                 this._pendingRequests.get(vector).push({resolve, reject});
             } else {
                 this._pendingRequests.put(vector, [{resolve, reject}]);
+
                 if (!this._objectsInFlight.contains(vector)) {
                     this._peer.channel.getData([vector]);
                     this._objectsInFlight.add(vector);
                 }
+
                 this._timers.setTimeout(`tx-request-${vector.hash.toBase64()}`, () => {
-                    for (const {reject} of this._pendingRequests.get(vector)) {
+                    const requests = this._pendingRequests.get(vector);
+                    if (!requests) return;
+
+                    this._pendingRequests.remove(vector);
+
+                    for (const {reject} of requests) {
                         reject(new Error('Timeout'));
                     }
                 }, BaseConsensusAgent.REQUEST_TIMEOUT);
@@ -1518,7 +1531,7 @@ BaseConsensusAgent.TRANSACTION_RELAY_FEE_MIN = 1;
  */
 BaseConsensusAgent.SUBSCRIPTION_CHANGE_GRACE_PERIOD = 1000 * 2;
 BaseConsensusAgent.HEAD_REQUEST_INTERVAL = 100 * 1000; // 100 seconds, give client time to announce new head without request
-BaseConsensusAgent.KNOWS_OBJECT_AFTER_INV_DELAY = 1000 * 5;
+BaseConsensusAgent.KNOWS_OBJECT_AFTER_INV_DELAY = 1000 * 3;
 
 BaseConsensusAgent.KNOWN_OBJECTS_COUNT_MAX = 40000;
 Class.register(BaseConsensusAgent);

src/main/generic/consensus/BaseMiniConsensus.js

@@ -132,7 +132,7 @@ class BaseMiniConsensus extends BaseConsensus {
         // Try agents first that (we think) know the block hash.
         agents.sort((a, b) =>
             a.knowsBlock(blockHash) !== b.knowsBlock(blockHash)
-                ? -a.knowsBlock(hash) + 0.5
+                ? -a.knowsBlock(blockHash) + 0.5
                 : Math.random() - 0.5);
 
         for (const agent of agents) {

src/main/generic/consensus/Policy.js

@@ -178,7 +178,6 @@ Policy.TOTAL_SUPPLY = 21e14;
 
 /**
  * Initial supply before genesis block in lunas.
- * FIXME: Change for main net.
  * @type {number}
  * @constant
  */

src/main/generic/consensus/base/block/BlockHeader.js

@@ -238,7 +238,6 @@ class BlockHeader {
         this._pow = null;
     }
 }
-// FIXME: Clean up for mainnet.
 BlockHeader.Version = {
     V1: 1
 };

src/main/generic/consensus/base/blockchain/BaseChain.js

@@ -572,7 +572,7 @@ class BaseChain extends IBlockchain {
             promises.push(worker.computeArgon2dBatch(part));
         }
         const pows = (await Promise.all(promises)).reduce((a, b) => [...a, ...b], []);
-        for(let i = 0; i < headers.length; ++i) {
+        for (let i = 0; i < headers.length; ++i) {
             headers[i]._pow = new Hash(pows[i]);
         }
     }

src/main/generic/consensus/nano/NanoConsensusAgent.js

@@ -94,11 +94,9 @@ class NanoConsensusAgent extends BaseMiniConsensusAgent {
     async _onChainProof(msg) {
         Log.d(NanoConsensusAgent, `[CHAIN-PROOF] Received from ${this._peer.peerAddress}: ${msg.proof}`);
 
-        // Check if we have requested a chain proof, reject unsolicited ones.
-        // FIXME
+        // Check if we have requested a chain proof, discard unsolicited ones.
         if (!this._requestedChainProof) {
             Log.w(NanoConsensusAgent, `Unsolicited chain proof received from ${this._peer.peerAddress}`);
-            // TODO close/ban?
             return;
         }
         this._requestedChainProof = false;

src/test/specs/generic/Policy.spec.js

@@ -22,23 +22,17 @@ describe('Policy', () => {
     });
 
     it('reaches total supply after ~100 years', () => {
-        // FIXME: replace initialSupply by Policy.INITIAL_SUPPLY for main net
-        const initialSupply = 252e12;
-
         // Should reach 21mio NIM at block 52888984.
         const block = 101*365*24*60*60 / Policy.BLOCK_TIME; // 101 years
-        const supply = Policy._supplyAfter(initialSupply, block-1);
+        const supply = Policy._supplyAfter(Policy.INITIAL_SUPPLY, block - 1);
         expect(supply).toBe(Policy.TOTAL_SUPPLY, 'Wrong supply.');
         expect(Policy._blockRewardAt(supply, block)).toBe(0, 'Wrong reward.');
     });
 
     it('correctly switches to tail emission', () => {
-        // FIXME: replace initialSupply by Policy.INITIAL_SUPPLY for main net
-        const initialSupply = 252e12;
-
         // Should reach 21mio NIM at block 52888984.
         const block = Policy.EMISSION_TAIL_START;
-        const supply = Policy._supplyAfter(initialSupply, block-2);
+        const supply = Policy._supplyAfter(Policy.INITIAL_SUPPLY, block - 2);
         const previousReward = Policy._blockRewardAt(supply, block-1);
         expect(previousReward > Policy.EMISSION_TAIL_REWARD).toBe(true, 'Wrong reward before starting block.');
         expect(Policy._blockRewardAt(supply + previousReward, block)).toBe(Policy.EMISSION_TAIL_REWARD, 'Wrong reward at starting block.');

src/test/specs/generic/api/Client.spec.js

@@ -21,7 +21,7 @@ describe('Client', () => {
         const netconfig = Dummy.NETCONFIG;
         const consensus = await Consensus.volatileFull(netconfig);
         testChain = await TestBlockchain.createVolatileTest(numBlocks);
-        for (let block of (await testChain.getBlocks(consensus.blockchain.headHash))) {
+        for (const block of (await testChain.getBlocks(consensus.blockchain.headHash))) {
             await consensus.blockchain.pushBlock(await testChain.getBlock(block.hash(), true, true));
         }
         consensus.network.connect();