Merge master into audit/core-contracts.v5

.circleci/config.yml

@@ -34,7 +34,7 @@ defaults: &defaults
 contract-defaults: &contract-defaults
   <<: *defaults
   environment:
-    RELEASE_TAG: core-contracts.v4
+    RELEASE_TAG: core-contracts.v5
 
 e2e-defaults: &e2e-defaults
   <<: *defaults

.env

@@ -87,6 +87,8 @@ LOAD_TEST_CLIENTS=100
 # every 36 seconds, so that 100 transactions are sent by a client every hour
 LOAD_TEST_TX_DELAY_MS=36000
 
+LOAD_TEST_USE_RANDOM_RECIPIENT='false'
+
 # the amount in cUSD wei to give faucet, load test, and attestation bot accounts
 FAUCET_CUSD_WEI=60000000000000000000000
 

.env.alfajores

@@ -51,6 +51,7 @@ AZURE_ORACLE_CENTRALUS_FULL_NODES_ROLLING_UPDATE_PARTITION=0
 AZURE_ORACLE_CENTRALUS_FULL_NODES_RPC_API_METHODS="eth,net,rpc,web3"
 AZURE_ORACLE_CENTRALUS_FULL_NODES_GETH_GC_MODE="full"
 AZURE_ORACLE_CENTRALUS_FULL_NODES_USE_GSTORAGE_DATA=false
+AZURE_ORACLE_CENTRALUS_FULL_NODES_WS_PORT="8546"
 
 # Temporarily point to celo-org repository to consume patched image.
 GETH_NODE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-org/geth"
@@ -91,7 +92,7 @@ ATTESTATION_BOT_MAX_ATTESTATIONS=32
 ATTESTATION_BOT_SKIP_ODIS_SALT=bot
 
 ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/celo-monorepo"
-ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-v1.2.0"
+ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-v1.3.0"
 
 TELEKOM_FROM="+14157389085"
 SMS_PROVIDERS=twilio,nexmo,telekom
@@ -253,7 +254,7 @@ AZURE_ODIS_EASTUS_3_PROM_SIDECAR_GCP_REGION=us-east1
 # --- Komenci ---
 
 KOMENCI_DOCKER_IMAGE_REPOSITORY="celotestnet.azurecr.io/komenci/komenci"
-KOMENCI_DOCKER_IMAGE_TAG="f1119833e7ad90ad741b2b509a1ad4ac647799ff"
+KOMENCI_DOCKER_IMAGE_TAG="08081d2d276a6fd0d420805f3bbe3866e866a63a"
 
 AZURE_KOMENCI_EASTUS_AZURE_KUBERNETES_RESOURCE_GROUP=staging-komenci-eastus
 AZURE_KOMENCI_EASTUS_KUBERNETES_CLUSTER_NAME=staging-komenci-eastus
@@ -273,6 +274,16 @@ AZURE_KOMENCI_WESTEU_KOMENCI_DB_PORT=5432
 AZURE_KOMENCI_WESTEU_KOMENCI_DB_USERNAME=postgres@staging-komenci-weu
 AZURE_KOMENCI_WESTEU_KOMENCI_DB_PASSWORD_VAULT_NAME=staging-komenci-weu
 
+AZURE_KOMENCI_EASTUS_KOMENCI_REWARD_SERVICE_DB_HOST=staging-komenci-weu.postgres.database.azure.com
+AZURE_KOMENCI_EASTUS_KOMENCI_REWARD_SERVICE_DB_PORT=5432
+AZURE_KOMENCI_EASTUS_KOMENCI_REWARD_SERVICE_DB_USERNAME=postgres@staging-komenci-weu
+AZURE_KOMENCI_EASTUS_KOMENCI_REWARD_SERVICE_DB_PASSWORD_VAULT_NAME=staging-komenci-weu
+
+AZURE_KOMENCI_WESTEU_KOMENCI_REWARD_SERVICE_DB_HOST=staging-komenci-weu.postgres.database.azure.com
+AZURE_KOMENCI_WESTEU_KOMENCI_REWARD_SERVICE_DB_PORT=5432
+AZURE_KOMENCI_WESTEU_KOMENCI_REWARD_SERVICE_DB_USERNAME=postgres@staging-komenci-weu
+AZURE_KOMENCI_WESTEU_KOMENCI_REWARD_SERVICE_DB_PASSWORD_VAULT_NAME=staging-komenci-weu
+
 # Secrets
 AZURE_KOMENCI_EASTUS_KOMENCI_APP_SECRETS_VAULT_NAME=staging-komenci-eus
 AZURE_KOMENCI_WESTEU_KOMENCI_APP_SECRETS_VAULT_NAME=staging-komenci-weu
@@ -284,8 +295,15 @@ AZURE_KOMENCI_WESTEU_KOMENCI_RULE_CONFIG_CAPTCHA_BYPASS_ENABLED=true
 
 # Format should be a comma-separated sequence of:
 # <address>:<key vault name>:<resource group (optional)>
-AZURE_KOMENCI_EASTUS_KOMENCI_ADDRESS_AZURE_KEY_VAULTS=0x00454cac6dae53f8800f71395b9a174f07a784b1:staging-komenci-eus,0xc6f0f9bfb1aed83620ece3eac0add98a65a8574e:staging-komenci-eus,0xd7fc8227642bfab9aa927066e5952fece574f0d6:staging-komenci-eus,0x04a444af9a79b6784bcd57c50ba1e051ba536ed4:staging-komenci-eus,0xbb5932e6b6a588cd1c6764f50d1fe410e6a2d71e:staging-komenci-eus,0xc934bff63a0db800acdf7061eb5cc03211e7bccf:staging-komenci-eus,0x409832bd2d72017f12cfaa3d6dc0103767bb7e7e:staging-komenci-eus,0x75222b1aed66393fa43c6454000e097363d85c73:staging-komenci-eus,0xefbc10d42f77c778431043bd3a34b283f90f3979:staging-komenci-eus,0x70b69157973cd31dae5dc68ee1891b9eae379c42:staging-komenci-eus
+AZURE_KOMENCI_EASTUS_KOMENCI_ADDRESS_AZURE_KEY_VAULTS=0x00454cac6dae53f8800f71395b9a174f07a784b1:staging-komenci-eus,0xc6f0f9bfb1aed83620ece3eac0add98a65a8574e:staging-komenci-eus
 AZURE_KOMENCI_WESTEU_KOMENCI_ADDRESS_AZURE_KEY_VAULTS=0x0f812be74511b90ea6b2f80e77bea047e69a0b2a:staging-komenci-weu,0xb354d3d2908ba6a2b791683b0f454a38f69cb282:staging-komenci-weu
+AZURE_KOMENCI_EASTUS_KOMENCI_CELOLABS_REWARDS_ADDRESS_AZURE_KEY_VAULTS=0xb04390478a57e3c2147599d5380434f25fa5234d:staging-komenci-rewards
+AZURE_KOMENCI_WESTEU_KOMENCI_CELOLABS_REWARDS_ADDRESS_AZURE_KEY_VAULTS=0xb04390478a57e3c2147599d5380434f25fa5234d:staging-komenci-rewards
+
+# Celo Rewards
+AZURE_KOMENCI_EASTUS_KOMENCI_REWARD_SERVICE_INSTANCE_COUNT = 1
+AZURE_KOMENCI_WESTEU_KOMENCI_REWARD_SERVICE_INSTANCE_COUNT = 1
+KOMENCI_SHOULD_SEND_REWARDS=true
 
 # Network
 AZURE_KOMENCI_EASTUS_KOMENCI_NETWORK=alfajores

.env.baklava

@@ -18,7 +18,7 @@ BLOCKSCOUT_DOCKER_IMAGE_TAG="0362f9f4d1d4842f27adb634d628f969f53c046d"
 BLOCKSCOUT_DB_SUFFIX=2
 BLOCKSCOUT_SUBNETWORK_NAME="Baklava"
 BLOCKSCOUT_METADATA_CRAWLER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-BLOCKSCOUT_METADATA_CRAWLER_IMAGE_TAG="metadata-crawler-007f29dc8ebf837543e6e28a14818076e88c69cd"
+BLOCKSCOUT_METADATA_CRAWLER_IMAGE_TAG="metadata-crawler-77a392216d4927e85ce4b683508fc0539aa92a34"
 BLOCKSCOUT_METADATA_CRAWLER_SCHEDULE="*/30 * * * *"
 
 CELOSTATS_SERVER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celostats-server"
@@ -73,6 +73,7 @@ AZURE_ORACLE_WESTUS2_FULL_NODES_DISK_SIZE=30
 AZURE_ORACLE_WESTUS2_FULL_NODES_RPC_API_METHODS="eth,net,rpc,web3"
 AZURE_ORACLE_WESTUS2_FULL_NODES_GETH_GC_MODE="full"
 AZURE_ORACLE_WESTUS2_FULL_NODES_USE_GSTORAGE_DATA=false
+AZURE_ORACLE_WESTUS2_FULL_NODES_WS_PORT="8546"
 
 AZURE_ORACLE_CENTRALUS_AZURE_SUBSCRIPTION_ID=7a6f5f20-bd43-4267-8c35-a734efca140c
 AZURE_ORACLE_CENTRALUS_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
@@ -90,6 +91,7 @@ AZURE_ORACLE_CENTRALUS_FULL_NODES_DISK_SIZE=30
 AZURE_ORACLE_CENTRALUS_FULL_NODES_RPC_API_METHODS="eth,net,rpc,web3"
 AZURE_ORACLE_CENTRALUS_FULL_NODES_GETH_GC_MODE="full"
 AZURE_ORACLE_CENTRALUS_FULL_NODES_USE_GSTORAGE_DATA=false
+AZURE_ORACLE_CENTRALUS_FULL_NODES_WS_PORT="8546"
 
 # ---- Forno ----
 
@@ -118,6 +120,7 @@ GCP_FORNO_EUROPE_WEST1_FULL_NODES_STATIC_NODES_FILE_SUFFIX=gcp-europe-west1
 GCP_FORNO_EUROPE_WEST1_FULL_NODES_RPC_API_METHODS="eth,net,rpc,web3"
 GCP_FORNO_EUROPE_WEST1_FULL_NODES_GETH_GC_MODE="full"
 GCP_FORNO_EUROPE_WEST1_FULL_NODES_USE_GSTORAGE_DATA=false
+GCP_FORNO_EUROPE_WEST1_FULL_NODES_WS_PORT="8546"
 
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-dc5e5dfa07231a4ff4664816a95eae606293eae9"

.env.blockscoutstagingrc1

@@ -0,0 +1,60 @@
+# Don't use "//" for comments in this file.
+# This file is meant to be executed as a bash script for testing.
+ENV_TYPE="development"
+
+GETH_VERBOSITY=2
+GETH_ENABLE_METRICS=false
+
+VM_BASED=true
+
+KUBERNETES_CLUSTER_NAME="celo-networks-dev"
+KUBERNETES_CLUSTER_ZONE="us-west1-a"
+CLUSTER_DOMAIN_NAME="celo-testnet"
+
+TESTNET_PROJECT_NAME="celo-testnet"
+
+BLOCKSCOUT_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/blockscout"
+BLOCKSCOUT_DOCKER_IMAGE_TAG="0362f9f4d1d4842f27adb634d628f969f53c046d"
+BLOCKSCOUT_DB_SUFFIX=3
+BLOCKSCOUT_SUBNETWORK_NAME="Celo"
+BLOCKSCOUT_METADATA_CRAWLER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
+BLOCKSCOUT_METADATA_CRAWLER_IMAGE_TAG="metadata-crawler-77a392216d4927e85ce4b683508fc0539aa92a34"
+BLOCKSCOUT_METADATA_CRAWLER_SCHEDULE="0 */2 * * *"
+BLOCKSCOUT_OVERRIDE_RPC_ENDPOINT="http://mainnet-archive-service.blockscoutstagingrc1.svc.cluster.local:8545"
+BLOCKSCOUT_OVERRIDE_WS_ENDPOINT="ws://mainnet-archive-service.blockscoutstagingrc1.svc.cluster.local:8545"
+METADATA_CRAWLER_DISCORD_CLUSTER_NAME="Mainnet"
+
+CELOSTATS_SERVER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celostats-server"
+CELOSTATS_SERVER_DOCKER_IMAGE_TAG="b4231e1b224f38153c1ccb4263eb08b8b687eb8c"
+CELOSTATS_FRONTEND_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celostats-frontend"
+CELOSTATS_FRONTEND_DOCKER_IMAGE_TAG="e659c81fe66ad3926a5c8cc46782bde731bb3280"
+CELOSTATS_TRUSTED_ADDRESSES=""
+CELOSTATS_BANNED_ADDRESSES=""
+CELOSTATS_RESERVED_ADDRESSES=""
+
+GETH_NODE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-org/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="1.3.2"
+
+GETH_BOOTNODE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-org/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="1.3.2"
+
+CELOTOOL_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
+CELOTOOL_DOCKER_IMAGE_TAG="celotool-1e67ff7e2a9c5c17cd328af700cc0173f1ec3e4a"
+
+CELOCLI_STANDALONE_IMAGE_REPOSITORY="gcr.io/celo-testnet/celocli-standalone"
+CELOCLI_STANDALONE_IMAGE_TAG="0.0.42"
+
+# Genesis Vars
+NETWORK_ID=42220
+CONSENSUS_TYPE="istanbul"
+BLOCK_TIME=5
+EPOCH=17280
+LOOKBACK=12
+ISTANBUL_REQUEST_TIMEOUT_MS=3000
+
+# Nodes whose RPC ports are only internally exposed
+PRIVATE_TX_NODES=4

.env.rc1

@@ -25,10 +25,10 @@ BLOCKSCOUT_DOCKER_IMAGE_TAG="0362f9f4d1d4842f27adb634d628f969f53c046d"
 BLOCKSCOUT_DB_SUFFIX=3
 BLOCKSCOUT_SUBNETWORK_NAME="Celo"
 BLOCKSCOUT_METADATA_CRAWLER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-BLOCKSCOUT_METADATA_CRAWLER_IMAGE_TAG="metadata-crawler-007f29dc8ebf837543e6e28a14818076e88c69cd"
+BLOCKSCOUT_METADATA_CRAWLER_IMAGE_TAG="metadata-crawler-77a392216d4927e85ce4b683508fc0539aa92a34"
 BLOCKSCOUT_METADATA_CRAWLER_SCHEDULE="0 */2 * * *"
 BLOCKSCOUT_OVERRIDE_RPC_ENDPOINT="http://rc1-fullnodes-rpc.rc1.svc.cluster.local:8545"
-BLOCKSCOUT_OVERRIDE_WS_ENDPOINT="ws://rc1-fullnodes-rpc.rc1.svc.cluster.local:8546"
+BLOCKSCOUT_OVERRIDE_WS_ENDPOINT="ws://rc1-fullnodes-rpc.rc1.svc.cluster.local:8545"
 METADATA_CRAWLER_DISCORD_CLUSTER_NAME="Mainnet"
 
 CELOSTATS_SERVER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celostats-server"
@@ -93,6 +93,7 @@ AZURE_ORACLE_WESTUS_FULL_NODES_DISK_SIZE=100
 AZURE_ORACLE_WESTUS_FULL_NODES_RPC_API_METHODS="eth,net,rpc,web3"
 AZURE_ORACLE_WESTUS_FULL_NODES_GETH_GC_MODE="full"
 AZURE_ORACLE_WESTUS_FULL_NODES_USE_GSTORAGE_DATA=false
+AZURE_ORACLE_WESTUS_FULL_NODES_WS_PORT="8546"
 
 AZURE_ORACLE_WESTEUROPE_AZURE_SUBSCRIPTION_ID=7a6f5f20-bd43-4267-8c35-a734efca140c
 AZURE_ORACLE_WESTEUROPE_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
@@ -109,6 +110,7 @@ AZURE_ORACLE_WESTEUROPE_FULL_NODES_DISK_SIZE=100
 AZURE_ORACLE_WESTEUROPE_FULL_NODES_RPC_API_METHODS="eth,net,rpc,web3"
 AZURE_ORACLE_WESTEUROPE_FULL_NODES_GETH_GC_MODE="full"
 AZURE_ORACLE_WESTEUROPE_FULL_NODES_USE_GSTORAGE_DATA=false
+AZURE_ORACLE_WESTEUROPE_FULL_NODES_WS_PORT="8546"
 
 AZURE_ORACLE_EASTUS2_AZURE_SUBSCRIPTION_ID=7a6f5f20-bd43-4267-8c35-a734efca140c
 AZURE_ORACLE_EASTUS2_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
@@ -125,6 +127,7 @@ AZURE_ORACLE_EASTUS2_FULL_NODES_DISK_SIZE=100
 AZURE_ORACLE_EASTUS2_FULL_NODES_RPC_API_METHODS="eth,net,rpc,web3"
 AZURE_ORACLE_EASTUS2_FULL_NODES_GETH_GC_MODE="full"
 AZURE_ORACLE_EASTUS2_FULL_NODES_USE_GSTORAGE_DATA=false
+AZURE_ORACLE_EASTUS2_FULL_NODES_WS_PORT="8546"
 
 # ---- Forno ----
 
@@ -154,7 +157,7 @@ GCP_FORNO_US_WEST1_FULL_NODES_STATIC_NODES_FILE_SUFFIX=gcp-us-west1
 GCP_FORNO_US_WEST1_FULL_NODES_RPC_API_METHODS="eth,net,rpc,web3"
 GCP_FORNO_US_WEST1_FULL_NODES_GETH_GC_MODE="full"
 GCP_FORNO_US_WEST1_FULL_NODES_USE_GSTORAGE_DATA=true
-
+GCP_FORNO_US_WEST1_FULL_NODES_WS_PORT="8546"
 
 GCP_FORNO_US_EAST1_GCP_PROJECT_NAME=celo-testnet-production
 GCP_FORNO_US_EAST1_GCP_ZONE=us-east1-b
@@ -170,7 +173,7 @@ GCP_FORNO_US_EAST1_FULL_NODES_STATIC_NODES_FILE_SUFFIX=gcp-us-east1
 GCP_FORNO_US_EAST1_FULL_NODES_RPC_API_METHODS="eth,net,rpc,web3"
 GCP_FORNO_US_EAST1_FULL_NODES_GETH_GC_MODE="full"
 GCP_FORNO_US_EAST1_FULL_NODES_USE_GSTORAGE_DATA=true
-
+GCP_FORNO_US_EAST1_FULL_NODES_WS_PORT="8546"
 
 GCP_FORNO_ASIA_EAST1_GCP_PROJECT_NAME=celo-testnet-production
 GCP_FORNO_ASIA_EAST1_GCP_ZONE=asia-east1-a
@@ -186,6 +189,7 @@ GCP_FORNO_ASIA_EAST1_FULL_NODES_STATIC_NODES_FILE_SUFFIX=gcp-asia-east1
 GCP_FORNO_ASIA_EAST1_FULL_NODES_RPC_API_METHODS="eth,net,rpc,web3"
 GCP_FORNO_ASIA_EAST1_FULL_NODES_GETH_GC_MODE="full"
 GCP_FORNO_ASIA_EAST1_FULL_NODES_USE_GSTORAGE_DATA=true
+GCP_FORNO_ASIA_EAST1_FULL_NODES_WS_PORT="8546"
 
 GCP_FORNO_EUROPE_WEST1_GCP_PROJECT_NAME=celo-testnet-production
 GCP_FORNO_EUROPE_WEST1_GCP_ZONE=europe-west1-b
@@ -201,7 +205,7 @@ GCP_FORNO_EUROPE_WEST1_FULL_NODES_STATIC_NODES_FILE_SUFFIX=gcp-europe-west1
 GCP_FORNO_EUROPE_WEST1_FULL_NODES_RPC_API_METHODS="eth,net,rpc,web3"
 GCP_FORNO_EUROPE_WEST1_FULL_NODES_GETH_GC_MODE="full"
 GCP_FORNO_EUROPE_WEST1_FULL_NODES_USE_GSTORAGE_DATA=true
-
+GCP_FORNO_EUROPE_WEST1_FULL_NODES_WS_PORT="8546"
 
 GCP_FORNO_SOUTHAMERICA_EAST1_GCP_PROJECT_NAME=celo-testnet-production
 GCP_FORNO_SOUTHAMERICA_EAST1_GCP_ZONE=southamerica-east1-a
@@ -217,19 +221,21 @@ GCP_FORNO_SOUTHAMERICA_EAST1_FULL_NODES_STATIC_NODES_FILE_SUFFIX=gcp-southameric
 GCP_FORNO_SOUTHAMERICA_EAST1_FULL_NODES_RPC_API_METHODS="eth,net,rpc,web3"
 GCP_FORNO_SOUTHAMERICA_EAST1_FULL_NODES_GETH_GC_MODE="full"
 GCP_FORNO_SOUTHAMERICA_EAST1_FULL_NODES_USE_GSTORAGE_DATA=true
-
+GCP_FORNO_SOUTHAMERICA_EAST1_FULL_NODES_WS_PORT="8546"
 
 # ---- Private txnodes context ----
 
+# CPU and memory requests can be customized in packages/helm-charts/celo-fullnode/rc1-gcp-private-txnodes-values.yaml
 GCP_PRIVATE_TXNODES_GCP_PROJECT_NAME=celo-testnet-production
-GCP_PRIVATE_TXNODES_GCP_ZONE=us-west1-a 
+GCP_PRIVATE_TXNODES_GCP_ZONE=us-west1-a
 GCP_PRIVATE_TXNODES_KUBERNETES_CLUSTER_NAME=mainnet
 GCP_PRIVATE_TXNODES_FULL_NODES_COUNT=4
 GCP_PRIVATE_TXNODES_FULL_NODES_ROLLING_UPDATE_PARTITION=0
 GCP_PRIVATE_TXNODES_FULL_NODES_DISK_SIZE=300
 GCP_PRIVATE_TXNODES_FULL_NODES_RPC_API_METHODS="eth,net,rpc,web3,txpool,debug"
 GCP_PRIVATE_TXNODES_FULL_NODES_GETH_GC_MODE="archive"
 GCP_PRIVATE_TXNODES_FULL_NODES_USE_GSTORAGE_DATA=false
+GCP_PRIVATE_TXNODES_FULL_NODES_WS_PORT="8545"
 
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-f4a55e143932ea559cf4bcbd9bcccc14da43d6ed"
@@ -241,7 +247,7 @@ TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-f4a5
 # EKSPORTISTO_SUFFIX='8'
 
 EKSPORTISTO_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/eksportisto"
-EKSPORTISTO_DOCKER_IMAGE_TAG="d8790cff0a91fbed82009eaccec232548a91faf4"
+EKSPORTISTO_DOCKER_IMAGE_TAG="b314442c7d86c8733088466b2eba67fcfe17a455"
 EKSPORTISTO_SUFFIX='11'
 
 ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/celo-monorepo"
@@ -462,7 +468,7 @@ AZURE_ODIS_BRAZILSOUTH_A_PROM_SIDECAR_GCP_REGION=southamerica-east1-a
 # --- Komenci ---
 
 KOMENCI_DOCKER_IMAGE_REPOSITORY="celotestnet.azurecr.io/komenci/komenci"
-KOMENCI_DOCKER_IMAGE_TAG="f1119833e7ad90ad741b2b509a1ad4ac647799ff"
+KOMENCI_DOCKER_IMAGE_TAG="e220c5610e196a1d674edde0f24be0d5eca30c00"
 
 AZURE_KOMENCI_SOUTHBR_AZURE_KUBERNETES_RESOURCE_GROUP=mainnet-komenci-brazil
 AZURE_KOMENCI_SOUTHBR_KUBERNETES_CLUSTER_NAME=mainnet-komenci-brazil
@@ -488,6 +494,16 @@ AZURE_SEA_KOMENCI_DB_PORT=5432
 AZURE_SEA_KOMENCI_DB_USERNAME=postgres@mainnet-komenci-southeastasia
 AZURE_SEA_KOMENCI_DB_PASSWORD_VAULT_NAME=mainnet-komenci-sea
 
+AZURE_KOMENCI_SOUTHBR_KOMENCI_REWARD_SERVICE_DB_HOST=mainnet-komenci-brazil.postgres.database.azure.com
+AZURE_KOMENCI_SOUTHBR_KOMENCI_REWARD_SERVICE_DB_PORT=5432
+AZURE_KOMENCI_SOUTHBR_KOMENCI_REWARD_SERVICE_DB_USERNAME=postgres@mainnet-komenci-brazil
+AZURE_KOMENCI_SOUTHBR_KOMENCI_REWARD_SERVICE_DB_PASSWORD_VAULT_NAME=mainnet-komenci-brazil
+
+AZURE_KOMENCI_SEA_KOMENCI_REWARD_SERVICE_DB_HOST=mainnet-komenci-brazil.postgres.database.azure.com
+AZURE_KOMENCI_SEA_KOMENCI_REWARD_SERVICE_DB_PORT=5432
+AZURE_KOMENCI_SEA_KOMENCI_REWARD_SERVICE_DB_USERNAME=postgres@mainnet-komenci-brazil
+AZURE_KOMENCI_SEA_KOMENCI_REWARD_SERVICE_DB_PASSWORD_VAULT_NAME=mainnet-komenci-brazil
+
 # App Secrets
 AZURE_KOMENCI_SOUTHBR_KOMENCI_APP_SECRETS_VAULT_NAME=mainnet-komenci-brazil
 AZURE_KOMENCI_SEA_KOMENCI_APP_SECRETS_VAULT_NAME=mainnet-komenci-sea
@@ -502,13 +518,20 @@ AZURE_KOMENCI_SEA_KOMENCI_RULE_CONFIG_CAPTCHA_BYPASS_ENABLED=false
 # <address>:<key vault name>:<resource group (optional)>
 AZURE_KOMENCI_SOUTHBR_KOMENCI_ADDRESS_AZURE_KEY_VAULTS=0x21888ae301658cdff7ce8c33cdf83a330a5e6273:mainnet-relayer0,0x1438128a2dcc645f0b9706350c1f5dad04845fe6:mainnet-relayer1,0x1e36bf42272a0693eba69332a6f623ce37694a27:mainnet-relayer2,0xd5afaaa7256c9eb86376c4214635dd56dffbd3a8:mainnet-relayer3,0xb09eba8bc1c8bedadd634a8219c0b09042170903:mainnet-relayer4
 AZURE_KOMENCI_SEA_KOMENCI_ADDRESS_AZURE_KEY_VAULTS=0x85a1e716608a84f455d7e07befb76c9b540ac040:mainnet-relayer5,0x2a094e77acf3faebb63279eb60e26d144b9048a2:mainnet-relayer6,0x2f23f9a8f68294a9d6b479c3dbe3dff4de510ced:mainnet-relayer7,0x3db3150c1267d3adeb7f960f3eef11c1dd47a38b:mainnet-relayer8,0xe170915ce32bb8e2ce2a4fcd9113e5298a2e10d2:mainnet-relayer9
+AZURE_KOMENCI_SOUTHBR_KOMENCI_CELOLABS_REWARDS_ADDRESS_AZURE_KEY_VAULTS=0x198e0D8601AB509ABf1B0B99Fd8f234583Ef1309:mainnet-komenci-rewards0
+AZURE_KOMENCI_SEA_KOMENCI_CELOLABS_REWARDS_ADDRESS_AZURE_KEY_VAULTS=0xbDD68B64e288171B37F01346042BEe6Eb7dFAE4f:mainnet-komenci-rewards1
+
+# Celo Rewards
+AZURE_KOMENCI_SOUTHBR_KOMENCI_REWARD_SERVICE_INSTANCE_COUNT=1
+AZURE_KOMENCI_SEA_KOMENCI_REWARD_SERVICE_INSTANCE_COUNT=1
+KOMENCI_SHOULD_SEND_REWARDS=false
 
 # Network
 AZURE_KOMENCI_SOUTHBR_KOMENCI_NETWORK=rc1
 AZURE_KOMENCI_SEA_KOMENCI_NETWORK=rc1
 
 # For WalletConnect relay
-WALLET_CONNECT_IMAGE_REPOSITORY = 'us.gcr.io/celo-testnet/walletconnect'
-WALLET_CONNECT_IMAGE_TAG = '1472bcaad57e3746498f7a661c42ff5cf9acaf5a'
-WALLET_CONNECT_REDIS_CLUSTER_ENABLED = false
-WALLET_CONNECT_REDIS_CLUSTER_USEPASSWORD = false
+WALLET_CONNECT_IMAGE_REPOSITORY='us.gcr.io/celo-testnet/walletconnect'
+WALLET_CONNECT_IMAGE_TAG='1472bcaad57e3746498f7a661c42ff5cf9acaf5a'
+WALLET_CONNECT_REDIS_CLUSTER_ENABLED=false
+WALLET_CONNECT_REDIS_CLUSTER_USEPASSWORD=false