Merge branch 'master' into feature/ctd_trusted_algo

.travis.yml

@@ -23,7 +23,7 @@ before_script:
   - ganache-cli --port 18545 > ganache-cli.log &
   - git clone https://github.com/oceanprotocol/barge
   - cd barge
-  - export AQUARIUS_VERSION=ctd_trusted_algo
+  - export AQUARIUS_VERSION=v1.1.0
   - export BRIZO_VERSION=v0.9.7
   - export KEEPER_VERSION=v0.13.2
   - export EVENTS_HANDLER_VERSION=v0.4.7

CHANGELOG.md

@@ -4,6 +4,33 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v2.1.3](https://github.com/oceanprotocol/squid-js/compare/v2.1.2...v2.1.3)
+
+> 19 May 2020
+
+- Bump @types/node from 14.0.0 to 14.0.1 [`#429`](https://github.com/oceanprotocol/squid-js/pull/429)
+- Bump mocha from 7.1.0 to 7.1.2 [`#426`](https://github.com/oceanprotocol/squid-js/pull/426)
+- security fixes [`57ed868`](https://github.com/oceanprotocol/squid-js/commit/57ed8681c167c191ffdb6fd7385e3a2f8a7cb70b)
+- Merge pull request #428 from oceanprotocol/dependabot/npm_and_yarn/ethereum-navigator/navigator-0.5.2 [`5d3bc94`](https://github.com/oceanprotocol/squid-js/commit/5d3bc949de1306f01fde21f97d4dd0255aa1c78b)
+- Merge pull request #425 from oceanprotocol/dependabot/npm_and_yarn/release-it/bumper-1.1.1 [`dad7804`](https://github.com/oceanprotocol/squid-js/commit/dad78048bad39c0fc3411d6f6d4243317bfba4b6)
+
+#### [v2.1.2](https://github.com/oceanprotocol/squid-js/compare/v2.1.1...v2.1.2)
+
+> 18 May 2020
+
+- fix timeouts [`#413`](https://github.com/oceanprotocol/squid-js/pull/413)
+- Bump @typescript-eslint/parser from 2.23.0 to 2.33.0 [`#419`](https://github.com/oceanprotocol/squid-js/pull/419)
+- Bump nyc from 15.0.0 to 15.0.1 [`#418`](https://github.com/oceanprotocol/squid-js/pull/418)
+- Bump eslint-config-prettier from 6.10.0 to 6.11.0 [`#417`](https://github.com/oceanprotocol/squid-js/pull/417)
+- Bump whatwg-url from 8.0.0 to 8.1.0 [`#416`](https://github.com/oceanprotocol/squid-js/pull/416)
+- Bump eslint-plugin-prettier from 3.1.2 to 3.1.3 [`#414`](https://github.com/oceanprotocol/squid-js/pull/414)
+- Update @types/node to the latest version 🚀 [`#412`](https://github.com/oceanprotocol/squid-js/pull/412)
+- [Security] Bump jquery from 3.4.1 to 3.5.1 [`#415`](https://github.com/oceanprotocol/squid-js/pull/415)
+- Update uuid to the latest version 🚀 [`#407`](https://github.com/oceanprotocol/squid-js/pull/407)
+- Release 2.1.2 [`32b671e`](https://github.com/oceanprotocol/squid-js/commit/32b671e2a4d48e05acab36fdd5fff8c2c83a3c48)
+- Merge pull request #424 from oceanprotocol/dependabot/npm_and_yarn/types/node-fetch-2.5.7 [`27a8a37`](https://github.com/oceanprotocol/squid-js/commit/27a8a37729bb01735c3023f6aa6fc23302f08d98)
+- Merge pull request #423 from oceanprotocol/dependabot/npm_and_yarn/types/sinon-9.0.1 [`c618c9c`](https://github.com/oceanprotocol/squid-js/commit/c618c9c2a752c02ba7f40051c6d7cd8fa8a20c08)
+
 #### [v2.1.1](https://github.com/oceanprotocol/squid-js/compare/v2.1.0...v2.1.1)
 
 > 14 April 2020
@@ -11,9 +38,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix Brizo auth for compute [`#400`](https://github.com/oceanprotocol/squid-js/pull/400)
 - Update @ethereum-navigator/navigator to the latest version 🚀 [`#398`](https://github.com/oceanprotocol/squid-js/pull/398)
 - Update auto-changelog to the latest version 🚀 [`#404`](https://github.com/oceanprotocol/squid-js/pull/404)
+- Release 2.1.1 [`a2f1985`](https://github.com/oceanprotocol/squid-js/commit/a2f19850790bcc77e04a085301094fb8ccc21e65)
 - chore(package): update lockfile package-lock.json [`96bd22d`](https://github.com/oceanprotocol/squid-js/commit/96bd22d83581ecc4d25eadd4f17f9c9a68c636a0)
 - fix signing [`795f849`](https://github.com/oceanprotocol/squid-js/commit/795f8494f99c4e771e70a8a33458f85ef89f36e4)
-- fix auth & tests [`7de1b11`](https://github.com/oceanprotocol/squid-js/commit/7de1b110b0c1c3cd46de153b87db911e677be599)
 
 #### [v2.1.0](https://github.com/oceanprotocol/squid-js/compare/v2.0.0...v2.1.0)
 
@@ -864,7 +891,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### [v0.1.1](https://github.com/oceanprotocol/squid-js/compare/v0.1.0...v0.1.1)
 
-> 14 April 2020
+> 19 May 2020
 
 #### [v0.1.0](https://github.com/oceanprotocol/squid-js/compare/v0.1.0-beta.20...v0.1.0)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oceanprotocol/squid",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "JavaScript client library for Ocean Protocol",
   "main": "./dist/node/squid.js",
   "typings": "./dist/node/squid.d.ts",
@@ -68,7 +68,7 @@
     "@types/chai": "^4.2.11",
     "@types/chai-spies": "^1.0.1",
     "@types/mocha": "^7.0.2",
-    "@types/node": "^13.9.1",
+    "@types/node": "^14.0.0",
     "@types/node-fetch": "^2.5.5",
     "@types/sinon": "^9.0.0",
     "@typescript-eslint/eslint-plugin": "^2.23.0",

src/ocean/OceanAssets.ts

@@ -512,7 +512,8 @@ export class OceanAssets extends Instantiable {
     public async createAccessServiceAttributes(
         consumerAccount: Account,
         price: string,
-        datePublished: string
+        datePublished: string,
+        timeout: number = 0
     ): Promise<ServiceAccess> {
         const { templates } = this.ocean.keeper
         const serviceAgreementTemplate = await templates.escrowAccessSecretStoreTemplate.getServiceAgreementTemplate()
@@ -526,7 +527,7 @@ export class OceanAssets extends Instantiable {
                     creator: consumerAccount.getId(),
                     datePublished,
                     price,
-                    timeout: 3600,
+                    timeout: timeout,
                     name: 'dataAssetAccessServiceAgreement'
                 },
                 serviceAgreementTemplate

src/ocean/OceanCompute.ts

@@ -295,6 +295,7 @@ export class OceanCompute extends Instantiable {
         consumerAccount: Account,
         price: string,
         datePublished: string,
+        timeout: number = 3600,
         computePrivacy?: ServiceComputePrivacy
     ): Promise<ServiceCompute> {
         const { templates } = this.ocean.keeper
@@ -310,8 +311,8 @@ export class OceanCompute extends Instantiable {
                     creator: consumerAccount.getId(),
                     datePublished,
                     price,
-                    timeout: 3600,
                     privacy: {},
+                    timeout: timeout,
                     name
                 },
                 serviceAgreementTemplate