refactor: cvat env files

Author: dnechay

docker-setup/env-files/.env.compose renamed to docker-setup/.env.compose

@@ -16,9 +16,6 @@ JOB_LAUNCHER_CLIENT_EXPOSED_PORT=3002
 FORTUNE_CLIENT_EXPOSED_PORT=3003
 
 RPC_URL_POLYGON_AMOY=https://rpc-amoy.polygon.technology
-# Oracle addresses
-CVAT_EXCHANGE_ORACLE_ADDRESS=replace_me
-CVAT_RECORDING_ORACLE_ADDRESS=replace_me
 
 # Might be empty
 SUBGRAPH_API_KEY=

docker-setup/Makefile

@@ -1,18 +1,8 @@
-.PHONY: copy-env-files \
-	infra-up infra-stop build-services \
-	services-up services-stop
+.PHONY: infra-up infra-stop \
+	build-services services-up services-stop
 
 DOCKER_PARALLEL ?= 4
 
-copy-env-files:
-# Copying .env file for compose itself 
-	@cp ./env-files/.env.compose .env.compose.local
-# Copying .env files for cvat services
-	@cp ./env-files/.env.exchange-oracle-cvat ./.env.exchange-oracle-cvat.local
-	@cp ./env-files/.env.recording-oracle-cvat ./.env.recording-oracle-cvat.local
-# Restore original files
-	@git checkout . > /dev/null 2>&1
-
 infra-up:
 	docker-compose --env-file .env.compose.local up -d postgres redis minio minio-client
 

docker-setup/docker-compose.yml

@@ -23,7 +23,7 @@ x-hardcoded-vars:
 x-general-env-variables:
   # GENERAL VARS
   subgraph_api_key: &subgraph_api_key ${SUBGRAPH_API_KEY}
-  rpc_url_polygon_amoy: &rpc_url_polygon_amoy ${RPC_URL_POLYGON_AMOY:-}
+  rpc_url_polygon_amoy: &rpc_url_polygon_amoy ${RPC_URL_POLYGON_AMOY:?}
   # POSTGRES VARS
   postgres_user: &postgres_user ${POSTGRES_USER:-default}
   postgres_password: &postgres_password ${POSTGRES_PASSWORD:-qwerty}
@@ -41,9 +41,6 @@ x-general-env-variables:
   bucket_name_cvat_exc_o: &bucket_name_cvat_exc_o ${BUCKET_NAME_CVAT_EXCHANGE_ORACLE:-cvat-exchange-oracle}
   bucket_name_cvat_rec_o: &bucket_name_cvat_rec_o ${BUCKET_NAME_CVAT_RECORDING_ORACLE:-cvat-recording-oracle}
   bucket_name_fortune: &bucket_name_fortune ${BUCKEN_NAME_FORTUNE:-fortune}
-  # WEB3 ADDRESSES
-  cvat_exchange_oracle_address: &cvat_exchange_oracle_address ${CVAT_EXCHANGE_ORACLE_ADDRESS:?}
-  cvat_recording_oracle_address: &cvat_recording_oracle_address ${CVAT_RECORDING_ORACLE_ADDRESS:?}
   # OTHER
   backend_apps_internal_port: &backend_apps_internal_port ${BACKEND_APPS_INTERNAL_PORT:?}
   cvat_oracle_storage_endpoint: &cvat_oracle_storage_endpoint minio:${MINIO_PORT:?}
@@ -57,6 +54,8 @@ x-service-env-vars-groups:
     REDIS_PORT: *redis_port
   nodejs_app_vars: &nodejs_app_vars
     NODE_ENV: *node_env
+    SUBGRAPH_API_KEY: *subgraph_api_key
+    RPC_URL_POLYGON_AMOY: *rpc_url_polygon_amoy
   nodejs_app_postgres_vars: &nodejs_app_postgres_vars
     <<: *postgres_auth_vars
     POSTGRES_HOST: *postgres_host
@@ -271,6 +270,7 @@ services:
       PORT: *backend_apps_internal_port
       REDIS_DB: 1
       REPUTATION_ORACLE_URL: http://reputation-oracle:${BACKEND_APPS_INTERNAL_PORT:?}
+      RPC_URL: *rpc_url_polygon_amoy
 
   human-app-client:
     container_name: human-app-client
@@ -326,7 +326,6 @@ services:
       - name: server_port
         target: *backend_apps_internal_port
         published: ${EXCHANGE_ORACLE_CVAT_EXPOSED_PORT:?}
-    env_file: ./.env.exchange-oracle-cvat.local
     environment:
       HOST: *all_interfaces_ip
       PORT: *backend_apps_internal_port
@@ -339,12 +338,8 @@ services:
       REDIS_DB: 2
       PG_DB: exchange-oracle-cvat
       POLYGON_AMOY_RPC_API_URL: *rpc_url_polygon_amoy
-      POLYGON_AMOY_ADDR: *cvat_exchange_oracle_address
       STORAGE_BUCKET_NAME: *bucket_name_cvat_exc_o
       CVAT_INCOMING_WEBHOOKS_URL: "http://exchange-oracle.app:${BACKEND_APPS_INTERNAL_PORT:?}/cvat-webhook"
-      LOCALHOST_RECORDING_ORACLE_URL: "http://recording-oracle-cvat:${BACKEND_APPS_INTERNAL_PORT:?}/webhook"
-      LOCALHOST_JOB_LAUNCHER_URL: "http://job-launcher:${BACKEND_APPS_INTERNAL_PORT:?}/webhook"
-      LOCALHOST_RECORDING_ORACLE_ADDRESS: *cvat_recording_oracle_address
       ENABLE_CUSTOM_CLOUD_HOST: yes
       # User for KV store setup
       SERVER_URL: http://exchange-oracle-cvat:${BACKEND_APPS_INTERNAL_PORT:?}
@@ -375,7 +370,6 @@ services:
       - name: server_port
         target: *backend_apps_internal_port
         published: ${RECORDING_ORACLE_CVAT_EXPOSED_PORT:?}
-    env_file: ./.env.recording-oracle-cvat.local
     environment:
       HOST: *all_interfaces_ip
       PORT: *backend_apps_internal_port
@@ -386,18 +380,9 @@ services:
       ]
       PG_DB: recording-oracle-cvat
       POLYGON_AMOY_RPC_API_URL: *rpc_url_polygon_amoy
-      POLYGON_AMOY_ADDR: *cvat_recording_oracle_address
       STORAGE_RESULTS_BUCKET_NAME: *bucket_name_cvat_rec_o
       STORAGE_USE_PATH_STYLE: "true"
-      EXCHANGE_ORACLE_STORAGE_PROVIDER: *cvat_oracle_storage_provider
-      EXCHANGE_ORACLE_STORAGE_ENDPOINT_URL: *cvat_oracle_storage_endpoint
-      EXCHANGE_ORACLE_STORAGE_ACCESS_KEY: *minio_services_access_key
-      EXCHANGE_ORACLE_STORAGE_SECRET_KEY: *minio_services_secret_key
-      EXCHANGE_ORACLE_STORAGE_RESULTS_BUCKET_NAME: *bucket_name_cvat_exc_o
-      EXCHANGE_ORACLE_STORAGE_USE_SSL: 'false'
-      LOCALHOST_EXCHANGE_ORACLE_URL: "http://exchange-oracle-cvat:${BACKEND_APPS_INTERNAL_PORT:?}/webhook"
-      LOCALHOST_REPUTATION_ORACLE_URL: "http://reputation-oracle:${BACKEND_APPS_INTERNAL_PORT:?}/webhook"
-      LOCALHOST_EXCHANGE_ORACLE_ADDRESS: *cvat_exchange_oracle_address
+      ENABLE_CUSTOM_CLOUD_HOST: "yes"
       # User for KV store setup
       SERVER_URL: http://recording-oracle-cvat:${BACKEND_APPS_INTERNAL_PORT:?}
 

docker-setup/env-files/.env.exchange-oracle-cvat

@@ -0,0 +1,93 @@
+# General
+HOST=0.0.0.0
+PORT=5004
+
+# Postgres config
+PG_HOST=0.0.0.0
+PG_PORT=5433
+PG_USER=default
+PG_PASSWORD=qwerty
+PG_DB=exchange-oracle-cvat
+
+# Redis config
+REDIS_HOST=0.0.0.0
+REDIS_PORT=6380
+REDIS_DB=2
+
+# Storage Config (S3/GCS/Minio)
+STORAGE_PROVIDER=aws
+STORAGE_ENDPOINT_URL=minio:9000
+STORAGE_ACCESS_KEY=human-oracle
+STORAGE_SECRET_KEY=human-oracle-s3-secret
+STORAGE_BUCKET_NAME=cvat-exchange-oracle
+STORAGE_USE_SSL=false
+
+# Polygon Amoy Config
+POLYGON_AMOY_RPC_API_URL=https://rpc-amoy.polygon.technology
+POLYGON_AMOY_PRIVATE_KEY=replace_me
+POLYGON_AMOY_ADDR=replace_me
+
+# Cron Config
+PROCESS_JOB_LAUNCHER_WEBHOOKS_INT=10
+PROCESS_RECORDING_ORACLE_WEBHOOKS_INT=10
+TRACK_COMPLETED_PROJECTS_INT=10
+TRACK_COMPLETED_TASKS_INT=10
+TRACK_COMPLETED_ESCROWS_INT=10
+TRACK_CREATING_TASKS_INT=10
+TRACK_ASSIGNMENTS_INT=10
+TRACK_ESCROW_CREATION_INT=10
+TRACK_ESCROW_VALIDATIONS_INT=10
+
+# CVAT Config
+CVAT_URL=http://cvat-lb:8080
+CVAT_ADMIN=human-protocol
+CVAT_ADMIN_PASS=qwe123qwe123Q!
+CVAT_ORG_SLUG=HumanAppLocal
+
+# Features
+ENABLE_CUSTOM_CLOUD_HOST="yes"
+
+# Core
+DEFAULT_ASSIGNMENT_TIME=600
+
+# HUMAN App config
+HUMAN_APP_JWT_KEY="-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEkPekD3q96LHt4IfvY1UY1YukTeEf
+K+XryPXhU57nKuhZXBPRrQ+lMDeFpYpHWpGqA/K576n+rDvjbBgHfQiHKg==
+-----END PUBLIC KEY-----"
+
+# Encryption
+PGP_PRIVATE_KEY="-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+lIYEZ4+21RYJKwYBBAHaRw8BAQdAgnSCXFMaftE221PbAvaliZTq+G5rTsAGjIpd
+e8YOMBH+BwMCFUpbjvBTcm3/4iq8P/neJEdtL2uJ/OL8jNIOJ88yC7iokBzUZ+e6
+lhbmxybD+dxjuZf16iXzDjYYI2R/VnmKt4chtNqrt0X+DBx2a2DjfLQ/Y3ZhdC1l
+eGNoYW5nZS1vcmFjbGVAbG9jYWwuYXBwIDxjdmF0LWV4Y2hhbmdlLW9yYWNsZUBs
+b2NhbC5hcHA+iJMEExYKADsWIQSOUPmSUTqBxtsdHRxJkcIKPK7cJAUCZ4+21QIb
+AwULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRBJkcIKPK7cJPhsAQCzUx0u
+Sv+TkPWyn2zauMcMnffwzkTdC6v0nh3lsm6oewD/SnZVrFqIOoeBlUM57val6JwG
+YyKKHt/mjISs2Dqo8wCciwRnj7bVEgorBgEEAZdVAQUBAQdAJjhRu8SX7Ryn+rYY
+AkVxrBPI3GXQoWFSO/B4HopIJi0DAQgH/gcDAhXjA3yGYNM5/+uG9U29B/vFW2So
+v7A4eMI+J+8/K8RObR2tTM3KEC7dXJKR9YTYqIVR10AwI4iR6XplSqjP2Un6jMlI
+pSMN2l0vuJpxdzSIeAQYFgoAIBYhBI5Q+ZJROoHG2x0dHEmRwgo8rtwkBQJnj7bV
+AhsMAAoJEEmRwgo8rtwkoLYBAJMZnNZqp+7uXomSguiPujFwgMobR1jXFsOASZF8
+HPLwAQD6uUWeuPdHXen+STls/0g4MI2jn2PwtAT/cpQ7tsoTDA==
+=Uhu5
+-----END PGP PRIVATE KEY BLOCK-----"
+PGP_PASSPHRASE=SfR1I92e66G2OJoA
+# Put it here just to easily set up KV later; not needed to run
+PGP_PUBLIC_KEY="-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEZ4+21RYJKwYBBAHaRw8BAQdAgnSCXFMaftE221PbAvaliZTq+G5rTsAGjIpd
+e8YOMBG0P2N2YXQtZXhjaGFuZ2Utb3JhY2xlQGxvY2FsLmFwcCA8Y3ZhdC1leGNo
+YW5nZS1vcmFjbGVAbG9jYWwuYXBwPoiTBBMWCgA7FiEEjlD5klE6gcbbHR0cSZHC
+Cjyu3CQFAmePttUCGwMFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgkQSZHC
+Cjyu3CT4bAEAs1MdLkr/k5D1sp9s2rjHDJ338M5E3Qur9J4d5bJuqHsA/0p2Vaxa
+iDqHgZVDOe72peicBmMiih7f5oyErNg6qPMAuDgEZ4+21RIKKwYBBAGXVQEFAQEH
+QCY4UbvEl+0cp/q2GAJFcawTyNxl0KFhUjvweB6KSCYtAwEIB4h4BBgWCgAgFiEE
+jlD5klE6gcbbHR0cSZHCCjyu3CQFAmePttUCGwwACgkQSZHCCjyu3CSgtgEAkxmc
+1mqn7u5eiZKC6I+6MXCAyhtHWNcWw4BJkXwc8vABAPq5RZ6490dd6f5JOWz/SDgw
+jaOfY/C0BP9ylDu2yhMM
+=YMyq
+-----END PGP PUBLIC KEY BLOCK-----"
+PGP_PUBLIC_KEY_URL=http://minio:9000/cvat-exchange-oracle/pgp-public-key