Skip to content

Commit

Permalink
Remove Komenci support
Browse files Browse the repository at this point in the history
  • Loading branch information
@lvpeschke
lvpeschke committed Sep 13, 2023
1 parent 37e1e64 commit 6895322
Show file tree
Hide file tree
Showing 29 changed files with 2 additions and 1,833 deletions.
68 changes: 1 addition & 67 deletions .env.alfajores
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ CLUSTER_DOMAIN_NAME="celo-testnet"

TESTNET_PROJECT_NAME="celo-testnet-production"

AZURE_KOMENCI_EASTUS_AZURE_SUBSCRIPTION_ID=97e2b592-255b-4f92-bce0-127257163c36
AZURE_KOMENCI_EASTUS_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
AZURE_KOMENCI_EASTUS_AZURE_REGION_NAME=eus

AZURE_KOMENCI_WESTEU_AZURE_SUBSCRIPTION_ID=97e2b592-255b-4f92-bce0-127257163c36
AZURE_KOMENCI_WESTEU_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
AZURE_KOMENCI_WESTEU_AZURE_REGION_NAME=weu

BLOCKSCOUT_DOCKER_IMAGE_TAG="0362f9f4d1d4842f27adb634d628f969f53c046d"
# Assign a new value everytime you redeploy blockscout. Or else the deployment will fail due to the
# existing database.
Expand Down Expand Up @@ -133,7 +125,7 @@ MOBILE_WALLET_PLAYSTORE_LINK="https://play.google.com/apps/internaltest/47009904

# each context should have its own environment variables, generally of the form
# <context in all caps and underscores>_*
CONTEXTS=azure-komenci-eastus,azure-komenci-westeu,azure-oracle-centralus,azure-odis-eastus-1,azure-odis-eastus-2,azure-odis-eastus-3
CONTEXTS=azure-oracle-centralus,azure-odis-eastus-1,azure-odis-eastus-2,azure-odis-eastus-3

# --- ODIS ---

Expand Down Expand Up @@ -244,64 +236,6 @@ AZURE_ODIS_EASTUS_3_PROM_SIDECAR_GCP_PROJECT=celo-phone-number-privacy
AZURE_ODIS_EASTUS_3_PROM_SIDECAR_GCP_REGION=us-east1
AZURE_ODIS_EASTUS_3_PROM_SIDECAR_DISABLED="true"

# --- Komenci ---

KOMENCI_DOCKER_IMAGE_REPOSITORY="celotestnet.azurecr.io/komenci/komenci"
KOMENCI_DOCKER_IMAGE_TAG="08081d2d276a6fd0d420805f3bbe3866e866a63a"

AZURE_KOMENCI_EASTUS_AZURE_KUBERNETES_RESOURCE_GROUP=staging-komenci-eastus
AZURE_KOMENCI_EASTUS_KUBERNETES_CLUSTER_NAME=staging-komenci-eastus
AZURE_KOMENCI_EASTUS_REGION_NAME=eus

AZURE_KOMENCI_EASTUS_KOMENCI_DB_HOST=staging-komenci-eastus.postgres.database.azure.com
AZURE_KOMENCI_EASTUS_KOMENCI_DB_PORT=5432
AZURE_KOMENCI_EASTUS_KOMENCI_DB_USERNAME=postgres@staging-komenci-eastus
AZURE_KOMENCI_EASTUS_KOMENCI_DB_PASSWORD_VAULT_NAME=staging-komenci-eus

AZURE_KOMENCI_WESTEU_AZURE_KUBERNETES_RESOURCE_GROUP=staging-komenci-weu
AZURE_KOMENCI_WESTEU_KUBERNETES_CLUSTER_NAME=staging-komenci-weu
AZURE_KOMENCI_WESTEU_REGION_NAME=weu

AZURE_KOMENCI_WESTEU_KOMENCI_DB_HOST=staging-komenci-weu.postgres.database.azure.com
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

# Rule config > Captcha
KOMENCI_RULE_CONFIG_CAPTCHA_BYPASS_TOKEN=special-captcha-bypass-token
AZURE_KOMENCI_EASTUS_KOMENCI_RULE_CONFIG_CAPTCHA_BYPASS_ENABLED=true
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
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
AZURE_KOMENCI_WESTEU_KOMENCI_NETWORK=alfajores

# For WalletConnect relay
WALLET_CONNECT_IMAGE_REPOSITORY = 'us.gcr.io/celo-testnet/walletconnect'
WALLET_CONNECT_IMAGE_TAG = '1472bcaad57e3746498f7a661c42ff5cf9acaf5a'
Expand Down
74 changes: 1 addition & 73 deletions .env.rc1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@ CLUSTER_DOMAIN_NAME="celo-testnet"

TESTNET_PROJECT_NAME="celo-testnet-production"

AZURE_KOMENCI_SOUTHBR_AZURE_SUBSCRIPTION_ID=7a6f5f20-bd43-4267-8c35-a734efca140c
AZURE_KOMENCI_SOUTHBR_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
AZURE_KOMENCI_SOUTHBR_AZURE_REGION_NAME=br
AZURE_KOMENCI_SEA_AZURE_SUBSCRIPTION_ID=7a6f5f20-bd43-4267-8c35-a734efca140c
AZURE_KOMENCI_SEA_AZURE_TENANT_ID=7cb7628a-e37c-4afb-8332-2029e418980e
AZURE_KOMENCI_SEA_AZURE_REGION_NAME=sea

BLOCKSCOUT_DOCKER_IMAGE_TAG="0362f9f4d1d4842f27adb634d628f969f53c046d"
BLOCKSCOUT_DB_SUFFIX=3

Expand Down Expand Up @@ -66,7 +59,7 @@ GSTORAGE_DATA_BUCKET=celo-chain-backup/mainnet
# A list of every valid context. Must start with one of: gcp,aws,azure
# each context should have its own environment variables, generally of the form
# <context in all caps and underscores>_*
CONTEXTS=azure-oracle-westus,azure-oracle-westeurope,azure-oracle-eastus2,gcp-forno-us-west1,gcp-forno-us-east1,gcp-forno-asia-east1,gcp-forno-europe-west1,gcp-forno-southamerica-east1,azure-komenci-southbr,azure-komenci-sea,azure-odis-westus2-a,azure-odis-eastasia-a,azure-odis-westeurope-a,azure-odis-brazilsouth-a,gcp-private-txnodes
CONTEXTS=azure-oracle-westus,azure-oracle-westeurope,azure-oracle-eastus2,gcp-forno-us-west1,gcp-forno-us-east1,gcp-forno-asia-east1,gcp-forno-europe-west1,gcp-forno-southamerica-east1,azure-odis-westus2-a,azure-odis-eastasia-a,azure-odis-westeurope-a,azure-odis-brazilsouth-a,gcp-private-txnodes

# ---- Oracle Contexts ----

Expand Down Expand Up @@ -469,71 +462,6 @@ AZURE_ODIS_BRAZILSOUTH_A_PROM_SIDECAR_GCP_PROJECT=celo-pgpnp-mainnet
AZURE_ODIS_BRAZILSOUTH_A_PROM_SIDECAR_GCP_REGION=southamerica-east1-a
AZURE_ODIS_BRAZILSOUTH_A_PROM_SIDECAR_DISABLED="true"

# --- Komenci ---

KOMENCI_DOCKER_IMAGE_REPOSITORY="celotestnet.azurecr.io/komenci/komenci"
KOMENCI_DOCKER_IMAGE_TAG="e220c5610e196a1d674edde0f24be0d5eca30c00"

AZURE_KOMENCI_SOUTHBR_AZURE_KUBERNETES_RESOURCE_GROUP=mainnet-komenci-brazil
AZURE_KOMENCI_SOUTHBR_KUBERNETES_CLUSTER_NAME=mainnet-komenci-brazil

AZURE_KOMENCI_SOUTHBR_KOMENCI_DB_HOST=mainnet-komenci-brazil.postgres.database.azure.com
AZURE_KOMENCI_SOUTHBR_KOMENCI_DB_PORT=5432
AZURE_KOMENCI_SOUTHBR_KOMENCI_DB_USERNAME=postgres@mainnet-komenci-brazil
AZURE_KOMENCI_SOUTHBR_KOMENCI_DB_PASSWORD_VAULT_NAME=mainnet-komenci-brazil

AZURE_KOMENCI_SEA_AZURE_KUBERNETES_RESOURCE_GROUP=mainnet-komenci-southeastasia
AZURE_KOMENCI_SEA_KUBERNETES_CLUSTER_NAME=mainnet-komenci-southeastasia

AZURE_KOMENCI_SEA_KOMENCI_DB_HOST=mainnet-komenci-southeastasia.postgres.database.azure.com
AZURE_KOMENCI_SEA_KOMENCI_DB_PORT=5432
AZURE_KOMENCI_SEA_KOMENCI_DB_USERNAME=postgres@mainnet-komenci-southeastasia
AZURE_KOMENCI_SEA_KOMENCI_DB_PASSWORD_VAULT_NAME=mainnet-komenci-sea

AZURE_SEA_KOMENCI_AZURE_KUBERNETES_RESOURCE_GROUP=mainnet-komenci-southeastasia
AZURE_SEA_KOMENCI_KUBERNETES_CLUSTER_NAME=mainnet-komenci-southeastasia

AZURE_SEA_KOMENCI_DB_HOST=mainnet-komenci-southeastasia.postgres.database.azure.com
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

# Rule config > Captcha
KOMENCI_RULE_CONFIG_CAPTCHA_BYPASS_TOKEN=special-captcha-bypass-token
AZURE_KOMENCI_SOUTHBR_KOMENCI_RULE_CONFIG_CAPTCHA_BYPASS_ENABLED=false
AZURE_KOMENCI_SEA_KOMENCI_RULE_CONFIG_CAPTCHA_BYPASS_ENABLED=false

# Relayer identities
# Format should be a comma-separated sequence of:
# <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'
Expand Down
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ packages/docs/_book/
# old packages
packages/reserve-site/*
packages/blockchain-api/*
packages/komencikit/*
packages/mobile/*
packages/faucet/*
packages/moonpay-auth/*
Expand Down
16 changes: 0 additions & 16 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,6 @@
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"port": 9229
},
{
"name": "Debug Komencikit Tests",
"type": "node",
"request": "launch",
"runtimeArgs": [
"--inspect-brk",
"${workspaceRoot}/node_modules/.bin/jest",
"--rootDir",
"${workspaceFolder}/packages/komencikit",
"--runInBand",
"${workspaceFolder}/packages/komencikit/src/kit.spec.ts",
],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"port": 9229
}
]
}
18 changes: 0 additions & 18 deletions packages/celotool/src/cmds/deploy/destroy/komenci.ts
View file

This file was deleted.

29 changes: 0 additions & 29 deletions packages/celotool/src/cmds/deploy/initial/komenci.ts
View file

This file was deleted.

29 changes: 0 additions & 29 deletions packages/celotool/src/cmds/deploy/upgrade/komenci.ts
View file

This file was deleted.

21 changes: 0 additions & 21 deletions packages/celotool/src/lib/env-utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,6 @@ export enum envVar {
GRAFANA_LOCAL_OAUTH2_CLIENT_SECRET = 'GRAFANA_LOCAL_OAUTH2_CLIENT_SECRET',
IN_MEMORY_DISCOVERY_TABLE = 'IN_MEMORY_DISCOVERY_TABLE',
ISTANBUL_REQUEST_TIMEOUT_MS = 'ISTANBUL_REQUEST_TIMEOUT_MS',
KOMENCI_DOCKER_IMAGE_REPOSITORY = 'KOMENCI_DOCKER_IMAGE_REPOSITORY',
KOMENCI_DOCKER_IMAGE_TAG = 'KOMENCI_DOCKER_IMAGE_TAG',
KOMENCI_RULE_CONFIG_CAPTCHA_BYPASS_TOKEN = 'KOMENCI_RULE_CONFIG_CAPTCHA_BYPASS_TOKEN',
KOMENCI_SHOULD_SEND_REWARDS = 'KOMENCI_SHOULD_SEND_REWARDS',
KOMENCI_UNUSED_KOMENCI_ADDRESSES = 'KOMENCI_UNUSED_KOMENCI_ADDRESSES',
KUBECONFIG = 'KUBECONFIG',
KUBERNETES_CLUSTER_NAME = 'KUBERNETES_CLUSTER_NAME',
KUBERNETES_CLUSTER_ZONE = 'KUBERNETES_CLUSTER_ZONE',
Expand Down Expand Up @@ -180,22 +175,6 @@ export enum DynamicEnvVar {
GCP_PROJECT_NAME = '{{ context }}_GCP_PROJECT_NAME',
GCP_ZONE = '{{ context }}_GCP_ZONE',
KUBERNETES_CLUSTER_NAME = '{{ context }}_KUBERNETES_CLUSTER_NAME',
KOMENCI_ADDRESS_AZURE_KEY_VAULTS = '{{ context }}_KOMENCI_ADDRESS_AZURE_KEY_VAULTS',
KOMENCI_ADDRESSES_FROM_MNEMONIC_COUNT = '{{ context }}_KOMENCI_ADDRESSES_FROM_MNEMONIC_COUNT',
KOMENCI_CELOLABS_REWARDS_ADDRESS_AZURE_KEY_VAULTS = '{{ context }}_KOMENCI_CELOLABS_REWARDS_ADDRESS_AZURE_KEY_VAULTS',
KOMENCI_FOUNDATION_REWARDS_ADDRESS_AZURE_KEY_VAULTS = '{{ context }}_KOMENCI_FOUNDATION_REWARDS_ADDRESS_AZURE_KEY_VAULTS',
KOMENCI_REWARD_SERVICE_INSTANCE_COUNT = '{{ context }}_KOMENCI_REWARD_SERVICE_INSTANCE_COUNT',
KOMENCI_DB_HOST = '{{ context }}_KOMENCI_DB_HOST',
KOMENCI_DB_PORT = '{{ context }}_KOMENCI_DB_PORT',
KOMENCI_DB_USERNAME = '{{ context }}_KOMENCI_DB_USERNAME',
KOMENCI_DB_PASSWORD_VAULT_NAME = '{{ context }}_KOMENCI_DB_PASSWORD_VAULT_NAME',
KOMENCI_REWARD_SERVICE_DB_HOST = '{{ context }}_KOMENCI_REWARD_SERVICE_DB_HOST',
KOMENCI_REWARD_SERVICE_DB_PORT = '{{ context }}_KOMENCI_REWARD_SERVICE_DB_PORT',
KOMENCI_REWARD_SERVICE_DB_USERNAME = '{{ context }}_KOMENCI_REWARD_SERVICE_DB_USERNAME',
KOMENCI_REWARD_SERVICE_DB_PASSWORD_VAULT_NAME = '{{ context }}_KOMENCI_REWARD_SERVICE_DB_PASSWORD_VAULT_NAME',
KOMENCI_NETWORK = '{{ context }}_KOMENCI_NETWORK',
KOMENCI_APP_SECRETS_VAULT_NAME = '{{ context }}_KOMENCI_APP_SECRETS_VAULT_NAME',
KOMENCI_RULE_CONFIG_CAPTCHA_BYPASS_ENABLED = '{{ context }}_KOMENCI_RULE_CONFIG_CAPTCHA_BYPASS_ENABLED',
ORACLE_ADDRESS_AWS_KEY_ALIASES = '{{ context }}_{{ currencyPair }}_ORACLE_ADDRESS_AWS_KEY_ALIASES',
ORACLE_ADDRESS_AZURE_KEY_VAULTS = '{{ context }}_{{ currencyPair }}_ORACLE_ADDRESS_AZURE_KEY_VAULTS',
ORACLE_ADDRESSES_FROM_MNEMONIC_COUNT = '{{ context }}_{{ currencyPair}}_ORACLE_ADDRESSES_FROM_MNEMONIC_COUNT',
Expand Down
Loading

0 comments on commit 6895322

Please sign in to comment.