From 40dab7033119f2e3cf08efa6aa337e85476e54b6 Mon Sep 17 00:00:00 2001 From: Jernej Pregelj Date: Mon, 1 Jul 2019 14:52:30 +0200 Subject: [PATCH 01/10] connect to pacific --- client/src/components/molecules/AccountStatus/Popover.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/molecules/AccountStatus/Popover.tsx b/client/src/components/molecules/AccountStatus/Popover.tsx index ca03683..49dcd96 100644 --- a/client/src/components/molecules/AccountStatus/Popover.tsx +++ b/client/src/components/molecules/AccountStatus/Popover.tsx @@ -54,7 +54,7 @@ export default class Popover extends PureComponent<{
{network && !isOceanNetwork - ? 'Please connect to Custom RPC\n https://nile.dev-ocean.com' + ? 'Please connect to Custom RPC\n https://pacific.oceanprotocol.com' : network && `Connected to ${network} network`}
From d169e76f8d3a8c1a6703c85917feb2ddda76ecf0 Mon Sep 17 00:00:00 2001 From: Jernej Pregelj Date: Mon, 1 Jul 2019 15:06:52 +0200 Subject: [PATCH 02/10] travis fixes --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5dc59f7..fc48452 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,9 @@ env: global: # run E2E tests against these values - REACT_APP_NODE_URI="https://nile.dev-ocean.com" - - REACT_APP_AQUARIUS_URI="https://aquarius.marketplace.dev-ocean.com" - - REACT_APP_BRIZO_URI="https://brizo.marketplace.dev-ocean.com" - - REACT_APP_SECRET_STORE_URI="https://secret-store.pacific.dev-ocean.com" + - REACT_APP_AQUARIUS_URI="https://aquarius.nile.dev-ocean.com" + - REACT_APP_BRIZO_URI="https://brizo.nile.dev-ocean.com" + - REACT_APP_SECRET_STORE_URI="https://secret-store.dev-ocean.com" - REACT_APP_FAUCET_URI="https://faucet.nile.dev-ocean.com" - REACT_APP_BRIZO_ADDRESS="0x4aaab179035dc57b35e2ce066919048686f82972" From d343f58f8ef137921c1991da8f7e3c62215ca076 Mon Sep 17 00:00:00 2001 From: Jernej Pregelj Date: Mon, 1 Jul 2019 15:20:46 +0200 Subject: [PATCH 03/10] new travis variables --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fc48452..a228dcd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ env: - REACT_APP_NODE_URI="https://nile.dev-ocean.com" - REACT_APP_AQUARIUS_URI="https://aquarius.nile.dev-ocean.com" - REACT_APP_BRIZO_URI="https://brizo.nile.dev-ocean.com" - - REACT_APP_SECRET_STORE_URI="https://secret-store.dev-ocean.com" + - REACT_APP_SECRET_STORE_URI="https://secret-store.nile.dev-ocean.com" - REACT_APP_FAUCET_URI="https://faucet.nile.dev-ocean.com" - REACT_APP_BRIZO_ADDRESS="0x4aaab179035dc57b35e2ce066919048686f82972" From 28b4ce80aeafd4f1122aab325d2cb1e91f8fa113 Mon Sep 17 00:00:00 2001 From: Jernej Pregelj Date: Mon, 1 Jul 2019 15:25:41 +0200 Subject: [PATCH 04/10] update brizo address --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a228dcd..e05ed24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ env: - REACT_APP_BRIZO_URI="https://brizo.nile.dev-ocean.com" - REACT_APP_SECRET_STORE_URI="https://secret-store.nile.dev-ocean.com" - REACT_APP_FAUCET_URI="https://faucet.nile.dev-ocean.com" - - REACT_APP_BRIZO_ADDRESS="0x4aaab179035dc57b35e2ce066919048686f82972" + - REACT_APP_BRIZO_ADDRESS="0x376817c638d2a04f475a73af37f7b51a2862d567" before_install: - npm install -g npm From 3c5f0ce40125ba01a426d5b82650b17a608ed0cc Mon Sep 17 00:00:00 2001 From: Jernej Pregelj Date: Mon, 1 Jul 2019 16:22:15 +0200 Subject: [PATCH 05/10] fix/account-message --- cypress.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress.json b/cypress.json index a46d36a..d2f883b 100644 --- a/cypress.json +++ b/cypress.json @@ -3,6 +3,6 @@ "env": { "NODE_URI": "https://nile.dev-ocean.com", "SEEDPHRASE": "taxi music thumb unique chat sand crew more leg another off lamp", - "CONSUME_ASSET": "did:op:8014d305dcb44b42a5355791a2f016a654a61184456a4d178dc6e5913deb3a5c" + "CONSUME_ASSET": "did:op:0499b7aecaed49c7bbc687100c92ce3b7ee6a29ebb764968a89eb4ed6ecd7c36" } } From c367dd9e57ab9fe9bc5339f24a2b1b3617af7be7 Mon Sep 17 00:00:00 2001 From: Jernej Pregelj Date: Tue, 2 Jul 2019 10:52:14 +0200 Subject: [PATCH 06/10] update address --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e05ed24..a228dcd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ env: - REACT_APP_BRIZO_URI="https://brizo.nile.dev-ocean.com" - REACT_APP_SECRET_STORE_URI="https://secret-store.nile.dev-ocean.com" - REACT_APP_FAUCET_URI="https://faucet.nile.dev-ocean.com" - - REACT_APP_BRIZO_ADDRESS="0x376817c638d2a04f475a73af37f7b51a2862d567" + - REACT_APP_BRIZO_ADDRESS="0x4aaab179035dc57b35e2ce066919048686f82972" before_install: - npm install -g npm From eb21932604a5415f65cefc25e0a114beb91292a3 Mon Sep 17 00:00:00 2001 From: Jernej Pregelj Date: Tue, 2 Jul 2019 11:51:26 +0200 Subject: [PATCH 07/10] more text fixes --- client/src/config.ts | 6 +++--- client/src/data/web3message.json | 2 +- client/src/routes/Faucet.tsx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/src/config.ts b/client/src/config.ts index d8f029c..8be81ec 100644 --- a/client/src/config.ts +++ b/client/src/config.ts @@ -10,15 +10,15 @@ export const serviceUri = export const nodeUri = process.env.REACT_APP_NODE_URI || 'https://nile.dev-ocean.com' export const aquariusUri = - process.env.REACT_APP_AQUARIUS_URI || 'https://nginx-aquarius.dev-ocean.com' + process.env.REACT_APP_AQUARIUS_URI || 'https://aquarius.nile.dev-ocean.com' export const brizoUri = - process.env.REACT_APP_BRIZO_URI || 'https://nginx-brizo.dev-ocean.com' + process.env.REACT_APP_BRIZO_URI || 'https://brizo.nile.dev-ocean.com' export const brizoAddress = process.env.REACT_APP_BRIZO_ADDRESS || '0x4aaab179035dc57b35e2ce066919048686f82972' export const secretStoreUri = process.env.REACT_APP_SECRET_STORE_URI || - 'https://secret-store.dev-ocean.com' + 'https://secret-store.nile.dev-ocean.com' export const faucetUri = process.env.REACT_APP_FAUCET_URI || 'https://faucet.nile.dev-ocean.com' diff --git a/client/src/data/web3message.json b/client/src/data/web3message.json index a441d40..e651770 100644 --- a/client/src/data/web3message.json +++ b/client/src/data/web3message.json @@ -2,5 +2,5 @@ "noweb3": "Not a Web3 Browser. For publishing and downloading an asset you need to setup MetaMask or use any other Web3-capable plugin or browser.", "noAccount": "No accounts detected. For publishing and downloading an asset you need to unlock your Web3 account.", "hasAccount": "", - "wrongNetwork": "Not connected to Nile network.
Please connect in MetaMask with Custom RPC https://nile.dev-ocean.com" + "wrongNetwork": "Not connected to Pacific network.
Please connect in MetaMask with Custom RPC https://pacific.oceanprotocol.com" } diff --git a/client/src/routes/Faucet.tsx b/client/src/routes/Faucet.tsx index bed7633..6e01306 100644 --- a/client/src/routes/Faucet.tsx +++ b/client/src/routes/Faucet.tsx @@ -118,7 +118,7 @@ export default class Faucet extends PureComponent<{}, FaucetState> { return ( From 29aba3197db8de9e358600018d7431f7ca39ee36 Mon Sep 17 00:00:00 2001 From: Jernej Pregelj Date: Tue, 2 Jul 2019 14:14:39 +0200 Subject: [PATCH 08/10] about --- client/src/routes/About.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/routes/About.tsx b/client/src/routes/About.tsx index 10403df..eb723ab 100644 --- a/client/src/routes/About.tsx +++ b/client/src/routes/About.tsx @@ -13,8 +13,8 @@ class About extends Component {

Commons is built on top of the Ocean{' '} - - Nile test network + + Pacific network {' '} and is targeted at enthusiastic data scientists with some crypto experience. It can be used with any From 4e8680a0732e5f6de5617b61bb82b7e102596e33 Mon Sep 17 00:00:00 2001 From: Jernej Pregelj Date: Tue, 2 Jul 2019 14:24:13 +0200 Subject: [PATCH 09/10] fix test --- client/src/components/organisms/Web3message.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/organisms/Web3message.test.tsx b/client/src/components/organisms/Web3message.test.tsx index 36c1b0e..ce705a4 100644 --- a/client/src/components/organisms/Web3message.test.tsx +++ b/client/src/components/organisms/Web3message.test.tsx @@ -21,7 +21,7 @@ describe('Web3message', () => { ) expect(container.firstChild).toHaveTextContent( - 'Not connected to Nile network' + 'Not connected to Pacific network' ) }) From 6c8d22f56c1582ea1829d3453cf0bd4a635e4cc5 Mon Sep 17 00:00:00 2001 From: Jernej Pregelj Date: Tue, 2 Jul 2019 14:36:32 +0200 Subject: [PATCH 10/10] update test asset to consume --- cypress.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress.json b/cypress.json index d2f883b..c8c92fa 100644 --- a/cypress.json +++ b/cypress.json @@ -3,6 +3,6 @@ "env": { "NODE_URI": "https://nile.dev-ocean.com", "SEEDPHRASE": "taxi music thumb unique chat sand crew more leg another off lamp", - "CONSUME_ASSET": "did:op:0499b7aecaed49c7bbc687100c92ce3b7ee6a29ebb764968a89eb4ed6ecd7c36" + "CONSUME_ASSET": "did:op:73f50d7449ca478aabd2f34116dbdb1acf4304a407aa4251ab75ce15257b63bd" } }