From 9a024b6004ce3dfd5f66d19baefca7e06da2739f Mon Sep 17 00:00:00 2001 From: Jernej Pregelj Date: Tue, 25 Jun 2019 16:07:55 +0200 Subject: [PATCH] squid 0.6.2, to Nile --- .travis.yml | 12 ++++++------ client/package-lock.json | 6 +++--- client/package.json | 2 +- cypress/integration/consume.spec.js | 4 ++-- cypress/integration/faucet.spec.js | 2 +- cypress/integration/publish.spec.js | 2 +- cypress/integration/search.spec.js | 2 +- package-lock.json | 28 ++++++++++++++++++++++++++-- package.json | 5 +++-- 9 files changed, 44 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 65792ad..e9daf1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,15 +16,15 @@ before_install: script: # - ./scripts/install.sh # runs automatically with npm ci # run E2E tests against these values - - export REACT_APP_NODE_URI="https://pacific.oceanprotocol.com" - - export REACT_APP_AQUARIUS_URI="https://aquarius.pacific.dev-ocean.com" - - export REACT_APP_BRIZO_URI="https://brizo.pacific.dev-ocean.com" - - export REACT_APP_SECRET_STORE_URI="https://secret-store.pacific.oceanprotocol.com" - - export REACT_APP_FAUCET_URI="https://faucet.pacific.dev-ocean.com" + - export REACT_APP_NODE_URI="https://nile.dev-ocean.com" + - export REACT_APP_AQUARIUS_URI="https://aquarius.marketplace.dev-ocean.com" + - export REACT_APP_BRIZO_URI="https://brizo.marketplace.dev-ocean.com" + - export REACT_APP_SECRET_STORE_URI="https://secret-store.marketplace.dev-ocean.com" + - export REACT_APP_FAUCET_URI="https://faucet.nile.dev-ocean.com" - export REACT_APP_BRIZO_ADDRESS="0x008c25ed3594e094db4592f4115d5fa74c4f41ea" - export CYPRESS_NODE_URI=REACT_APP_NODE_URI - export CYPRESS_SEEDPHRASE="taxi music thumb unique chat sand crew more leg another off lamp" - - export CYPRESS_CONSUME_ASSET="http://localhost:3000/asset/did:op:f5530ed7f4e3413db2dc223ab20e802c119ca24ac26d471497a4ac317fb6e667" + - export CYPRESS_CONSUME_ASSET="http://localhost:3000/asset/did:op:8014d305dcb44b42a5355791a2f016a654a61184456a4d178dc6e5913deb3a5c" - ./scripts/test.sh - ./scripts/coverage.sh - ./scripts/build.sh diff --git a/client/package-lock.json b/client/package-lock.json index 5c1a5ea..6e564da 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1296,9 +1296,9 @@ "integrity": "sha512-Nvnk9nNWMmfXz38bHRHHNgc8MGmFPZTkXPBWbEXR9+maJq5/kRFx8OckroKqmYXX4QBEh5frwd77omNOL2MUNw==" }, "@oceanprotocol/squid": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@oceanprotocol/squid/-/squid-0.6.1.tgz", - "integrity": "sha512-GWkB4caaXK3F5iWnxg9XcJDsdNGNDO5+nG3EVqeYjZo8tGJ8+fAd8EbgXM/czRuzFWyd4kjgfXM6z60K50ovEQ==", + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/@oceanprotocol/squid/-/squid-0.6.2.tgz", + "integrity": "sha512-H9xHNIYl2sNiMIAC7pd936azNI9EBpbyWMA4kcKo8jbOdIfskbXrPFab3t+EYsbHBnRuV8oWEPT7hUVLOL8SJQ==", "requires": { "@oceanprotocol/keeper-contracts": "^0.10.3", "bignumber.js": "^8.1.1", diff --git a/client/package.json b/client/package.json index f8bf5ac..a01a73a 100644 --- a/client/package.json +++ b/client/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@oceanprotocol/art": "^2.2.0", - "@oceanprotocol/squid": "^0.6.1", + "@oceanprotocol/squid": "^0.6.2", "@oceanprotocol/typographies": "^0.1.0", "@sindresorhus/slugify": "^0.9.1", "axios": "^0.19.0", diff --git a/cypress/integration/consume.spec.js b/cypress/integration/consume.spec.js index 709afd9..e546af0 100644 --- a/cypress/integration/consume.spec.js +++ b/cypress/integration/consume.spec.js @@ -11,7 +11,7 @@ context('Consume', () => { : 'taxi music thumb unique chat sand crew more leg another off lamp', Cypress.env('NODE_URI') ? Cypress.env('NODE_URI') - : 'https://pacific.oceanprotocol.com' + : 'https://nile.dev-ocean.com' ) win.web3 = new Web3(provider) win.ethereum = win.web3 @@ -20,7 +20,7 @@ context('Consume', () => { cy.visit( Cypress.env('CONSUME_ASSET') ? Cypress.env('CONSUME_ASSET') - : 'http://localhost:3000/asset/did:op:66c9d023cd444999916570b5174d0f9037d8f85d24ba4c129e7f127f7c21aafa' + : 'http://localhost:3000/asset/did:op:8014d305dcb44b42a5355791a2f016a654a61184456a4d178dc6e5913deb3a5c' ) // Wait for end of loading diff --git a/cypress/integration/faucet.spec.js b/cypress/integration/faucet.spec.js index 99245eb..4973215 100644 --- a/cypress/integration/faucet.spec.js +++ b/cypress/integration/faucet.spec.js @@ -11,7 +11,7 @@ context('Faucet', () => { : 'taxi music thumb unique chat sand crew more leg another off lamp', Cypress.env('NODE_URI') ? Cypress.env('NODE_URI') - : 'https://pacific.oceanprotocol.com' + : 'https://nile.dev-ocean.com' ) win.web3 = new Web3(provider) win.ethereum = win.web3 diff --git a/cypress/integration/publish.spec.js b/cypress/integration/publish.spec.js index dcab97c..bb87dbb 100644 --- a/cypress/integration/publish.spec.js +++ b/cypress/integration/publish.spec.js @@ -11,7 +11,7 @@ context('Publish', () => { : 'taxi music thumb unique chat sand crew more leg another off lamp', Cypress.env('NODE_URI') ? Cypress.env('NODE_URI') - : 'https://pacific.oceanprotocol.com' + : 'https://nile.dev-ocean.com' ) win.web3 = new Web3(provider) win.ethereum = win.web3 diff --git a/cypress/integration/search.spec.js b/cypress/integration/search.spec.js index 3d9e44c..6f12a19 100644 --- a/cypress/integration/search.spec.js +++ b/cypress/integration/search.spec.js @@ -11,7 +11,7 @@ context('Search', () => { : 'taxi music thumb unique chat sand crew more leg another off lamp', Cypress.env('NODE_URI') ? Cypress.env('NODE_URI') - : 'https://pacific.oceanprotocol.com' + : 'https://nile.dev-ocean.com' ) win.web3 = new Web3(provider) win.ethereum = win.web3 diff --git a/package-lock.json b/package-lock.json index c26bfd1..0007a85 100644 --- a/package-lock.json +++ b/package-lock.json @@ -131,6 +131,14 @@ "regenerator-runtime": "^0.13.2" } }, + "@babel/runtime": { + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz", + "integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==", + "requires": { + "regenerator-runtime": "^0.13.2" + } + }, "@babel/template": { "version": "7.4.0", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.0.tgz", @@ -7454,6 +7462,14 @@ "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=", "dev": true }, + "raf": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz", + "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==", + "requires": { + "performance-now": "^2.1.0" + } + }, "ramda": { "version": "0.24.1", "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.24.1.tgz", @@ -7543,6 +7559,15 @@ } } }, + "react-collapsed": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/react-collapsed/-/react-collapsed-2.0.1.tgz", + "integrity": "sha512-ullymRST/C5iy0szhxpYmIaLUhi+IC8EpFySmUjttoc+ErotaKAx+z1ff0d2PCJF7ksW8crTiOrIwGtFqYw3Tg==", + "requires": { + "@babel/runtime": "^7.3.1", + "raf": "^3.4.0" + } + }, "react-is": { "version": "16.8.6", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", @@ -7659,8 +7684,7 @@ "regenerator-runtime": { "version": "0.13.2", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz", - "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==", - "dev": true + "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==" }, "regex-cache": { "version": "0.4.4", diff --git a/package.json b/package.json index d599e4d..88851cc 100644 --- a/package.json +++ b/package.json @@ -25,8 +25,9 @@ "cypress:open": "cypress open" }, "dependencies": { - "web3": "1.0.0-beta.37", - "truffle-hdwallet-provider": "^1.0.10" + "react-collapsed": "^2.0.1", + "truffle-hdwallet-provider": "^1.0.10", + "web3": "1.0.0-beta.37" }, "devDependencies": { "@release-it/bumper": "^1.0.2",