Merge branch 'dev' into lacchain

.env.telostestnet

@@ -19,20 +19,20 @@ HASURA_GRAPHQL_UNAUTHORIZED_ROLE=guest
 HASURA_GRAPHQL_ACTION_BASE_URL=http://hapi:9090
 
 # hapi
-HAPI_EOS_API_ENDPOINT=https://telos-testnet.eosio.cr
-HAPI_EOS_API_CHAIN_ID=1eaa0824707c8c16bd25145493bf062aecddfeb56c736f6ba6397f3195f33c9f
-HAPI_EOS_BASE_ACCOUNT=eosmechatero
-HAPI_EOS_BASE_ACCOUNT_PASSWORD=PW...
-HAPI_EOS_MECHANICS_ACCOUNT=eosmechatero
+HAPI_TELOS_API_ENDPOINT=https://telos-testnet.eosio.cr
+HAPI_TELOS_API_CHAIN_ID=2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910746840
+HAPI_TELOS_BASE_ACCOUNT=eosmechatero
+HAPI_TELOS_BASE_ACCOUNT_PASSWORD=PW...
+HAPI_TELOS_MECHANICS_ACCOUNT=eosmechatero
 # TODO: add value
-HAPI_EOS_MECHANICS_PASSWORD=PW...
-HAPI_EOS_WALLET_URL=http://localhost:9999
+HAPI_TELOS_MECHANICS_PASSWORD=PW...
+HAPI_TELOS_WALLET_URL=http://localhost:9999
 # TODO: let's discuss this
-HAPI_EOS_EXCHANGE_RATE_API=https://api.coingecko.com/api/v3/simple/price?ids=telos&vs_currencies=usd
-HAPI_EOS_BP_JSON_ON_CHAIN=false
-HAPI_EOS_BP_JSON_ON_CHAIN_CONTRACT=producerjson
-HAPI_EOS_BP_JSON_ON_CHAIN_TABLE=producerjson
-HAPI_EOS_BP_JSON_ON_CHAIN_SCOPE=producerjson
+HAPI_TELOS_EXCHANGE_RATE_API=https://api.coingecko.com/api/v3/simple/price?ids=telos&vs_currencies=usd
+HAPI_TELOS_BP_JSON_ON_CHAIN=false
+HAPI_TELOS_BP_JSON_ON_CHAIN_CONTRACT=producerjson
+HAPI_TELOS_BP_JSON_ON_CHAIN_TABLE=producerjson
+HAPI_TELOS_BP_JSON_ON_CHAIN_SCOPE=producerjson
 HAPI_HASURA_URL=http://hasura:8080/v1/graphql
 HAPI_HASURA_ADMIN_SECRET=myadminsecretkey
 HAPI_SERVER_PORT=9090
@@ -41,7 +41,6 @@ HAPI_SYNC_PRODUCERS_INTERVAL=86400
 HAPI_SYNC_PRODUCER_INFO_INTERVAL=1
 HAPI_SYNC_PRODUCER_CPU_INTERVAL=6
 HAPI_SYNC_EXCHANGE_RATE=86400
-HAPI_COINGECKO_API_TOKEN_ID=telos
 HAPI_SYNC_STATS_INTERVAL=60
 
 #webapp
@@ -69,5 +68,4 @@ REACT_APP_EOS_CHAIN_ID=1eaa0824707c8c16bd25145493bf062aecddfeb56c736f6ba6397f319
 REACT_APP_EOS_USE_BP_JSON_ON_CHAIN=false
 REACT_APP_EOS_BP_JSON_ON_CHAIN_CONTRACT=producerjson
 REACT_APP_EOS_BP_JSON_ON_CHAIN_TABLE=producerjson
-REACT_APP_EOS_BP_JSON_ON_CHAIN_SCOPE=producerjson
-REACT_APP_TOKEN_SYMBOL=TLOS
+REACT_APP_EOS_BP_JSON_ON_CHAIN_SCOPE=producerjson

docker-compose.yaml

@@ -53,7 +53,6 @@ services:
       HAPI_SYNC_PRODUCERS_INTERVAL: '${HAPI_SYNC_PRODUCERS_INTERVAL}'
       HAPI_SYNC_PRODUCER_INFO_INTERVAL: '${HAPI_SYNC_PRODUCER_INFO_INTERVAL}'
       HAPI_SYNC_PRODUCER_CPU_INTERVAL: '${HAPI_SYNC_PRODUCER_CPU_INTERVAL}'
-      HAPI_COINGECKO_API_TOKEN_ID: '${HAPI_COINGECKO_API_TOKEN_ID}'
       HAPI_SYNC_STATS_INTERVAL: '${HAPI_SYNC_STATS_INTERVAL}'
   hasura:
     container_name: '${STAGE}-${APP_NAME}-hasura'
@@ -103,4 +102,3 @@ services:
       REACT_APP_EOS_BP_JSON_ON_CHAIN_CONTRACT: '${REACT_APP_EOS_BP_JSON_ON_CHAIN_CONTRACT}'
       REACT_APP_EOS_BP_JSON_ON_CHAIN_TABLE: '${REACT_APP_EOS_BP_JSON_ON_CHAIN_TABLE}'
       REACT_APP_EOS_BP_JSON_ON_CHAIN_SCOPE: '${REACT_APP_EOS_BP_JSON_ON_CHAIN_SCOPE}'
-      REACT_APP_TOKEN_SYMBOL: '${REACT_APP_TOKEN_SYMBOL}'

hapi/src/config/eos.config.js

@@ -15,7 +15,6 @@ module.exports = {
   },
   walletUrl: process.env.HAPI_EOS_WALLET_URL,
   exchangeRateApi: process.env.HAPI_EOS_EXCHANGE_RATE_API,
-  coingeckoApiTokenId: process.env.HAPI_COINGECKO_API_TOKEN_ID,
   bpJsonOnChain: process.env.HAPI_EOS_BP_JSON_ON_CHAIN === 'true',
   bpJsonOnChainContract: process.env.HAPI_EOS_BP_JSON_ON_CHAIN_CONTRACT,
   bpJsonOnChainTable: process.env.HAPI_EOS_BP_JSON_ON_CHAIN_TABLE,

hapi/src/services/setting.service.js

@@ -4,7 +4,7 @@ const { hasuraUtil, axiosUtil } = require('../utils')
 
 const UPSERT = `
   mutation ($setting: setting_insert_input!) {
-    insert_setting(objects: [$setting], on_conflict: {constraint: setting_pkey, update_columns: [token_price]}) {
+    insert_setting(objects: [$setting], on_conflict: {constraint: setting_pkey, update_columns: [eos_price]}) {
       affected_rows
     }
   }
@@ -18,12 +18,12 @@ const syncEOSPrice = async () => {
 
     const { data } = await axiosUtil.instance.get(eosConfig.exchangeRateApi)
 
-    if (!data) {
+    if (!data || !data.success) {
       return
     }
 
     await hasuraUtil.request(UPSERT, {
-      setting: { id: 1, token_price: data[eosConfig.coingeckoApiTokenId].usd }
+      setting: { id: 1, eos_price: data.rates.EOS }
     })
   } catch (error) {
     console.error(error)

hasura/metadata/tables.yaml

@@ -18,11 +18,4 @@
     name: setting
 - table:
     schema: public
-    name: setting
-  select_permissions:
-  - role: guest
-    permission:
-      columns:
-      - id
-      - token_price
-      filter: {}
+    name: stat

hasura/migrations/1606135484776_create_table_public_setting/up.sql

@@ -1 +1 @@
-CREATE TABLE "public"."setting"("id" serial NOT NULL, "token_price" numeric NOT NULL, PRIMARY KEY ("id") );
+CREATE TABLE "public"."setting"("id" serial NOT NULL, "eos_price" numeric NOT NULL, PRIMARY KEY ("id") );

webapp/src/config/eos.config.js

@@ -15,7 +15,6 @@ export const bpJsonOnChainScope =
 export const networkName = process.env.REACT_APP_EOS_API_NETWORK_NAME
 export const networkLabel = process.env.REACT_APP_EOS_API_NETWORK_LABEL
 export const networkLogo = process.env.REACT_APP_EOS_API_NETWORK_LOGO
-export const tokenSymbol = process.env.REACT_APP_TOKEN_SYMBOL
 
 let _nodeTypes = null
 

webapp/src/gql/setting.gql.js

@@ -4,7 +4,7 @@ export const SETTING_QUERY = gql`
   query setting {
     setting: setting_by_pk(id: 1) {
       id
-      token_price
+      eos_price
     }
   }
 `

webapp/src/routes/RewardsDistribution.js

@@ -26,7 +26,6 @@ import { countries } from '../utils/countries'
 import { PRODUCERS_QUERY, SETTING_QUERY } from '../gql'
 import CountryFlag from '../components/CountryFlag'
 import Tooltip from '../components/Tooltip'
-import { eosConfig } from '../config'
 
 const lowestRewardsColor = '#B6EBF3'
 const highestRewardsColor = '#265F63'
@@ -237,8 +236,7 @@ const RewardsDistribution = () => {
           <Typography>
             <span className={classes.popoverItem}>{t('rewards')}: </span>
             <span>
-              {formatWithThousandSeparator(currentNode?.rewards, 2)}{' '}
-              {eosConfig.tokenSymbol}
+              {formatWithThousandSeparator(currentNode?.rewards, 2)} EOS
             </span>
           </Typography>
           <Typography className={classes.popoverItem}>
@@ -257,8 +255,7 @@ const RewardsDistribution = () => {
                   {producer?.bp_json?.org?.candidate_name || producer.owner}
                 </Link>
                 <br />
-                {formatWithThousandSeparator(producer.total_rewards, 2)}{' '}
-                {eosConfig.tokenSymbol}
+                {formatWithThousandSeparator(producer.total_rewards, 2)} EOS
               </li>
             ))}
           </ul>
@@ -276,20 +273,19 @@ const RewardsDistribution = () => {
                 )}
                 {nodes.length > 0 && (
                   <span>
-                    {formatWithThousandSeparator(summary.daylyRewars, 2)}{' '}
-                    {eosConfig.tokenSymbol}
+                    {formatWithThousandSeparator(summary.daylyRewars, 2)} EOS
                   </span>
                 )}
               </Typography>
               <Typography variant="subtitle1">
                 {!nodes.length > 0 && (
                   <Skeleton variant="text" width="100%" animation="wave" />
                 )}
-                {nodes.length > 0 && setting?.token_price && (
+                {nodes.length > 0 && setting?.eos_price && (
                   <span>
                     $
                     {formatWithThousandSeparator(
-                      summary.daylyRewars * setting?.token_price,
+                      summary.daylyRewars * setting?.eos_price,
                       0
                     )}{' '}
                     USD
@@ -321,16 +317,15 @@ const RewardsDistribution = () => {
                 {!nodes.length > 0 && (
                   <Skeleton variant="text" width="100%" animation="wave" />
                 )}
-                {nodes.length > 0 && setting?.token_price && (
+                {nodes.length > 0 && setting?.eos_price && (
                   <>
                     {formatWithThousandSeparator(
                       summary.topCountryByRewards.rewards,
                       0
                     )}{' '}
-                    {eosConfig.tokenSymbol} / $
+                    EOS / $
                     {formatWithThousandSeparator(
-                      summary.topCountryByRewards.rewards *
-                        setting?.token_price,
+                      summary.topCountryByRewards.rewards * setting?.eos_price,
                       0
                     )}{' '}
                     USD
@@ -384,12 +379,12 @@ const RewardsDistribution = () => {
                 </span>
                 <span className={classes.highestRewards} />
               </Typography>
-              {setting?.token_price && (
+              {setting?.eos_price && (
                 <Typography variant="h6" className={classes.rewardsColorSchema}>
                   <span className={classes.itemLabel}>
                     {t('exchangeRate')}:{' '}
                   </span>{' '}
-                  ${formatWithThousandSeparator(setting.token_price, 2)}
+                  ${formatWithThousandSeparator(setting.eos_price, 2)}
                 </Typography>
               )}
             </CardContent>