fix: Error block XXX not found (#306)

* Remove unused console log
* More accurate message for block not found
* Add verification for existence of the last block timestamp
* Reset timeout sync to 10000ms
* Remove accept json
* Set confirmation number to 2
* Increase timeout for tests concerned by ethereal-storage

Author: lumtis

packages/data-access/src/timestamp-by-location.ts

@@ -22,10 +22,9 @@ export default class LocationTimestamp {
    * @param timestamp timestamp of the block
    */
   public pushTimestampByLocation(dataId: string, timestamp: number): void {
-    if (this.timestampLocations[dataId]) {
-      throw Error(`Timestamp already know for the dataId ${dataId}`);
+    if (!this.timestampLocations[dataId]) {
+      this.timestampLocations[dataId] = timestamp;
     }
-    this.timestampLocations[dataId] = timestamp;
   }
 
   /**

packages/data-access/test/timestamp-by-location.test.ts

@@ -16,14 +16,6 @@ describe('LocationTimestamp', () => {
     const result = timestampLocation.getTimestampFromLocation(arbitraryDataId1);
     expect(result, 'timestampLocation is wrong').to.equal(arbitraryTimestamp);
   });
-  it('cannot pushTimestampByLocation() a dataId already pushed', () => {
-    const timestampLocation = new TimestampLocation();
-    timestampLocation.pushTimestampByLocation(arbitraryDataId1, arbitraryTimestamp);
-
-    expect(() => {
-      timestampLocation.pushTimestampByLocation(arbitraryDataId1, arbitraryTimestamp);
-    }, 'must throw').to.throw(`Timestamp already know for the dataId ${arbitraryDataId1}`);
-  });
 
   describe('isDataInBoundaries', () => {
     it('can isDataInBoundaries()', () => {

packages/ethereum-storage/package.json

@@ -44,7 +44,7 @@
     "lint-staged": "lint-staged",
     "ganache": "ganache-cli -l 90000000 -p 8545 -m \"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat\"",
     "deploy": "truffle --contracts_directory=./src deploy",
-    "test:lib": "nyc mocha --require ts-node/register --require source-map-support/register \"test/lib/**/*.ts\"",
+    "test:lib": "nyc mocha --timeout=5000 --require ts-node/register --require source-map-support/register \"test/lib/**/*.ts\"",
     "test:sol": "truffle test --contracts_directory=./src test/contracts/requestHashStorage.js",
     "test": "yarn run test:lib && yarn run test:sol",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov"

packages/ethereum-storage/src/lib/ethereum-blocks.ts

@@ -61,14 +61,22 @@ export default class EthereumBlocks {
   public async getBlockNumbersFromTimestamp(
     timestamp: number,
   ): Promise<Types.IBlockNumbersInterval> {
+
     // check if we have the blockTimestamp of the first significant block number
     if (!this.blockTimestamp[this.firstSignificantBlockNumber]) {
       // update the blockTimestamp cache with the first significant block
       await this.getBlockTimestamp(this.firstSignificantBlockNumber);
     }
+
     // update the last block number in memory
     const lastBlockNumber: number = await this.getLastBlockNumber();
 
+    // check if we have the blockTimestamp of the last number
+    if (!this.blockTimestamp[lastBlockNumber]) {
+      // update the blockTimestamp cache with the last block
+      await this.getBlockTimestamp(lastBlockNumber);
+    }
+
     // if timestamp before first significant block, return the significant block
     if (timestamp <= this.blockTimestamp[this.firstSignificantBlockNumber]) {
       return {
@@ -77,9 +85,12 @@ export default class EthereumBlocks {
       };
     }
 
-    // if timestamp after last block, return null
+    // if timestamp after last block, return lastBlockNumber
     if (timestamp > this.blockTimestamp[lastBlockNumber]) {
-      throw Error('Timestamp is bigger than the last block of ethereum');
+      return {
+        blockAfter: lastBlockNumber,
+        blockBefore: lastBlockNumber,
+      };
     }
 
     // Before doing the dichotomic search, we restrict the search to the two closest block we already know
@@ -101,12 +112,7 @@ export default class EthereumBlocks {
    * @return   blockNumber of the last block
    */
   public async getLastBlockNumber(): Promise<number> {
-    const lastBlockNumber = await this.eth.getBlockNumber();
-
-    // Store the timestamp of the block
-    await this.getBlockTimestamp(lastBlockNumber);
-
-    return lastBlockNumber;
+    return this.eth.getBlockNumber();
   }
 
   /**

packages/ethereum-storage/src/lib/smart-contract-manager.ts

@@ -7,6 +7,10 @@ const web3Eth = require('web3-eth');
 
 const bigNumber: any = require('bn.js');
 
+// Confirmation to wait in order to create metadata of the new added hash
+// TODO(PROT-252): Find the optimal value or fix to use 1
+const CONFIRMATION_TO_WAIT = 2;
+
 /**
  * Manages the smart contract used by the storage layer
  * to store the hashes of the data on Ethereum
@@ -82,7 +86,7 @@ export default class SmartContractManager {
     // Get the accounts on the provider
     // Throws an error if timeout is reached
     const accounts = await Promise.race([
-      this.timeoutPromise(this.timeout, 'Web3 provider connection timeout'),
+      this.timeoutPromise(this.timeout, 'Web3 getAccounts connection timeout'),
       this.eth.getAccounts(),
     ]);
 
@@ -110,13 +114,15 @@ export default class SmartContractManager {
     // Get the fee from the size of the content
     // Throws an error if timeout is reached
     const fee = await Promise.race([
-      this.timeoutPromise(this.timeout, 'Web3 provider connection timeout'),
+      this.timeoutPromise(this.timeout, 'Web3 getFeesAmount connection timeout'),
       this.requestHashStorage.methods.getFeesAmount(contentSize).call(),
     ]);
 
     const gasPriceToUse = gasPrice || config.getDefaultEthereumGasPrice();
 
     // Send transaction to contract
+    // TODO(PROT-181): Implement a log manager for the library
+    // use it for the different events (error, transactionHash, receipt and confirmation)
     return new Promise(
       (resolve, reject): any => {
         this.requestHashStorage.methods
@@ -130,22 +136,9 @@ export default class SmartContractManager {
           .on('error', (transactionError: string) => {
             reject(Error(`Ethereum transaction error:  ${transactionError}`));
           })
-          .on('transactionHash', (transactionHash: string) => {
-            // TODO(PROT-181): Implement a log manager for the library
-            /* tslint:disable:no-console */
-            console.log(`transactionHash :  ${transactionHash}`);
-          })
-          .on('receipt', (receiptInCallback: string) => {
-            // TODO(PROT-181): Implement a log manager for the library
-            /* tslint:disable:no-console */
-            console.log(`receipt :  ${JSON.stringify(receiptInCallback)}`);
-          })
           .on('confirmation', (confirmationNumber: number, receiptAfterConfirmation: any) => {
-            // TODO(PROT-181): Implement a log manager for the library
-            // TODO(PROT-252): return after X confirmation instead of 0
-
-            // We have to wait at least one confirmation to get Ethereum metadata
-            if (confirmationNumber > 0) {
+            // TODO(PROT-252): search for the best number of confirmation to wait for
+            if (confirmationNumber >= CONFIRMATION_TO_WAIT) {
               const gasFee = new bigNumber(receiptAfterConfirmation.gasUsed).mul(
                 new bigNumber(gasPriceToUse),
               );
@@ -234,7 +227,7 @@ export default class SmartContractManager {
 
     // Reading all event logs
     let events = await Promise.race([
-      this.timeoutPromise(this.timeout, 'Web3 provider connection timeout'),
+      this.timeoutPromise(this.timeout, 'Web3 getPastEvents connection timeout'),
       this.requestHashStorage.getPastEvents({
         event: 'NewHash',
         fromBlock,
@@ -338,7 +331,8 @@ export default class SmartContractManager {
     try {
       blockTimestamp = await this.ethereumBlocks.getBlockTimestamp(blockNumber);
     } catch (error) {
-      throw Error(`Error getting block timestamp: ${error}`);
+
+      throw Error(`Error getting block ${blockNumber} timestamp: ${error}`);
     }
 
     return {

packages/ethereum-storage/test/lib/ethereum-blocks.test.ts

@@ -245,10 +245,11 @@ describe('EthereumBlocks', () => {
         blockBefore: 99,
       });
 
-      // after last block
-      await expect(ethereumBlocks.getBlockNumbersFromTimestamp(99999)).to.eventually.rejectedWith(
-        'Timestamp is bigger than the last block of ethereum',
-      );
+      // with timestamp over last block
+      expect(await ethereumBlocks.getBlockNumbersFromTimestamp(99999)).to.be.deep.equal({
+        blockAfter: 99,
+        blockBefore: 99,
+      });
     });
   });
 });

packages/integration-test/package.json

@@ -31,8 +31,8 @@
     "lint": "tslint --project . && eslint \"test/**/*.ts\"",
     "lint-staged": "lint-staged",
     "test": "run-s test:node test:layers",
-    "test:layers": "mocha --timeout=5000 --require ts-node/register \"test/layers.test.ts\"",
-    "test:node": "mocha --timeout=5000 --require ts-node/register \"test/node-client.test.ts\""
+    "test:layers": "mocha --timeout=10000 --require ts-node/register \"test/layers.test.ts\"",
+    "test:node": "mocha --timeout=10000 --require ts-node/register \"test/node-client.test.ts\""
   },
   "devDependencies": {
     "@requestnetwork/advanced-logic": "0.1.1-alpha.7",

packages/request-node/package.json

@@ -30,7 +30,7 @@
   ],
   "scripts": {
     "build": "tsc -b",
-    "test": "nyc mocha --timeout=4000 --exit --require ts-node/register --require source-map-support/register test/**/*.ts",
+    "test": "nyc mocha --timeout=10000 --exit --require ts-node/register --require source-map-support/register test/**/*.ts",
     "start": "ts-node src/server.ts",
     "clean": "shx rm -rf dist",
     "lint-staged": "lint-staged",

packages/request-node/src/request/getTransactionsByTopic.ts

@@ -42,6 +42,9 @@ export default async function getTransactionsByTopic(
 
       serverResponse.status(httpStatus.OK).send(transactions);
     } catch (e) {
+      // tslint:disable-next-line:no-console
+      console.error(`getTransactionsByTopic error: ${e}`);
+
       serverResponse.status(httpStatus.INTERNAL_SERVER_ERROR).send(e);
     }
   }

packages/request-node/src/request/persistTransaction.ts

@@ -31,7 +31,11 @@ export default async function persistTransaction(
       );
 
       serverResponse.status(httpStatus.OK).send(dataAccessResponse);
+
     } catch (e) {
+      // tslint:disable-next-line:no-console
+      console.error(`persistTransaction error: ${e}`);
+
       serverResponse.status(httpStatus.INTERNAL_SERVER_ERROR).send(e);
     }
   }