Redesign data feeds explorer

packages/api/src/dataFeedsRouter.json

@@ -41,13 +41,13 @@
               "minSecsBetweenUpdates": 900
             },
             "Price-OMG/BTC-9": {
-              "label": "BTC",
+              "label": "₿",
               "deviationPercentage": 1.0,
               "maxSecsBetweenUpdates": 86400,
               "minSecsBetweenUpdates": 900
             },
             "Price-OMG/ETH-9": {
-              "label": "ETH",
+              "label": "Ξ",
               "deviationPercentage": 1.0,
               "maxSecsBetweenUpdates": 86400,
               "minSecsBetweenUpdates": 900

packages/api/src/repository/Feed.ts

@@ -34,24 +34,24 @@ export class FeedRepository {
 
   async getPaginatedFeeds (
     // starts in 1
-    page: number,
-    size: number,
     network: string
   ): Promise<PaginatedFeedsObject> {
     const filteredFeeds =
       network === 'all'
         ? this.sortedDataFeeds
         : this.dataFeedsByNetwork[network]
 
-    const paginatedFeeds = filteredFeeds.slice((page - 1) * size, page * size)
-
     return {
-      feeds: paginatedFeeds,
+      feeds: filteredFeeds,
       total: filteredFeeds.length
     }
   }
 
-  updateFeedAddress (feedFullName: string, address: string): FeedInfo {
+  updateFeedAddress (
+    feedFullName: string,
+    address: string,
+    contractId: string
+  ): FeedInfo {
     const hasSameFeedFullName = (feed: FeedInfo) =>
       feed.feedFullName === feedFullName
 
@@ -61,14 +61,17 @@ export class FeedRepository {
     )
     const feed = this.sortedDataFeeds[sortedDataFeedIndex]
     feed.address = address
-
+    feed.contractId = contractId
     // Update address in dataFeedsByNetwork
     const dataFeedsByNetworkIndex = this.dataFeedsByNetwork[
       feed.network
     ].findIndex(hasSameFeedFullName)
     this.dataFeedsByNetwork[feed.network][
       dataFeedsByNetworkIndex
     ].address = address
+    this.dataFeedsByNetwork[feed.network][
+      dataFeedsByNetworkIndex
+    ].contractId = contractId
 
     return feed
   }

packages/api/src/repository/ResultRequest.ts

@@ -75,7 +75,6 @@ export class ResultRequestRepository {
         }
       }
     )
-
     return this.normalizeId(lastResultRequest)
   }
 

packages/api/src/resolvers.ts

@@ -2,11 +2,7 @@ import { Context, Network } from './types'
 const resolvers = {
   Query: {
     feeds: async (_parent, args, { feedRepository }: Context) => {
-      return await feedRepository.getPaginatedFeeds(
-        args.page,
-        args.pageSize,
-        args.network
-      )
+      return await feedRepository.getPaginatedFeeds(args.network)
     },
 
     networks: async (_parent, _args) => {
@@ -36,12 +32,23 @@ const resolvers = {
       return (await resultRequestRepository.getLastResult(parent.feedFullName))
         ?.result
     },
+    lastResultTimestamp: async (
+      parent,
+      _args,
+      { resultRequestRepository }: Context
+    ) => {
+      return (await resultRequestRepository.getLastResult(parent.feedFullName))
+        ?.timestamp
+    },
     color: async (parent, _args, { config }: Context) => {
       return config[parent.feedFullName]?.color || ''
     },
     blockExplorer: async (parent, _args, { config }: Context) => {
       return config[parent.feedFullName]?.blockExplorer || ''
     },
+    proxyAddress: async (parent, _args, { config }: Context) => {
+      return config[parent.feedFullName]?.routerAddress || ''
+    },
     deviation: async (parent, _args, { config }: Context) => {
       return config[parent.feedFullName]?.deviation || ''
     },

packages/api/src/typeDefs.ts

@@ -4,14 +4,17 @@ const typeDefs = gql`
   type Feed {
     id: String!
     address: String!
+    contractId: String!
     blockExplorer: String!
     color: String!
     feedFullName: String!
     label: String!
     name: String!
     network: String!
     lastResult: String
+    lastResultTimestamp: String
     deviation: String!
+    proxyAddress: String
     heartbeat: String!
     finality: String!
     requests(timestamp: Int!): [ResultRequest]!
@@ -49,7 +52,7 @@ const typeDefs = gql`
 
   type Query {
     feed(feedFullName: String!): Feed
-    feeds(page: Int!, pageSize: Int!, network: String): FeedsPage!
+    feeds(network: String): FeedsPage!
     requests(feedFullName: String!, page: Int!, size: Int!): [ResultRequest]!
     networks: [Network]!
   }

packages/api/src/types.ts

@@ -49,6 +49,7 @@ export type FeedInfoGeneric<ABI> = {
   name: string
   pollingPeriod: number
   label: string
+  contractId: string
   color: string
   blockExplorer: string
   deviation: string
@@ -64,6 +65,11 @@ export type PaginatedFeedsObject = {
   total: number
 }
 
+export type ContractInfo = {
+  contractAddress: string
+  contractId: string
+}
+
 export type ResultRequestDbObjectNormalized = ResultRequestDbObject & {
   id: string
 }

packages/api/src/utils/index.ts

@@ -78,6 +78,7 @@ export function normalizeConfig (
           feedFullName: createFeedFullName(network, name, decimals),
           id: feed.key,
           address: '0x0000000000000000000000000000000000000000',
+          contractId: '0x0000000000000000000000000000000000000000',
           routerAddress: config.address,
           network,
           name,

packages/api/src/web3Middleware/index.ts

@@ -6,7 +6,8 @@ import {
   FeedInfo,
   Repositories,
   ResultRequestDbObject,
-  ObjectId
+  ObjectId,
+  ContractInfo
 } from '../types'
 import { getProvider } from './provider'
 
@@ -34,17 +35,24 @@ export class Web3Middleware {
   }
 
   async updateAddress (feedInfo: FeedInfo) {
-    const contractAddress = await this.getContractAddress(feedInfo)
+    const contractInfo = await this.getContractAddress(feedInfo)
+    console.log('contractInfo in updateAddress', contractInfo)
     const feed = this.repositories.feedRepository.get(feedInfo.feedFullName)
 
-    if (feed && contractAddress && contractAddress !== feed.address) {
+    if (
+      feed &&
+      contractInfo &&
+      contractInfo.contractAddress &&
+      contractInfo.contractAddress !== feed.address
+    ) {
       return this.repositories.feedRepository.updateFeedAddress(
         feedInfo.feedFullName,
-        contractAddress
+        contractInfo.contractAddress,
+        contractInfo.contractId
       )
     }
 
-    return feedInfo 
+    return feedInfo
   }
 
   async listen () {
@@ -89,7 +97,7 @@ export class Web3Middleware {
     this.intervals = []
   }
 
-  async getContractAddress (feedInfo: FeedInfo): Promise<string | null> {
+  async getContractAddress (feedInfo: FeedInfo): Promise<ContractInfo | null> {
     try {
       return await new Promise(async (resolve, reject) => {
         try {
@@ -109,11 +117,15 @@ export class Web3Middleware {
           const contractIdentifier = await feedContract.methods
             .currencyPairId(feedInfo.id)
             .call()
+          console.log('contract Identifier!!!', feedInfo.id, contractIdentifier)
           const address = await feedContract.methods
             .getPriceFeed(contractIdentifier)
             .call()
 
-          resolve(address)
+          resolve({
+            contractAddress: address,
+            contractId: contractIdentifier
+          })
         } catch (err) {
           reject(err)
         }
@@ -127,22 +139,25 @@ export class Web3Middleware {
   }
 
   async listenToDataFeed (feedInfo: FeedInfo) {
-    const contractAddress = await this.getContractAddress(feedInfo)
+    const contractInfo = await this.getContractAddress(feedInfo)
     const provider = getProvider(feedInfo.network)
     if (provider) {
+      console.log('contractInfo in listenToDataFeed', contractInfo)
       if (
-        contractAddress &&
-        contractAddress !== '0x0000000000000000000000000000000000000000'
+        contractInfo &&
+        contractInfo.contractAddress &&
+        contractInfo.contractAddress !==
+          '0x0000000000000000000000000000000000000000'
       ) {
         try {
           const web3 = new this.Web3(provider)
           const feedContract = new web3.eth.Contract(
             feedInfo.abi,
-            contractAddress
+            contractInfo.contractAddress
           )
           const interval = setInterval(async () => {
             console.log(
-              `Reading ${feedInfo.feedFullName} contract state at address: ${contractAddress}`
+              `Reading ${feedInfo.feedFullName} contract state at address: ${contractInfo.contractAddress}`
             )
             await this.fetchAndSaveContractSnapshot(
               { feedContract },

packages/api/test/web3Middleware/dataFeedsRouter.json

@@ -224,7 +224,7 @@
               "label": "$",
               "deviationPercentage": 1.0,
               "maxSecsBetweenUpdates": 28800,
-              "minSecsBetweenUpdates": 900 
+              "minSecsBetweenUpdates": 900
             },
             "Price-ETH/USD-6": {
               "label": "$",

packages/ui/apollo/queries/feed.gql

@@ -3,10 +3,12 @@ query feed($feedFullName: String!, $timestamp: Int!) {
     feedFullName 
     name
     address
+    contractId
     lastResult
     network
     label
     deviation
+    proxyAddress
     heartbeat
     finality
     requests(timestamp: $timestamp) {

packages/ui/apollo/queries/feeds.gql

@@ -1,10 +1,11 @@
-query feeds ($page: Int!, $pageSize: Int!, $network: String!) {
-  feeds (page: $page, pageSize: $pageSize, network: $network) {
+query feeds ($network: String!) {
+  feeds (network: $network) {
     feeds {
       feedFullName
       name
       address
       lastResult
+      lastResultTimestamp
       network
       label
       blockExplorer

packages/ui/assets/styles/colors.scss

@@ -3,6 +3,9 @@ $black: black;
 // GREENS
 $green-1: #5fbfae;
 $green-2: #468d80;
+$green-3: #26474B;
+$green-4: #4AB6A1;
+$green-4-opacity: #4ab6a02c;
 //BLUES
 $blue-1: #758ea9;
 $blue-2: #526488;
@@ -14,5 +17,5 @@ $red: #E54343;
 //GREYS
 $grey-1: #e4e4e4;
 $grey-2: #999;
-$grey-3: #5f5f5f;
+$grey-3: #767575;
 $grey-4: #4d4d4d;