Deploy new version of Celostats and minnor change from celo-blockchain

.env

@@ -12,22 +12,24 @@ CLUSTER_DOMAIN_NAME="celo-networks-dev"
 TESTNET_PROJECT_NAME="celo-testnet"
 
 BLOCKSCOUT_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/blockscout"
-BLOCKSCOUT_DOCKER_IMAGE_TAG="5fba4843b3e78b5ab75d01766214cb24c6a40649"
+BLOCKSCOUT_DOCKER_IMAGE_TAG="8be64adeccbb8f67dea3b6653600021577e544c5"
 BLOCKSCOUT_WEB_REPLICAS=3
 BLOCKSCOUT_DB_SUFFIX=
 
 ETHSTATS_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/ethstats"
-ETHSTATS_DOCKER_IMAGE_TAG="0ffe524c625ea59e4492dc92c2e638689c36e4b0"
+ETHSTATS_DOCKER_IMAGE_TAG="49fe674cb57f5d11174f4608f7469b03a69ebea5"
+ETHSTATS_TRUSTED_ADDRESSES="0x480b0e0A641AE45521377d4984d085a003934561,0xF523976B9FB2160e9a43D8Aee016b98ea8f57837"
+ETHSTATS_BANNED_ADDRESSES="0xFd24A0699288E141A855bC8c0dd0400C5E89D5e5"
 
 GETH_NODE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/geth"
 # When upgrading change this to latest commit hash from the master of the geth repo
 # `geth $ git show | head -n 1`
-GETH_NODE_DOCKER_IMAGE_TAG="7ccc0a81920e6e09663855fc0ed46a98d634e74a"
+GETH_NODE_DOCKER_IMAGE_TAG="aa3d9d5f5d175f78ef9f80bd32661fc25ad25eb0"
 
 GETH_BOOTNODE_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/geth-all"
 # When upgrading change this to latest commit hash from the master of the geth repo
 # `geth $ git show | head -n 1`
-GETH_BOOTNODE_DOCKER_IMAGE_TAG="7ccc0a81920e6e09663855fc0ed46a98d634e74a"
+GETH_BOOTNODE_DOCKER_IMAGE_TAG="aa3d9d5f5d175f78ef9f80bd32661fc25ad25eb0"
 
 CELOTOOL_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
 CELOTOOL_DOCKER_IMAGE_TAG="celotool-dfdc3e8b26e98aa294b27e2b5621c184488a10db"

packages/celotool/src/lib/env-utils.ts

@@ -31,7 +31,8 @@ export enum envVar {
   EPOCH = 'EPOCH',
   ETHSTATS_DOCKER_IMAGE_REPOSITORY = 'ETHSTATS_DOCKER_IMAGE_REPOSITORY',
   ETHSTATS_DOCKER_IMAGE_TAG = 'ETHSTATS_DOCKER_IMAGE_TAG',
-  ETHSTATS_WEBSOCKETSECRET = 'ETHSTATS_WEBSOCKETSECRET',
+  ETHSTATS_TRUSTED_ADDRESSES = 'ETHSTATS_TRUSTED_ADDRESSES',
+  ETHSTATS_BANNED_ADDRESSES = 'ETHSTATS_BANNED_ADDRESSES',
   GETH_ACCOUNT_SECRET = 'GETH_ACCOUNT_SECRET',
   GETH_BOOTNODE_DOCKER_IMAGE_REPOSITORY = 'GETH_BOOTNODE_DOCKER_IMAGE_REPOSITORY',
   GETH_BOOTNODE_DOCKER_IMAGE_TAG = 'GETH_BOOTNODE_DOCKER_IMAGE_TAG',
@@ -70,7 +71,6 @@ export enum envVar {
   TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG = 'TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG',
   TX_NODES = 'TX_NODES',
   VALIDATORS = 'VALIDATORS',
-  VERIFICATION_POOL_URL = 'VERIFICATION_POOL_URL',
   VM_BASED = 'VM_BASED',
 }
 

packages/celotool/src/lib/ethstats.ts

@@ -1,6 +1,7 @@
 import { installGenericHelmChart, removeGenericHelmChart } from 'src/lib/helm_deploy'
 import { execCmdWithExitOnFailure } from 'src/lib/utils'
-import { envVar, fetchEnv, isVmBased } from './env-utils'
+import { envVar, fetchEnv } from './env-utils'
+import { AccountType, getAddressesFor } from './generate_utils'
 
 const helmChartPath = '../helm-charts/ethstats'
 
@@ -29,13 +30,26 @@ export async function upgradeHelmChart(celoEnv: string) {
 function helmParameters() {
   return [
     `--set domain.name=${fetchEnv(envVar.CLUSTER_DOMAIN_NAME)}`,
-    `--set ethstats.createSecret=${isVmBased()}`,
-    `--set ethstats.webSocketSecret="${fetchEnv(envVar.ETHSTATS_WEBSOCKETSECRET)}"`,
     `--set ethstats.image.repository=${fetchEnv(envVar.ETHSTATS_DOCKER_IMAGE_REPOSITORY)}`,
     `--set ethstats.image.tag=${fetchEnv(envVar.ETHSTATS_DOCKER_IMAGE_TAG)}`,
+    `--set ethstats.trusted_addresses='{${generateAuthorizedAddresses()}}'`,
+    `--set ethstats.banned_addresses='{${fetchEnv(envVar.ETHSTATS_BANNED_ADDRESSES)}}'`,
   ]
 }
 
 function releaseName(celoEnv: string) {
   return `${celoEnv}-ethstats`
 }
+
+function generateAuthorizedAddresses() {
+  // TODO: Add the Proxy eth addresses when available
+  const mnemonic = fetchEnv(envVar.MNEMONIC)
+  const publicKeys = []
+  const txNodes = parseInt(fetchEnv(envVar.TX_NODES), 0)
+  const validatorNodes = parseInt(fetchEnv(envVar.VALIDATORS), 0)
+  publicKeys.push(getAddressesFor(AccountType.TX_NODE, mnemonic, txNodes))
+  publicKeys.push(getAddressesFor(AccountType.VALIDATOR, mnemonic, validatorNodes))
+
+  publicKeys.push(fetchEnv(envVar.ETHSTATS_TRUSTED_ADDRESSES).split(','))
+  return publicKeys.reduce((accumulator, value) => accumulator.concat(value), [])
+}

packages/celotool/src/lib/helm_deploy.ts

@@ -10,7 +10,6 @@ import {
   execCmd,
   execCmdWithExitOnFailure,
   getVerificationPoolRewardsURL,
-  getVerificationPoolSMSURL,
   outputIncludes,
   switchToProjectFromEnv,
 } from './utils'
@@ -522,10 +521,6 @@ async function helmParameters(celoEnv: string) {
 
   return [
     `--set domain.name=${fetchEnv('CLUSTER_DOMAIN_NAME')}`,
-    `--set geth.miner.verificationpool=${fetchEnvOrFallback(
-      'VERIFICATION_POOL_URL',
-      getVerificationPoolSMSURL(celoEnv)
-    )}`,
     `--set geth.verbosity=${fetchEnvOrFallback('GETH_VERBOSITY', '4')}`,
     `--set geth.node.cpu_request=${fetchEnv('GETH_NODE_CPU_REQUEST')}`,
     `--set geth.node.memory_request=${fetchEnv('GETH_NODE_MEMORY_REQUEST')}`,
@@ -562,7 +557,6 @@ async function helmParameters(celoEnv: string) {
     `--set mnemonic="${fetchEnv('MNEMONIC')}"`,
     `--set contracts.cron_jobs.enabled=${fetchEnv('CONTRACT_CRONJOBS_ENABLED')}`,
     `--set geth.account.secret="${fetchEnv('GETH_ACCOUNT_SECRET')}"`,
-    `--set ethstats.webSocketSecret="${fetchEnv('ETHSTATS_WEBSOCKETSECRET')}"`,
     `--set geth.ping_ip_from_packet=${fetchEnvOrFallback('PING_IP_FROM_PACKET', 'false')}`,
     `--set geth.in_memory_discovery_table=${fetchEnvOrFallback(
       'IN_MEMORY_DISCOVERY_TABLE',

packages/celotool/src/lib/vm-testnet-utils.ts

@@ -50,7 +50,6 @@ const testnetEnvVars: TerraformVars = {
   network_id: envVar.NETWORK_ID,
   tx_node_count: envVar.TX_NODES,
   validator_count: envVar.VALIDATORS,
-  verification_pool_url: envVar.VERIFICATION_POOL_URL,
 }
 
 const testnetNetworkEnvVars: TerraformVars = {
@@ -392,7 +391,6 @@ function generateValidatorSecretEnvVars(accountType: AccountType, index: number)
     ),
     PRIVATE_KEY: privateKey,
     [envVar.GETH_ACCOUNT_SECRET]: fetchEnv(envVar.GETH_ACCOUNT_SECRET),
-    [envVar.ETHSTATS_WEBSOCKETSECRET]: fetchEnv(envVar.ETHSTATS_WEBSOCKETSECRET),
     [envVar.MNEMONIC]: mnemonic,
   }
   return formatEnvVars(secrets)

packages/helm-charts/ethstats/templates/ethstats.deployment.yaml

@@ -26,19 +26,40 @@ spec:
       - name: ethstats
         image: {{ .Values.ethstats.image.repository }}:{{ .Values.ethstats.image.tag }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
+        command:
+        - /bin/sh
+        - -c
+        args:
+        - |
+          cat <<'EOF' > /celostats-server/lib/utils/config.js
+          var trusted = [
+            {{- range .Values.ethstats.trusted_addresses }}
+            {{- if . }}
+            "{{ . }}",
+            {{- end }}
+            {{- end }}
+          ]
+          var banned = [
+            {{- range .Values.ethstats.banned_addresses }}
+            {{- if . }}
+            "{{ . }}",
+            {{- end }}
+            {{- end }}
+          ]
+          module.exports = {
+            trusted:  trusted,
+            banned:   banned,
+            reserved: []
+          };
+          EOF
+          npm start
         ports:
         - name: http
           containerPort: 3000
         resources:
           requests:
             cpu: 100m
             memory: 250Mi
-        env:
-        - name: WS_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Release.Name }}
-              key: WS_SECRET
     {{- with .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}

packages/helm-charts/ethstats/values.yaml

@@ -10,3 +10,5 @@ ethstats:
     tag: latest
   service:
     type: NodePort
+  trusted_addresses: []
+  banned_addresses: []

packages/helm-charts/testnet/templates/_helpers.tpl

@@ -195,10 +195,9 @@ spec:
           --consoleformat=json \
           --consoleoutput=stdout \
           --etherbase=${ACCOUNT_ADDRESS} \
-          --ethstats=${HOSTNAME}:${ETHSTATS_SECRET}@${ETHSTATS_SVC} \
+          --ethstats=${HOSTNAME}@${ETHSTATS_SVC} \
           --metrics \
           --mine \
-          --miner.verificationpool=${VERIFICATION_POOL_URL} \
           --networkid=${NETWORK_ID} \
           --nodekey=/root/.celo/account/{{ .Node.name}}PrivateKey \
           --password=/root/.celo/account/accountSecret \
@@ -239,20 +238,13 @@ spec:
         env:
         - name: ETHSTATS_SVC
           value: {{ template "ethereum.fullname" . }}-ethstats.{{ .Release.Namespace }}
-        - name: ETHSTATS_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "ethereum.fullname" . }}-ethstats
-              key: WS_SECRET
         - name: ACCOUNT_ADDRESS
           value: {{ .Node.address }}
         - name: NETWORK_ID
           valueFrom:
             configMapKeyRef:
               name: {{ template "ethereum.fullname" . }}-geth-config
               key: networkid
-        - name: VERIFICATION_POOL_URL
-          value: {{ .Values.geth.miner.verificationpool }}
         - name: VERIFICATION_REWARDS_URL
           value: {{ .Values.verification.rewardsUrl }}
 {{ include "celo.geth-exporter-container" .  | indent 6 }}
@@ -312,7 +304,7 @@ spec:
         - "geth --bootnodes=`cat /root/.celo/bootnodes` \
           --consoleformat=json \
           --consoleoutput=stdout \
-          --ethstats=${HOSTNAME}:${ETHSTATS_SECRET}@${ETHSTATS_SVC} \
+          --ethstats=${HOSTNAME}@${ETHSTATS_SVC} \
           --lightpeers 250 \
           --lightserv 90 \
           --metrics \
@@ -352,11 +344,6 @@ spec:
         env:
         - name: ETHSTATS_SVC
           value: {{ template "ethereum.fullname" . }}-ethstats.{{ .Release.Namespace }}
-        - name: ETHSTATS_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "ethereum.fullname" . }}-ethstats
-              key: WS_SECRET
         - name: TARGET_GAS_LIMIT
           value: {{ .Values.geth.genesis.gasLimit | quote }}
         - name: NETWORK_ID

packages/helm-charts/testnet/templates/txnode.statefulset.yaml

@@ -124,30 +124,21 @@ spec:
             --networkid=${NETWORK_ID} \
             --syncmode=full \
             ${NAT_FLAG} \
-            --ethstats=${HOSTNAME}:${ETHSTATS_SECRET}@${ETHSTATS_SVC} \
-            --miner.verificationpool=${VERIFICATION_POOL_URL} \
+            --ethstats=${HOSTNAME}@${ETHSTATS_SVC} \
             --consoleformat=json \
             --consoleoutput=stdout \
             --verbosity={{ .Values.geth.verbosity }} \
-            --ethstats=${HOSTNAME}:${ETHSTATS_SECRET}@${ETHSTATS_SVC} \
             --metrics \
             ${PING_IP_FROM_PACKET_FLAG} \
             ${IN_MEMORY_DISCOVERY_TABLE_FLAG}
         env:
         - name: ETHSTATS_SVC
           value: {{ template "ethereum.fullname" . }}-ethstats.{{ .Release.Namespace }}
-        - name: ETHSTATS_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "ethereum.fullname" . }}-ethstats
-              key: WS_SECRET
         - name: NETWORK_ID
           valueFrom:
             configMapKeyRef:
               name: {{ template "ethereum.fullname" . }}-geth-config
               key: networkid
-        - name: VERIFICATION_POOL_URL
-          value: {{ .Values.geth.miner.verificationpool }}
         - name: STATIC_IPS_FOR_GETH_NODES
           value: "{{ default "false" .Values.geth.static_ips }}"
         - name: PING_IP_FROM_PACKET

packages/helm-charts/testnet/templates/validators.statefulset.yaml

@@ -145,12 +145,10 @@ spec:
             --etherbase=${ACCOUNT_ADDRESS} \
             --networkid=${NETWORK_ID} \
             --syncmode=full \
-            --ethstats=${HOSTNAME}:${ETHSTATS_SECRET}@${ETHSTATS_SVC} \
-            --miner.verificationpool=${VERIFICATION_POOL_URL} \
+            --ethstats=${HOSTNAME}@${ETHSTATS_SVC} \
             --consoleformat=json \
             --consoleoutput=stdout \
             --verbosity={{ .Values.geth.verbosity }} \
-            --ethstats=${HOSTNAME}:${ETHSTATS_SECRET}@${ETHSTATS_SVC} \
             ${FAULTY_NODE_FLAGS} \
             --istanbul.blockperiod={{ .Values.geth.blocktime }} \
             --istanbul.requesttimeout={{ .Values.geth.istanbulrequesttimeout }} \
@@ -167,18 +165,11 @@ spec:
               fieldPath: status.podIP
         - name: ETHSTATS_SVC
           value: {{ template "ethereum.fullname" . }}-ethstats.{{ .Release.Namespace }}
-        - name: ETHSTATS_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "ethereum.fullname" . }}-ethstats
-              key: WS_SECRET
         - name: NETWORK_ID
           valueFrom:
             configMapKeyRef:
               name: {{ template "ethereum.fullname" . }}-geth-config
               key: networkid
-        - name: VERIFICATION_POOL_URL
-          value: {{ .Values.geth.miner.verificationpool }}
         - name: FAULTY_NODES
           value: {{ .Values.geth.faultyValidators | quote }}
         - name: FAULTY_NODE_TYPE

packages/terraform-modules/testnet/modules/tx-node/startup.sh

@@ -81,7 +81,6 @@ docker run -v $DATA_DIR:$DATA_DIR -p 8545:8545/tcp -p 8546:8546/tcp --name geth
     --etherbase=$ACCOUNT_ADDRESS \
     --networkid=${network_id} \
     --syncmode=full \
-    --miner.verificationpool=${verification_pool_url} \
     --consoleformat=json \
     --consoleoutput=stdout \
     --verbosity=${geth_verbosity} \

packages/terraform-modules/testnet/modules/tx-node/variables.tf

@@ -82,8 +82,3 @@ variable tx_node_count {
   type        = number
   description = "Number of tx-nodes to create"
 }
-
-variable verification_pool_url {
-  type        = string
-  description = "URL of the verification pool"
-}

packages/terraform-modules/testnet/modules/validator/main.tf

@@ -67,8 +67,7 @@ resource "google_compute_instance" "validator" {
       max_peers : (var.validator_count + var.tx_node_count) * 2,
       network_id : var.network_id,
       rid : count.index,
-      validator_name : "${local.name_prefix}-${count.index}",
-      verification_pool_url : var.verification_pool_url
+      validator_name : "${local.name_prefix}-${count.index}"
     }
   )
 

packages/terraform-modules/testnet/modules/validator/startup.sh

@@ -109,7 +109,6 @@ docker run -v $DATA_DIR:$DATA_DIR --name geth --net=host --entrypoint /bin/sh -d
       --etherbase=$ACCOUNT_ADDRESS \
       --networkid=${network_id} \
       --syncmode=full \
-      --miner.verificationpool=${verification_pool_url} \
       --consoleformat=json \
       --consoleoutput=stdout \
       --verbosity=${geth_verbosity} \

packages/terraform-modules/testnet/modules/validator/variables.tf

@@ -92,8 +92,3 @@ variable validator_count {
   type        = number
   description = "Number of validators to create"
 }
-
-variable verification_pool_url {
-  type        = string
-  description = "URL of the verification pool"
-}

packages/terraform-modules/testnet/variables.tf

@@ -107,8 +107,3 @@ variable validator_count {
   type        = number
   description = "Number of validators to create"
 }
-
-variable verification_pool_url {
-  type        = string
-  description = "URL of the verification pool"
-}