[ Gateway ] One gateway sync alt l1

packages/boba/gateway/package.json

@@ -26,8 +26,8 @@
     "@mui/icons-material": "^5.3.1",
     "@mui/material": "^5.4.0",
     "@mui/styles": "^5.3.0",
-    "@sentry/react": "^7.24.1",
-    "@sentry/tracing": "^7.24.1",
+    "@sentry/react": "^7.34.0",
+    "@sentry/tracing": "^7.34.0",
     "@typescript-eslint/eslint-plugin": "^5.10.2",
     "@typescript-eslint/parser": "^5.10.2",
     "axios": "^0.21.1",

packages/boba/gateway/src/actions/farmAction.js

@@ -1,6 +1,6 @@
 /*
   Varna - A Privacy-Preserving Marketplace
-  Varna uses Fully Homomorphic Encryption to make markets fair. 
+  Varna uses Fully Homomorphic Encryption to make markets fair.
   Copyright (C) 2021 Enya Inc. Palo Alto, CA
 
   This program is free software: you can redistribute it and/or modify
@@ -48,7 +48,6 @@ const getFarmInfoSuccess = (L1PoolInfo, L1UserInfo, L2PoolInfo, L2UserInfo) => (
 // })
 
 export const getFarmInfo = () => async (dispatch) => {
-  console.log("getFarmInfo()")
   dispatch(getFarmInfoBegin())
    const [L1LPInfo, L2LPInfo] = await Promise.all([
     networkService.getL1LPInfo(),
@@ -122,4 +121,4 @@ export function fetchL1LPBalance(currency) {
 
 export function fetchL2LPBalance(currency) {
   return createAction('FETCH/L2LPBALANCE', () => networkService.L2LPBalance(currency))
-}
+}

packages/boba/gateway/src/actions/networkAction.js

@@ -13,25 +13,26 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
+import gasService from 'services/gas.service'
 import networkService from 'services/networkService'
+import transctionService from 'services/transaction.service'
 import { createAction } from './createAction'
 
 export function fetchBalances() {
   return createAction('BALANCE/GET', () => networkService.getBalances())
 }
 
 export function fetchGas() {
-  return createAction('GAS/GET', () => networkService.getGas())
+  return createAction('GAS/GET', () => gasService.getGas())
 }
 
 export function addTokenList() {
-  console.log("addTokenList")
   return createAction('TOKENLIST/GET', () => networkService.addTokenList())
 }
 
 export function fetchTransactions() {
   return createAction('TRANSACTION/GETALL', () =>
-    networkService.getTransactions()
+    transctionService.getTransactions()
   )
 }
 
@@ -47,10 +48,6 @@ export function fetchFastExits() {
   )
 }
 
-export function fetchExits() {
-  return createAction('EXIT/GETALL', () => networkService.getExits())
-}
-
 export function exitBOBA(token, value) {
   return createAction('EXIT/CREATE', () =>
     networkService.exitBOBA(token, value)

packages/boba/gateway/src/actions/verifierAction.js

@@ -13,9 +13,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-import networkService from 'services/networkService'
+import verifierService from 'services/verifier.service'
 import { createAction } from './createAction'
 
 export function fetchVerifierStatus() {
-  return createAction('VERIFIER/GET', () => networkService.fetchVerifierStatus())
+  return createAction('VERIFIER/GET', () => verifierService.getVerifierStatus())
 }

packages/boba/gateway/src/api/etherScanAxios.js

@@ -1,39 +1,13 @@
 import axios from 'axios'
-import { LAYER } from 'util/constant';
-import { getNetwork } from 'util/masterConfig'
-const nw = getNetwork()
+export default function etherScanInstance(blockExplorer) {
 
-export default function etherScanInstance(networkGateway, layer){
-
-  let axiosInstance = null;
-
-  if(networkGateway === 'local') {
-    return null //does not make sense on local
-  }
-  else if (networkGateway === 'goerli' && layer === LAYER.L1) {
-    axiosInstance = axios.create({
-      baseURL: nw.goerli.L1.blockExplorer,
-    })
-  }
-  else if (networkGateway === 'goerli' && layer === LAYER.L2) {
-    axiosInstance = axios.create({
-      baseURL: nw.goerli.L2.blockExplorer,
-    })
-  }
-  else if (networkGateway === 'mainnet' && layer === LAYER.L1) {
-    axiosInstance = axios.create({
-      baseURL: nw.mainnet.L1.blockExplorer,
-    })
-  }
-  else if (networkGateway === 'mainnet' && layer === LAYER.L2) {
-    axiosInstance = axios.create({
-      baseURL: nw.mainnet.L2.blockExplorer,
-    })
-  }
+  let axiosInstance = axios.create({
+    baseURL: blockExplorer,
+  })
 
   axiosInstance.interceptors.request.use((config) => {
-    config.headers['Accept'] = 'application/json'
-    config.headers['Content-Type'] = 'application/json'
+    config.headers[ 'Accept' ] = 'application/json'
+    config.headers[ 'Content-Type' ] = 'application/json'
     return config
   })
 

packages/boba/gateway/src/api/metaTransactionAxios.js

@@ -1,23 +1,11 @@
 import axios from 'axios'
-import { getBaseServices } from 'util/masterConfig'
 
-export default function metaTransactionAxiosInstance(networkGateway){
+export default function metaTransactionAxiosInstance(networkConfig) {
+  const url = networkConfig['META_TRANSACTION']
 
-  let axiosInstance = null;
-
-  if(networkGateway === 'local') {
-    return null //does not make sense on local
-  }
-  else if (networkGateway === 'goerli') {
-    axiosInstance = axios.create({
-      baseURL: getBaseServices().GOERLI_META_TRANSACTION,
-    })
-  }
-  else if (networkGateway === 'mainnet') {
-    axiosInstance = axios.create({
-      baseURL: getBaseServices().MAINNET_META_TRANSACTION,
-    })
-  }
+  let axiosInstance = axios.create({
+    baseURL: url,
+  })
 
   axiosInstance.interceptors.request.use((config) => {
     config.headers['Accept'] = 'application/json'

packages/boba/gateway/src/api/omgxWatcherAxios.js

@@ -1,31 +1,15 @@
 import axios from 'axios'
-import { getNetwork } from 'util/masterConfig'
-const nw = getNetwork()
 
-export default function omgxWatcherAxiosInstance(networkGateway){
+export default function omgxWatcherAxiosInstance(networkConfig) {
+  const watcherUrl = networkConfig[ 'OMGX_WATCHER_URL' ]
 
-  let axiosInstance = null
-
-  if(networkGateway === 'local') {
-    return null //does not make sense on local
-  }
-  else if (networkGateway === 'goerli') {
-    if(nw.goerli.OMGX_WATCHER_URL === null) return
-    axiosInstance = axios.create({
-      baseURL: nw.goerli.OMGX_WATCHER_URL,
-    })
-  }
-  else if (networkGateway === 'mainnet') {
-
-    if(nw.mainnet.OMGX_WATCHER_URL === null) return
-    axiosInstance = axios.create({
-      baseURL: nw.mainnet.OMGX_WATCHER_URL,
-    })
-  }
+  let axiosInstance = axios.create({
+    baseURL: watcherUrl,
+  })
 
   axiosInstance.interceptors.request.use((config) => {
-    config.headers['Accept'] = 'application/json'
-    config.headers['Content-Type'] = 'application/json'
+    config.headers[ 'Accept' ] = 'application/json'
+    config.headers[ 'Content-Type' ] = 'application/json'
     return config
   })
 

packages/boba/gateway/src/api/verifierWatcherAxios.js

@@ -1,31 +1,15 @@
 import axios from 'axios'
-import { getNetwork } from 'util/masterConfig'
-const nw = getNetwork()
 
-export default function verifierWatcherAxiosInstance(networkGateway){
+export default function verifierWatcherAxiosInstance(networkConfig) {
+  const url = networkConfig[ 'VERIFIER_WATCHER_URL' ]
 
-  let axiosInstance = null
-
-  if(networkGateway === 'local') {
-    return null //does not make sense on local
-  }
-  else if (networkGateway === 'goerli') {
-    if(nw.goerli.VERIFIER_WATCHER_URL === null) return
-    axiosInstance = axios.create({
-      baseURL: nw.goerli.VERIFIER_WATCHER_URL,
-    })
-  }
-  else if (networkGateway === 'mainnet') {
-
-    if(nw.mainnet.VERIFIER_WATCHER_URL === null) return
-    axiosInstance = axios.create({
-      baseURL: nw.mainnet.VERIFIER_WATCHER_URL,
-    })
-  }
+  let axiosInstance = axios.create({
+    baseURL: url
+  })
 
   axiosInstance.interceptors.request.use((config) => {
-    config.headers['Accept'] = 'application/json'
-    config.headers['Content-Type'] = 'application/json'
+    config.headers[ 'Accept' ] = 'application/json'
+    config.headers[ 'Content-Type' ] = 'application/json'
     return config
   })
 

packages/boba/gateway/src/components/SentryWrapper/SentryWrapper.js

@@ -1,10 +1,9 @@
 import React, { useEffect } from 'react'
 import * as Sentry from '@sentry/react';
-import { BrowserTracing } from '@sentry/tracing';
 import { Typography } from '@mui/material';
 import { APP_ENV, SENTRY_DSN } from 'util/constant';
 import { useSelector } from 'react-redux';
-import { selectNetwork } from 'selectors/networkSelector';
+import { selectActiveNetwork } from 'selectors/networkSelector';
 
 
 /**
@@ -18,7 +17,7 @@ const SentryWrapper = ({
   children
 }) => {
 
-  const network = useSelector(selectNetwork());
+  const network = useSelector(selectActiveNetwork());
 
   useEffect(() => {
     const dns = SENTRY_DSN;
@@ -33,7 +32,7 @@ const SentryWrapper = ({
             onunhandledrejection: false,  /// will avoid to send unhandle browser error.
             onerror: false,
           }),
-          new BrowserTracing()
+          // new BrowserTracing()
         ],
         ignoreErrors: [
           'top.GLOBALS', //stop sentry to report the random plugin / extensions errors.