Merge branch 'master' into carterqw2/call-tracer

celo-org · Apr 4, 2023 · 1863b52 · 1863b52
2 parents ab68913 + b645295
commit 1863b52
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/helm_deploy_call.yml b/.github/workflows/helm_deploy_call.yml
@@ -1,5 +1,5 @@
 ---
-name: 'ZZDeploy a helm chart. Generic workflow'
+name: 'Deploy a helm chart. Generic workflow'
 
 on:
   workflow_call:
@@ -41,7 +41,7 @@ env:
 
 jobs:
   helmfile:
-    name: Helm Deploy
+    name: Auth, Setup + Run helmfile ${{ inputs.action }}
     runs-on: ubuntu-latest
     permissions:
       id-token: write

diff --git a/.github/workflows/helm_deploy_dispatch.yml b/.github/workflows/helm_deploy_dispatch.yml
@@ -1,6 +1,6 @@
 ---
 name: 'Deploy Helm Chart'
-run-name: 'Helm ${{ github.event.inputs.action }} on ${{ github.event.inputs.deployment }} triggered by @${{ github.actor }}'
+run-name: 'helmfile ${{ github.event.inputs.action }} on ${{ github.event.inputs.deployment }} - @${{ github.actor }}'
 
 on:
   workflow_dispatch:
@@ -88,9 +88,10 @@ jobs:
             echo "image-commit=" >> "$GITHUB_OUTPUT"
           fi
 
-  helm-deploy:
+  helmfile-run:
     uses: ./.github/workflows/helm_deploy_call.yml
     needs: set-config
+    name: "helmfile ${{ github.event.inputs.action }}"
     with:
       helmfile: helm/helmfiles/${{ github.event.inputs.deployment }}.yaml
       action: ${{ github.event.inputs.action }}

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/overview.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/overview.html.eex
@@ -239,7 +239,7 @@
             </dd>
           </dl>
           <% end %>
-          <%= if not is_nil(@celo_epoch.voting_sum) and not is_nil(@address.celo_account) and (@address.celo_account.account_type == "validator" or @address.celo_account.account_type == "group") do %>
+          <%= if not is_nil(@celo_epoch.voting_sum) and not is_nil(@celo_epoch.validator_or_group_sum) and not is_nil(@address.celo_account) and (@address.celo_account.account_type == "validator" or @address.celo_account.account_type == "group") do %>
           <!-- Validator / Group Rewards -->
           <dl class="row">
             <dt class="col-sm-4 col-md-4 col-lg-3 text-muted">

diff --git a/helm/values/values-rc1staging-blockscout.yaml b/helm/values/values-rc1staging-blockscout.yaml
@@ -2,8 +2,10 @@
 blockscout:
   eventStream:
     replicas: 1
-    beanstalkdHost: "rc1staging-governance-notifications-beanstalkd.event-notifications.svc.cluster.local"
-
+    enabled: true
+    beanstalkdPort: "11300"
+    beanstalkdHost: "rc1staging-webhooks-beanstalkd.webhooks.svc.cluster.local"
+    beanstalkdTube: "incoming"
   indexer:
     db:
       connectionName: celo-testnet-production:us-west1:rc1staging
@@ -17,8 +19,6 @@ blockscout:
       requests:
         memory: 12Gi
         cpu: 5
-    enableEventStream: true
-    beanstalkdPort: "11300"
   api:
     autoscaling:
       maxReplicas: 2