perf(hapi): use env

.env.ultratestnet

@@ -50,6 +50,8 @@ HAPI_REWARDS_TOKEN=UOS
 HAPI_SYNC_STATS_INTERVAL=60
 HAPI_SYNC_SCHEDULE_HISTORY_INTERVAL=86400
 GOOGLE_APPLICATION_CREDENTIALS=/app/google-credentials.json
+HAPI_RE_CAPTCHA_PROJECT_ID=eosio-dashboard
+HAPI_PUBLIC_RE_CAPTCHA_KEY=6LfiHUwfAAAAAEKanm2t2roRSPxmhP5-LPUBU_wG
 
 #webapp
 PORT=3000

.github/workflows/deploy-ultra-testnet.yaml

@@ -111,6 +111,8 @@ jobs:
           HAPI_SYNC_PRODUCER_INFO_INTERVAL: '1'
           HAPI_SYNC_SCHEDULE_HISTORY_INTERVAL: 86400
           GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
+          HAPI_RE_CAPTCHA_PROJECT_ID: 'eosio-dashboard'
+          HAPI_PUBLIC_RE_CAPTCHA_KEY: '6LfiHUwfAAAAAEKanm2t2roRSPxmhP5-LPUBU_wG'
           HAPI_SYNC_STATS_INTERVAL: ''
           HAPI_EOS_EXCHANGE_RATE_API: ''
           HAPI_COINGECKO_API_TOKEN_ID: ''

docker-compose.yaml

@@ -60,6 +60,8 @@ services:
       HAPI_SYNC_STATS_INTERVAL: '${HAPI_SYNC_STATS_INTERVAL}'
       HAPI_SYNC_SCHEDULE_HISTORY_INTERVAL: '${HAPI_SYNC_SCHEDULE_HISTORY_INTERVAL}'
       GOOGLE_APPLICATION_CREDENTIALS: '${GOOGLE_APPLICATION_CREDENTIALS}'
+      HAPI_RE_CAPTCHA_PROJECT_ID: '${HAPI_RE_CAPTCHA_PROJECT_ID}'
+      HAPI_PUBLIC_RE_CAPTCHA_KEY: '${HAPI_PUBLIC_RE_CAPTCHA_KEY}'
   hasura:
     container_name: '${STAGE}-${APP_NAME}-hasura'
     image: hasura/graphql-engine:v2.2.1.cli-migrations-v3

hapi/src/config/index.js

@@ -2,5 +2,6 @@ module.exports = {
   eosConfig: require('./eos.config'),
   hasuraConfig: require('./hasura.config'),
   serverConfig: require('./server.config'),
-  workersConfig: require('./workers.config')
+  workersConfig: require('./workers.config'),
+  recaptchaConfig: require('./recaptcha.config')
 }

hapi/src/config/recaptcha.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+  projectId: process.env.HAPI_RE_CAPTCHA_PROJECT_ID,
+  siteKey: process.env.HAPI_PUBLIC_RE_CAPTCHA_KEY
+}

hapi/src/services/cpu.service.js

@@ -34,7 +34,7 @@ const worker = async () => {
       usage: transaction.processed.receipt.cpu_usage_us
     })
   } catch (error) {
-    console.error('cpuService.sync', error)
+    // console.error('cpuService.sync', error)
   }
 }
 

hapi/src/utils/google-recaptcha-enterprise.util.js

@@ -1,3 +1,5 @@
+const { recaptchaConfig } = require('../config')
+
 const {
   RecaptchaEnterpriseServiceClient
 } = require('@google-cloud/recaptcha-enterprise')
@@ -6,11 +8,11 @@ const isRecaptchaTokenValid = async token => {
   const reCaptchaClient = new RecaptchaEnterpriseServiceClient()
 
   const [assessment] = await reCaptchaClient.createAssessment({
-    parent: reCaptchaClient.projectPath('eosio-dashboard'),
+    parent: reCaptchaClient.projectPath(recaptchaConfig.projectId),
     assessment: {
       event: {
         token: token,
-        siteKey: '6LfiHUwfAAAAAEKanm2t2roRSPxmhP5-LPUBU_wG'
+        siteKey: recaptchaConfig.siteKey
       }
     }
   })

kubernetes/configmap-dashboard.yaml

@@ -75,6 +75,8 @@ data:
   HAPI_SYNC_STATS_INTERVAL: '${HAPI_SYNC_STATS_INTERVAL}'
   HAPI_SYNC_SCHEDULE_HISTORY_INTERVAL: '${HAPI_SYNC_SCHEDULE_HISTORY_INTERVAL}'
   GOOGLE_APPLICATION_CREDENTIALS: '${GOOGLE_APPLICATION_CREDENTIALS}'
+  HAPI_RE_CAPTCHA_PROJECT_ID: '${HAPI_RE_CAPTCHA_PROJECT_ID}'
+  HAPI_PUBLIC_RE_CAPTCHA_KEY: '${HAPI_PUBLIC_RE_CAPTCHA_KEY}'
   HAPI_EOS_EXCHANGE_RATE_API: '${HAPI_EOS_EXCHANGE_RATE_API}'
   HAPI_COINGECKO_API_TOKEN_ID: '${HAPI_COINGECKO_API_TOKEN_ID}'
   HAPI_REWARDS_TOKEN: '${HAPI_REWARDS_TOKEN}'

webapp/src/routes/Faucet.js

@@ -72,7 +72,7 @@ const Faucet = ({ ual }) => {
         }
       })
     } catch (err) {
-      console.log('ERR-TRANSFER', err)
+      console.log('ERR', err)
     }
   }