From 634d617a5ab71ddf047188b0cf8b4f07fcb10fe0 Mon Sep 17 00:00:00 2001 From: Alan Hurtarte Date: Tue, 21 Jun 2022 12:02:09 -0600 Subject: [PATCH 1/8] PP-175: Update links to work with rif aggregation --- etc/js/env-config.js | 70 ++++------ infrastructure/explorer/public/index.html | 4 +- infrastructure/explorer/src/Navbar.vue | 16 ++- .../explorer/src/assets/rif_logo.svg | 124 ++++++++++++++++++ infrastructure/explorer/src/main.js | 2 +- infrastructure/explorer/src/store.js | 10 +- infrastructure/explorer/src/utils.js | 25 ++-- 7 files changed, 178 insertions(+), 73 deletions(-) create mode 100644 infrastructure/explorer/src/assets/rif_logo.svg diff --git a/etc/js/env-config.js b/etc/js/env-config.js index d65e1a5fa7..17d3d54569 100644 --- a/etc/js/env-config.js +++ b/etc/js/env-config.js @@ -1,56 +1,30 @@ export default { 'http://localhost': { API_SERVER: 'https://localhost:3001', + WALLET_ADDRESS: 'http://localhost:3000', + EXPLORER: 'http://localhost:7001', + EXPLORER_VERSION: '0.1.0', ETH_NETWORK: 'localhost', WS_API_ADDR: 'ws://localhost:3031', HTTP_RPC_API_ADDR: 'http://localhost:3030' }, - 'https://stage.zksync.dev': { - API_SERVER: 'https://stage-api.zksync.dev', - ETH_NETWORK: 'rinkeby', - WS_API_ADDR: 'wss://stage-api.zksync.dev/jsrpc-ws', - HTTP_RPC_API_ADDR: 'https://stage-api.zksync.dev/jsrpc' - }, - 'https://rinkeby.zkscan.io': { - API_SERVER: 'https://rinkeby-api.zksync.io', - ETH_NETWORK: 'rinkeby', - WS_API_ADDR: 'wss://rinkeby-api.zksync.io/jsrpc-ws', - HTTP_RPC_API_ADDR: 'https://rinkeby-api.zksync.io/jsrpc' - }, - 'https://ropsten.zkscan.io': { - API_SERVER: 'https://ropsten-api.zksync.io', - ETH_NETWORK: 'ropsten', - WS_API_ADDR: 'wss://ropsten-api.zksync.io/jsrpc-ws', - HTTP_RPC_API_ADDR: 'https://ropsten-api.zksync.io/jsrpc' - }, - 'https://rinkeby-beta.zkscan.io': { - API_SERVER: 'https://rinkeby-beta-api.zksync.io', - ETH_NETWORK: 'rinkeby', - WS_API_ADDR: 'wss://rinkeby-beta-api.zksync.io/jsrpc-ws', - HTTP_RPC_API_ADDR: 'https://rinkeby-beta-api.zksync.io/jsrpc' - }, - 'https://ropsten-beta.zkscan.io': { - API_SERVER: 'https://ropsten-beta-api.zksync.io', - ETH_NETWORK: 'ropsten', - WS_API_ADDR: 'wss://ropsten-beta-api.zksync.io/jsrpc-ws', - HTTP_RPC_API_ADDR: 'https://ropsten-beta-api.zksync.io/jsrpc' - }, - 'https://zkscan.io': { - API_SERVER: 'https://api.zksync.io', - ETH_NETWORK: 'mainnet', - WS_API_ADDR: 'wss://api.zksync.io/jsrpc-ws', - HTTP_RPC_API_ADDR: 'https://api.zksync.io/jsrpc' - }, - 'https://dev.zksync.dev': { - API_SERVER: 'https://dev-api.zksync.dev', - ETH_NETWORK: 'rinkeby', - WS_API_ADDR: 'wss://dev-api.zksync.dev/jsrpc-ws', - HTTP_RPC_API_ADDR: 'https://dev-api.zksync.dev/jsrpc' - }, - 'https://breaking.zksync.dev': { - API_SERVER: 'https://breaking-api.zksync.dev', - ETH_NETWORK: 'rinkeby', - WS_API_ADDR: 'wss://breaking-api.zksync.dev/jsrpc-ws', - HTTP_RPC_API_ADDR: 'https://breaking-api.zksync.dev/jsrpc' - } + 'https://explorer.dev.aggregation.rifcomputing.net': { + API_SERVER: 'https://dev.aggregation.rifcomputing.net:3029', + WALLET_ADDRESS: 'https://wallet.dev.aggregation.rifcomputing.net', + EXPLORER: 'http://localhost:7001', + EXPLORER_VERSION: '0.1.0', + ETH_NETWORK: 'regtest', + WS_API_ADDR: 'https://dev.aggregation.rifcomputing.net:3031', + HTTP_RPC_API_ADDR: 'https://dev.aggregation.rifcomputing.net:3030' + }, + 'https://explorer.aggregation.rifcomputing.net': { + API_SERVER: 'https://aggregation.rifcomputing.net:3029', + WALLET_ADDRESS: 'https://wallet.aggregation.rifcomputing.net', + EXPLORER: 'http://localhost:7001', + EXPLORER_VERSION: '0.1.0', + ETH_NETWORK: 'rsk_mainnet', + WS_API_ADDR: 'https://aggregation.rifcomputing.net:3031', + HTTP_RPC_API_ADDR: 'https://aggregation.rifcomputing.net:3030' + }, + }[`${location.protocol}//${location.hostname}`]; diff --git a/infrastructure/explorer/public/index.html b/infrastructure/explorer/public/index.html index 50228ce3a4..5335082fb3 100644 --- a/infrastructure/explorer/public/index.html +++ b/infrastructure/explorer/public/index.html @@ -6,11 +6,11 @@ - zkSync Explorer + RIF Aggregation Explorer
diff --git a/infrastructure/explorer/src/Navbar.vue b/infrastructure/explorer/src/Navbar.vue index 498baa47f9..ca0e34303a 100644 --- a/infrastructure/explorer/src/Navbar.vue +++ b/infrastructure/explorer/src/Navbar.vue @@ -1,9 +1,9 @@