Merge remote-tracking branch 'origin/master' into update/packages

# Conflicts:
#	package-lock.json
#	package.json

src/Instantiable.abstract.ts

@@ -66,6 +66,7 @@ export abstract class Instantiable {
     }
 
     public static async getInstance(...args: any[]): Promise<any>
+
     public static async getInstance(config: InstantiableConfig): Promise<any> {
         LoggerInstance.warn(
             'getInstance() methods has needs to be added to child class.'
@@ -83,8 +84,11 @@ export abstract class Instantiable {
     }
 
     private _ocean: Ocean
+
     private _web3: Web3
+
     private _config: Config
+
     private _logger: Logger
 
     protected setInstanceConfig(config: InstantiableConfig) {

src/ddo/DDO.ts

@@ -39,10 +39,15 @@ export class DDO {
      * @type {string}
      */
     public id: string = null
+
     public created: string
+
     public publicKey: PublicKey[] = []
+
     public authentication: Authentication[] = []
+
     public service: Service[] = []
+
     public proof: Proof
 
     public constructor(ddo: Partial<DDO> = {}) {

src/keeper/EventHandler.ts

@@ -9,9 +9,13 @@ export class EventHandler extends Instantiable {
     }
 
     private events = new Set<(blockNumber) => void>()
+
     private lastBlock: number
+
     private interval = 200
+
     private polling: boolean = false
+
     private lastTimeout: NodeJS.Timeout
 
     constructor(config: InstantiableConfig) {

src/keeper/contracts/ContractBase.ts

@@ -6,6 +6,7 @@ import { Instantiable, InstantiableConfig } from '../../Instantiable.abstract'
 
 export abstract class ContractBase extends Instantiable {
     protected static instance = null
+
     public contractName: string
 
     private contract: Contract = null

src/keeper/contracts/conditions/Condition.abstract.ts

@@ -36,6 +36,7 @@ export abstract class Condition extends ContractBase {
     }
 
     public fulfill(agreementId: string, ...args: any[])
+
     public fulfill(agreementId: string, args: any[], from?: string) {
         return this.sendFrom('fulfill', [zeroX(agreementId), ...args], from)
     }

src/models/Balance.ts

@@ -1,4 +1,5 @@
 export default class Balance {
     public eth: number
+
     public ocn: number
 }

src/models/Config.ts

@@ -13,6 +13,7 @@ export class Config {
      * @type {string}
      */
     public brizoUri: string
+
     /**
      * Address of Brizo.
      * @type {string}
@@ -24,6 +25,7 @@ export class Config {
      * @type {string}
      */
     public nodeUri?: string
+
     /**
      * Web3 Provider.
      * @type {any}
@@ -56,6 +58,7 @@ export class Config {
 
     // Parity config
     public parityUri?: string
+
     public threshold?: number
 }
 

src/models/InputType.ts

@@ -1,4 +1,5 @@
 export default class InputType {
     public name: string
+
     public type: string
 }

src/models/MethodReflection.ts

@@ -2,8 +2,12 @@ import InputType from './InputType'
 
 export default class MethodReflection {
     public contractName: string
+
     public methodName: string
+
     public address: string
+
     public signature: string
+
     public inputs: InputType[]
 }

src/models/ValuePair.ts

@@ -1,4 +1,5 @@
 export default class ValuePair {
     public type: string
+
     public value: any
 }

src/ocean/Account.ts

@@ -8,6 +8,7 @@ import { Instantiable, InstantiableConfig } from '../Instantiable.abstract'
  */
 export default class Account extends Instantiable {
     private password?: string
+
     private token?: string
 
     constructor(private id: string = '0x0', config?: InstantiableConfig) {

src/utils/SubscribableObserver.ts

@@ -1,5 +1,6 @@
 export class SubscribableObserver<T, P> {
     public completed: boolean = false
+
     private subscriptions = new Set<{
         onNext?: (next: T) => void
         onComplete?: (complete: P) => void

src/utils/SubscribablePromise.ts

@@ -2,6 +2,7 @@ import { SubscribableObserver } from './SubscribableObserver'
 
 export class SubscribablePromise<T extends any, P extends any> {
     private observer = new SubscribableObserver<T, P>()
+
     private promise = Object.assign(
         new Promise<P>((resolve, reject) => {
             setTimeout(() => {