never stop typing

.eslintrc

@@ -20,8 +20,6 @@
   ],
   "plugins": ["@typescript-eslint", "prettier"],
   "rules": {
-    "@typescript-eslint/explicit-member-accessibility": "off",
-    "@typescript-eslint/no-var-requires": "off",
     "no-empty": ["error", { "allowEmptyCatch": true }],
     "prefer-destructuring": ["warn"],
     "no-dupe-class-members": ["warn"],

package.json

@@ -13,7 +13,7 @@
     "lint": "eslint --ignore-path .gitignore --ext .ts,.tsx . && npm run type-check",
     "lint:fix": "eslint --ignore-path .gitignore --ext .ts,.tsx . --fix",
     "format": "prettier --parser typescript --ignore-path .gitignore --write '**/*.{js,jsx,ts,tsx}'",
-    "type-check": "tsc --noEmit",
+    "type-check": "npm run build:metadata && tsc --noEmit",
     "doc:json": "./scripts/typedoc.js",
     "run": "ts-node",
     "release": "release-it --non-interactive",

src/datatokens/ContractHandler.ts

@@ -47,6 +47,7 @@ export default class ContractHandler extends Instantiable {
 
   private async load(what: string, where: string, networkId: number): Promise<Contract> {
     this.logger.debug('Loading', what, 'from', where)
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
     const artifact = require(`@oceanprotocol/contracts/artifacts/${where}/${what}.json`)
     // Logger.log('Loaded artifact', artifact)
     const code = await this.web3.eth.getCode(artifact.address)

src/datatokens/Datatokens.ts

@@ -16,10 +16,9 @@ export class DataTokens {
   /**
    * Instantiate DataTokens (independently of Ocean).
    * @param {String} factoryAddress
-     * @param {any} factoryABI
+   * @param {AbiItem | AbiItem[]} factoryABI
-     * @param {any} datatokensABI
+   * @param {AbiItem | AbiItem[]} datatokensABI
-     * @param {any} web3 
+   * @param {Web3} web3
-     
    */
   constructor(
     factoryAddress: string,

src/ocean/Versions.ts

@@ -1,4 +1,4 @@
-import * as metadata from '../metadata.json'
+import metadata from '../metadata.json'
 
 import { Instantiable, InstantiableConfig } from '../Instantiable.abstract'
 

src/ocean/utils/WebServiceConnector.ts

@@ -3,6 +3,7 @@ import fs from 'fs'
 import { Logger } from '../../utils'
 import save from 'save-file'
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const fetch = require('node-fetch')
 
 /**

test/integration/ComputeFlow.test.ts

@@ -1,13 +1,14 @@
+import { AbiItem } from 'web3-utils/types'
 import { TestContractHandler } from '../TestContractHandler'
 import { DataTokens } from '../../src/datatokens/Datatokens'
 import { Ocean } from '../../src/ocean/Ocean'
 import config from './config'
 import { assert } from 'console'
 import { ServiceComputePrivacy } from '../../src/ddo/interfaces/Service'
-const Web3 = require('web3')
+import Web3 from 'web3'
+import factory from '@oceanprotocol/contracts/artifacts/DTFactory.json'
+import datatokensTemplate from '@oceanprotocol/contracts/artifacts/DataTokenTemplate.json'
 const web3 = new Web3('http://127.0.0.1:8545')
-const factory = require('@oceanprotocol/contracts/artifacts/DTFactory.json')
-const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/DataTokenTemplate.json')
 
 describe('Compute flow', () => {
   let owner
@@ -55,8 +56,8 @@ describe('Compute flow', () => {
   describe('#MarketplaceComputeFlow-Test', () => {
     it('Initialize Ocean contracts v3', async () => {
       contracts = new TestContractHandler(
-        factory.abi,
+        factory.abi as AbiItem[],
-        datatokensTemplate.abi,
+        datatokensTemplate.abi as AbiItem[],
         datatokensTemplate.bytecode,
         factory.bytecode,
         web3
@@ -74,8 +75,8 @@ describe('Compute flow', () => {
     it('Alice deploys datatoken contract', async () => {
       datatoken = new DataTokens(
         contracts.factoryAddress,
-        factory.abi,
+        factory.abi as AbiItem[],
-        datatokensTemplate.abi,
+        datatokensTemplate.abi as AbiItem[],
         web3
       )
       tokenAddress = await datatoken.create(blob, alice.getId())

test/integration/Marketplaceflow.test.ts

@@ -1,13 +1,14 @@
+import { AbiItem } from 'web3-utils/types'
 import { TestContractHandler } from '../TestContractHandler'
 import { DataTokens } from '../../src/datatokens/Datatokens'
 import { Ocean } from '../../src/ocean/Ocean'
 import config from './config'
 import { assert } from 'console'
 
-const Web3 = require('web3')
+import Web3 from 'web3'
+import factory from '@oceanprotocol/contracts/artifacts/DTFactory.json'
+import datatokensTemplate from '@oceanprotocol/contracts/artifacts/DataTokenTemplate.json'
 const web3 = new Web3('http://127.0.0.1:8545')
-const factory = require('@oceanprotocol/contracts/artifacts/DTFactory.json')
-const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/DataTokenTemplate.json')
 
 describe('Marketplace flow', () => {
   let owner
@@ -32,8 +33,8 @@ describe('Marketplace flow', () => {
   describe('#MarketplaceDownloadFlow-Test', () => {
     it('Initialize Ocean contracts v3', async () => {
       contracts = new TestContractHandler(
-        factory.abi,
+        factory.abi as AbiItem[],
-        datatokensTemplate.abi,
+        datatokensTemplate.abi as AbiItem[],
         datatokensTemplate.bytecode,
         factory.bytecode,
         web3
@@ -52,8 +53,8 @@ describe('Marketplace flow', () => {
     it('Alice publishes a datatoken contract', async () => {
       datatoken = new DataTokens(
         contracts.factoryAddress,
-        factory.abi,
+        factory.abi as AbiItem[],
-        datatokensTemplate.abi,
+        datatokensTemplate.abi as AbiItem[],
         web3
       )
       tokenAddress = await datatoken.create(blob, alice.getId())

test/integration/Rinkeby.test.ts

@@ -1,10 +1,10 @@
 import { TestContractHandler } from '../TestContractHandler'
 import { DataTokens } from '../../src/datatokens/Datatokens'
 
-const Web3 = require('web3')
+import Web3 from 'web3'
+import factory from '@oceanprotocol/contracts/artifacts/DTFactory.json'
+import datatokensTemplate from '@oceanprotocol/contracts/artifacts/DataTokenTemplate.json'
 const web3 = new Web3('wss://rinkeby.infura.io/ws/v3/357f2fe737db4304bd2f7285c5602d0d')
-const factory = require('@oceanprotocol/contracts/artifacts/DTFactory.json')
-const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/DataTokenTemplate.json')
 
 describe('Rinkeby test', () => {
   // let account

test/integration/Simpleflow.test.ts

@@ -1,12 +1,11 @@
 import { TestContractHandler } from '../TestContractHandler'
 import { DataTokens } from '../../src/datatokens/Datatokens'
-import { Ocean } from '../../src/ocean/Ocean'
+import { AbiItem } from 'web3-utils/types'
-import { Config } from '../../src/models/Config'
 
-const Web3 = require('web3')
+import Web3 from 'web3'
+import factory from '@oceanprotocol/contracts/artifacts/DTFactory.json'
+import datatokensTemplate from '@oceanprotocol/contracts/artifacts/DataTokenTemplate.json'
 const web3 = new Web3('http://127.0.0.1:8545')
-const factory = require('@oceanprotocol/contracts/artifacts/DTFactory.json')
-const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/DataTokenTemplate.json')
 
 describe('Simple flow', () => {
   let owner
@@ -22,8 +21,8 @@ describe('Simple flow', () => {
   describe('#test', () => {
     it('Initialize Ocean contracts v3', async () => {
       contracts = new TestContractHandler(
-        factory.abi,
+        factory.abi as AbiItem[],
-        datatokensTemplate.abi,
+        datatokensTemplate.abi as AbiItem[],
         datatokensTemplate.bytecode,
         factory.bytecode,
         web3
@@ -38,8 +37,8 @@ describe('Simple flow', () => {
       // Alice creates a Datatoken
       datatoken = new DataTokens(
         contracts.factoryAddress,
-        factory.abi,
+        factory.abi as AbiItem[],
-        datatokensTemplate.abi,
+        datatokensTemplate.abi as AbiItem[],
         web3
       )
       tokenAddress = await datatoken.create(blob, alice)

test/integration/config.ts

@@ -1,9 +1,9 @@
 import { Config, LogLevel } from '../../src/models/Config'
 import { LoggerInstance } from '../../src/utils'
 
-LoggerInstance.setLevel(LogLevel.Error)
+import Web3 from 'web3'
 
-const Web3 = require('web3')
+LoggerInstance.setLevel(LogLevel.Error)
 const web3 = new Web3('http://127.0.0.1:8545')
 
 export default {

test/unit/Datatokens.test.ts

@@ -1,10 +1,11 @@
 import { assert } from 'chai'
+import { AbiItem } from 'web3-utils/types'
 import { TestContractHandler } from '../TestContractHandler'
 import { DataTokens } from '../../src/datatokens/Datatokens'
 
-const Web3 = require('web3')
+import Web3 from 'web3'
-const factory = require('@oceanprotocol/contracts/artifacts/DTFactory.json')
+import factory from '@oceanprotocol/contracts/artifacts/DTFactory.json'
-const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/DataTokenTemplate.json')
+import datatokensTemplate from '@oceanprotocol/contracts/artifacts/DataTokenTemplate.json'
 
 const web3 = new Web3('http://127.0.0.1:8545')
 
@@ -21,8 +22,8 @@ describe('DataTokens', () => {
   describe('#test', () => {
     it('should deploy contracts', async () => {
       contracts = new TestContractHandler(
-        factory.abi,
+        factory.abi as AbiItem[],
-        datatokensTemplate.abi,
+        datatokensTemplate.abi as AbiItem[],
         datatokensTemplate.bytecode,
         factory.bytecode,
         web3
@@ -36,8 +37,8 @@ describe('DataTokens', () => {
     it('should initialize datatokens class', async () => {
       datatoken = new DataTokens(
         contracts.factoryAddress,
-        factory.abi,
+        factory.abi as AbiItem[],
-        datatokensTemplate.abi,
+        datatokensTemplate.abi as AbiItem[],
         web3
       )
       assert(datatoken !== null)

test/unit/balancer/Balancer.test.ts

@@ -1,17 +1,18 @@
 import { assert } from 'chai'
+import { AbiItem } from 'web3-utils/types'
 import { TestContractHandler } from '../../TestContractHandler'
 import { BalancerContractHandler } from '../../BalancerContractHandler'
 import { DataTokens } from '../../../src/datatokens/Datatokens'
 import { OceanPool } from '../../../src/balancer/OceanPool'
 
-const Web3 = require('web3')
+import Web3 from 'web3'
-const web3 = new Web3('http://127.0.0.1:8545')
+import factory from '@oceanprotocol/contracts/artifacts/DTFactory.json'
-const factory = require('@oceanprotocol/contracts/artifacts/DTFactory.json')
+import datatokensTemplate from '@oceanprotocol/contracts/artifacts/DataTokenTemplate.json'
-const datatokensTemplate = require('@oceanprotocol/contracts/artifacts/DataTokenTemplate.json')
 
 // this will be replaced by our SFactory/SPool
-const OceanPoolFactory = require('@oceanprotocol/contracts/artifacts/SFactory.json')
+import OceanPoolFactory from '@oceanprotocol/contracts/artifacts/SFactory.json'
-const OceanSPool = require('@oceanprotocol/contracts/artifacts/SPool.json')
+import OceanSPool from '@oceanprotocol/contracts/artifacts/SPool.json'
+const web3 = new Web3('http://127.0.0.1:8545')
 
 describe('Balancer flow', () => {
   let oceanTokenAddress
@@ -35,9 +36,9 @@ describe('Balancer flow', () => {
     before(async () => {
       // deploy SFactory
       const SContracts = new BalancerContractHandler(
-        OceanPoolFactory.abi,
+        OceanPoolFactory.abi as AbiItem[],
         OceanPoolFactory.bytecode,
-        OceanSPool.abi,
+        OceanSPool.abi as AbiItem[],
         OceanSPool.bytecode,
         web3
       )
@@ -50,8 +51,8 @@ describe('Balancer flow', () => {
 
       // deploy DT Factory
       contracts = new TestContractHandler(
-        factory.abi,
+        factory.abi as AbiItem[],
-        datatokensTemplate.abi,
+        datatokensTemplate.abi as AbiItem[],
         datatokensTemplate.bytecode,
         factory.bytecode,
         web3
@@ -65,8 +66,8 @@ describe('Balancer flow', () => {
       // initialize DataTokens
       datatoken = new DataTokens(
         contracts.factoryAddress,
-        factory.abi,
+        factory.abi as AbiItem[],
-        datatokensTemplate.abi,
+        datatokensTemplate.abi as AbiItem[],
         web3
       )
       assert(datatoken !== null)
@@ -80,8 +81,8 @@ describe('Balancer flow', () => {
       // Alice creates a Datatoken
       oceandatatoken = new DataTokens(
         contracts.factoryAddress,
-        factory.abi,
+        factory.abi as AbiItem[],
-        datatokensTemplate.abi,
+        datatokensTemplate.abi as AbiItem[],
         web3
       )
       oceanTokenAddress = await oceandatatoken.create(blob, alice)
@@ -89,8 +90,8 @@ describe('Balancer flow', () => {
     it('should initialize OceanPool class', async () => {
       Pool = new OceanPool(
         web3,
-        OceanPoolFactory.abi,
+        OceanPoolFactory.abi as AbiItem[],
-        OceanSPool.abi,
+        OceanSPool.abi as AbiItem[],
         OceanPoolFactoryAddress,
         oceanTokenAddress
       )