From 220550d5de4e59e3775cd51cdcb3fddeb9e4931c Mon Sep 17 00:00:00 2001 From: Sebastian Gerske Date: Tue, 17 Sep 2019 12:22:11 +0200 Subject: [PATCH] updated atlas --- package-lock.json | 6 +++--- package.json | 2 +- src/Network.js | 16 ++++++++++------ src/Network.test.js | 4 ++-- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index a994ab3..eb0baac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -955,9 +955,9 @@ "integrity": "sha512-6It2EVfGskxZCQhuykrfnALg7oVeiI6KclWSmGDqB0AiInVrTGB9Jp9i4/Ad21u9Jde/voVQz6eFX/eSg/UsPA==" }, "@ethereum-navigator/atlas": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@ethereum-navigator/atlas/-/atlas-0.4.0.tgz", - "integrity": "sha512-NZO5bc7E++Fd8GRkOWpTvfJPQjEGOEPxjcwAsmX7BArdYa3uQn1Ug/ij+QiGQ8xziJLwnU1jQxWb5jqVDObOdw==" + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@ethereum-navigator/atlas/-/atlas-0.5.0.tgz", + "integrity": "sha512-vrr1mN82keDzY5iDwyvG9+9RshmxOdBmEh2LX9vNLXcVrrr2e2hh7KsVQKWKSnubgv2Mo9WY/Y2IHxvRlUREeg==" }, "@hapi/address": { "version": "2.1.1", diff --git a/package.json b/package.json index 37eb694..d708ca1 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "format": "prettier ./src/**/*.{js,scss,json} --write" }, "dependencies": { - "@ethereum-navigator/atlas": "^0.4.0", + "@ethereum-navigator/atlas": "^0.5.0", "@oceanprotocol/art": "^2.2.0", "@oceanprotocol/typographies": "^0.1.0", "axios": "^0.19.0", diff --git a/src/Network.js b/src/Network.js index b64eba9..3b0aa60 100644 --- a/src/Network.js +++ b/src/Network.js @@ -8,8 +8,8 @@ Network.propTypes = { name: PropTypes.string.isRequired, networkId: PropTypes.string.isRequired, type: PropTypes.string.isRequired, - url: PropTypes.string.isRequired, - explorer: PropTypes.string.isRequired + rpcUrl: PropTypes.string.isRequired, + explorerUrl: PropTypes.string.isRequired }) } @@ -21,7 +21,7 @@ export default function Network({ network }) { useEffect(() => { async function getStatusAndBlock() { - const response = await axiosRpcRequest(network.url, 'eth_blockNumber') + const response = await axiosRpcRequest(network.rpcUrl, 'eth_blockNumber') if (!response || response.status !== 200) { setStatus('Offline') @@ -38,7 +38,10 @@ export default function Network({ network }) { } async function getClientVersion() { - const response = await axiosRpcRequest(network.url, 'web3_clientVersion') + const response = await axiosRpcRequest( + network.rpcUrl, + 'web3_clientVersion' + ) response && response.data && setClientVersion(response.data.result) } @@ -64,7 +67,7 @@ export default function Network({ network }) { {network.type}

- {network.url} + {network.rpcUrl}

@@ -78,7 +81,8 @@ export default function Network({ network }) {

{block && (

- At block #{block} + At block # + {block}

)} {clientVersion &&

{clientVersion}

} diff --git a/src/Network.test.js b/src/Network.test.js index 6bcdef5..57f9f25 100644 --- a/src/Network.test.js +++ b/src/Network.test.js @@ -20,8 +20,8 @@ describe('Network', () => { project: 'Ocean Protocol', type: 'mainnet', networkId: '0xCEA11', - url: 'https://pacific.oceanprotocol.com', - explorer: 'https://submarine.oceanprotocol.com' + rpcUrl: 'https://pacific.oceanprotocol.com', + explorerUrl: 'https://submarine.oceanprotocol.com' } it('renders without crashing', async () => {