fix(api): getting provider from config

witnet · Mar 15, 2022 · 4b4a8af · 4b4a8af
1 parent 354190d
commit 4b4a8af
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 45 deletions.
diff --git a/packages/api/src/repository/ResultRequest.ts b/packages/api/src/repository/ResultRequest.ts
@@ -13,15 +13,15 @@ export class ResultRequestRepository {
 
   constructor (db: Db, _dataFeeds: Array<FeedInfo>) {
     this.collection = db.collection('result_request')
-    // this.collection.createIndex(
-    //   { feedFullName: 1, timestamp: -1 },
-    //   {
-    //     collation: {
-    //       locale: 'en_US',
-    //       numericOrdering: true
-    //     }
-    //   }
-    // )
+    this.collection.createIndex(
+      { feedFullName: 1, timestamp: -1 },
+      {
+        collation: {
+          locale: 'en_US',
+          numericOrdering: true
+        }
+      }
+    )
   }
 
   async getFeedRequests (

diff --git a/packages/api/src/resolvers.ts b/packages/api/src/resolvers.ts
@@ -18,6 +18,7 @@ const resolvers = {
     },
 
     feed: async (_parent, args, { feedRepository }: Context) => {
+      console.log('query?????', args.feedFullName)
       return await feedRepository.get(args.feedFullName)
     }
   },

diff --git a/packages/api/src/utils/index.ts b/packages/api/src/utils/index.ts
@@ -40,8 +40,8 @@ export function normalizeNetworkConfig (
   const chains: Array<string> = Object.keys(config.chains)
 
   // get list of networks
-  const networks: any = Object.values(config.chains).map(chain =>
-    Object.values(chain.networks).map((value, index) => {
+  const networks: any = Object.values(config.chains).map(chain => {
+    const networks = Object.values(chain.networks).map((value, index) => {
       return {
         key: Object.keys(chain.networks)
           [index].split('.')
@@ -50,7 +50,15 @@ export function normalizeNetworkConfig (
         label: value.name
       }
     })
-  )
+    const testnetNetworks = networks.filter(
+      network => !network.label.includes('Mainnet')
+    )
+    const mainnetNetworks = networks.filter(network =>
+      network.label.includes('Mainnet')
+    )
+
+    return [...mainnetNetworks, ...testnetNetworks]
+  })
 
   // add chain to each of the networks
 

diff --git a/packages/api/src/web3Middleware/provider.ts b/packages/api/src/web3Middleware/provider.ts
@@ -1,25 +1,11 @@
 import { Network } from './../types'
 
 export function getProvider (network: Network) {
-  const providers: Record<Network, string> = {
-    [Network.EthereumMainnet]: process.env.ETHEREUM_MAINNET_PROVIDER,
-    [Network.EthereumGoerli]: process.env.ETHEREUM_GOERLI_PROVIDER,
-    [Network.EthereumRinkeby]: process.env.ETHEREUM_RINKEBY_PROVIDER,
-    [Network.ConfluxTestnet]: process.env.CONFLUX_TESTNET_PROVIDER,
-    [Network.ConfluxTethys]: process.env.CONFLUX_TETHYS_PROVIDER,
-    [Network.BobaRinkeby]: process.env.BOBA_RINKEBY_PROVIDER,
-    [Network.BobaMainnet]: process.env.BOBA_MAINNET_PROVIDER,
-    [Network.CeloAlfajores]: process.env.CELO_ALFAJORES_PROVIDER,
-    [Network.CeloMainnet]: process.env.CELO_MAINNET_PROVIDER,
-    [Network.MetisMainnet]: process.env.METIS_MAINNET_PROVIDER,
-    [Network.MetisRinkeby]: process.env.METIS_RINKEBY_PROVIDER,
-    [Network.HarmonyTestnet]: process.env.HARMONY_TESTNET_PROVIDER,
-    [Network.KCCTestnet]: process.env.KCC_TESTNET_PROVIDER,
-    [Network.KCCMainnet]: process.env.KCC_MAINNET_PROVIDER,
-    [Network.MoonbeamMoonbase]: process.env.MOONBASE_ALPHA_PROVIDER,
-    [Network.PolygonMainnet]: process.env.POLYGON_MAINNET_PROVIDER,
-    [Network.PolygonGoerli]: process.env.POLYGON_GOERLI_PROVIDER,
-    [Network.AvalancheFuji]: process.env.AVALANCHE_FUJI_PROVIDER
-  }
-  return providers[network]
+  // The provider env variable name should be the network name specified in the config plus '_PROVIDER' ex.MOONBEAM_MOONBASE_PROVIDER
+  return process.env[
+    `${network
+      .split('-')
+      .map(network => network.toUpperCase())
+      .join('_')}_PROVIDER`
+  ]
 }
diff --git a/packages/ui/apollo/queries/feed.gql b/packages/ui/apollo/queries/feed.gql
@@ -8,7 +8,6 @@ query feed($feedFullName: String!, $timestamp: Int!) {
     network
     label
     deviation
-    chain
     proxyAddress
     heartbeat
     finality

diff --git a/packages/ui/components/DataFeedDescription.vue b/packages/ui/components/DataFeedDescription.vue
@@ -44,10 +44,6 @@ export default {
       type: String,
       required: true,
     },
-    chain: {
-      type: String,
-      required: true,
-    },
     network: {
       type: String,
       required: true,

diff --git a/packages/ui/components/DataFeedDetails.vue b/packages/ui/components/DataFeedDetails.vue
@@ -15,7 +15,6 @@
     <DataFeedDescription
       :feed-name="normalizedFeed.name"
       :network="normalizedFeed.network"
-      :chain="normalizedFeed.chain"
       :last-result-value="lastResultValue"
       :last-result-date="lastResultDate"
       :feed-time-to-update="feedTimeToUpdate"
@@ -31,7 +30,6 @@
     <Fieldset :title="$t('data_feed_details.contract_address')">
       <IntegrationDetails
         :network="normalizedFeed.network"
-        :chain="normalizedFeed.chain"
         :proxy-address="normalizedFeed.proxyAddress"
         :feed-address="normalizedFeed.address"
         :contract-id="normalizedFeed.contractId"
@@ -74,6 +72,7 @@ export default {
       prefetch: true,
       query: feed,
       variables() {
+        console.log(this.feedFullName)
         return {
           timestamp: this.timestamp,
           feedFullName: this.feedFullName,
@@ -119,7 +118,6 @@ export default {
           deviation: this.feed.deviation,
           heartbeat: Number(this.feed.heartbeat),
           decimals: this.feed.feedFullName.split('_').pop() || 3,
-          chain: this.feed.chain.split('.').map(capitalizeFirstLetter)[0],
           network: this.feed.network
             .split('-')
             .map(capitalizeFirstLetter)

diff --git a/packages/ui/components/NetworkOptions.vue b/packages/ui/components/NetworkOptions.vue
@@ -44,10 +44,7 @@ export default {
       return this.$store.state.selectedNetwork
     },
     selectedOption() {
-      return (
-        this.$route.params.network ||
-        this.$store.state.selectedNetwork[0]?.network.toLowerCase()
-      )
+      return this.$route.params.network || 'ethereum'
     },
   },
   methods: {