From b0e8010838eb189c1d3462ee1f20c7a32b260edb Mon Sep 17 00:00:00 2001 From: phybyte Date: Mon, 10 Mar 2025 09:45:21 +0100 Subject: [PATCH 1/7] solve the OVERRIDE_PROXYVER error --- scripts/2-observing-squad.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/2-observing-squad.sh b/scripts/2-observing-squad.sh index 64c4072..23d6b2e 100644 --- a/scripts/2-observing-squad.sh +++ b/scripts/2-observing-squad.sh @@ -26,6 +26,7 @@ ObsSquad_Prepare_Environment() { sed -i "s/^ENVIRONMENT=\".*\"/ENVIRONMENT=\"$NETWORK\"/" "$config_file" sed -i "s|^CUSTOM_HOME=.*|CUSTOM_HOME=\"$HOME\"|" "$config_file" sed -i "s/^CUSTOM_USER=.*$/CUSTOM_USER=\"$USERNAME\"/" "$config_file" + sed -i "s/^OVERRIDE_PROXYVER=.*$/OVERRIDE_PROXYVER=true/" "$config_file" } From 3ab648f6be49db4a1d83f5837e500d0588ae9d71 Mon Sep 17 00:00:00 2001 From: phybyte Date: Mon, 10 Mar 2025 11:41:23 +0100 Subject: [PATCH 2/7] set tag --- scripts/2-observing-squad.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/2-observing-squad.sh b/scripts/2-observing-squad.sh index 23d6b2e..d834cc8 100644 --- a/scripts/2-observing-squad.sh +++ b/scripts/2-observing-squad.sh @@ -26,7 +26,7 @@ ObsSquad_Prepare_Environment() { sed -i "s/^ENVIRONMENT=\".*\"/ENVIRONMENT=\"$NETWORK\"/" "$config_file" sed -i "s|^CUSTOM_HOME=.*|CUSTOM_HOME=\"$HOME\"|" "$config_file" sed -i "s/^CUSTOM_USER=.*$/CUSTOM_USER=\"$USERNAME\"/" "$config_file" - sed -i "s/^OVERRIDE_PROXYVER=.*$/OVERRIDE_PROXYVER=true/" "$config_file" + sed -i "s/^OVERRIDE_PROXYVER=.*$/OVERRIDE_PROXYVER=tags/v1.1.57/" "$config_file" } From f84b9b5cb08bca521c02a184c3224d0fea9a9dfc Mon Sep 17 00:00:00 2001 From: phybyte Date: Thu, 20 Mar 2025 22:50:36 +0100 Subject: [PATCH 3/7] update exchanfe service module --- .../timescaledb.module.ts | 21 +++++++++++++++++-- .../timescaledb.module.ts | 21 +++++++++++++++++-- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/config/devnet/2-mx-exchange-service/timescaledb.module.ts b/config/devnet/2-mx-exchange-service/timescaledb.module.ts index bfe4269..9d9eeae 100644 --- a/config/devnet/2-mx-exchange-service/timescaledb.module.ts +++ b/config/devnet/2-mx-exchange-service/timescaledb.module.ts @@ -1,4 +1,3 @@ -// Overwritted by mvx-api-deployer import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { CommonAppModule } from 'src/common.app.module'; @@ -16,6 +15,15 @@ import { SumHourly, TokenBurnedWeekly, XExchangeAnalyticsEntity, + TokenCandlesMinute, + TokenCandlesHourly, + TokenCandlesDaily, + PairFirstTokenCandlesMinute, + PairFirstTokenCandlesHourly, + PairFirstTokenCandlesDaily, + PairSecondTokenCandlesMinute, + PairSecondTokenCandlesHourly, + PairSecondTokenCandlesDaily, } from './entities/timescaledb.entities'; import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils'; @@ -33,7 +41,7 @@ import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils'; username: apiConfig.getTimescaleDbUsername(), password: apiConfig.getTimescaleDbPassword(), applicationName: 'xExchangeService', - ssl: false, + ssl: true, entities: ['dist/**/*.entities.{ts,js}'], }), inject: [ApiConfigService], @@ -49,6 +57,15 @@ import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils'; PriceCandleMinute, PriceCandleHourly, PriceCandleDaily, + TokenCandlesMinute, + TokenCandlesHourly, + TokenCandlesDaily, + PairFirstTokenCandlesMinute, + PairFirstTokenCandlesHourly, + PairFirstTokenCandlesDaily, + PairSecondTokenCandlesMinute, + PairSecondTokenCandlesHourly, + PairSecondTokenCandlesDaily, ]), ], providers: [TimescaleDBQueryService, TimescaleDBWriteService], diff --git a/config/mainnet/2-mx-exchange-service/timescaledb.module.ts b/config/mainnet/2-mx-exchange-service/timescaledb.module.ts index bfe4269..9d9eeae 100644 --- a/config/mainnet/2-mx-exchange-service/timescaledb.module.ts +++ b/config/mainnet/2-mx-exchange-service/timescaledb.module.ts @@ -1,4 +1,3 @@ -// Overwritted by mvx-api-deployer import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { CommonAppModule } from 'src/common.app.module'; @@ -16,6 +15,15 @@ import { SumHourly, TokenBurnedWeekly, XExchangeAnalyticsEntity, + TokenCandlesMinute, + TokenCandlesHourly, + TokenCandlesDaily, + PairFirstTokenCandlesMinute, + PairFirstTokenCandlesHourly, + PairFirstTokenCandlesDaily, + PairSecondTokenCandlesMinute, + PairSecondTokenCandlesHourly, + PairSecondTokenCandlesDaily, } from './entities/timescaledb.entities'; import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils'; @@ -33,7 +41,7 @@ import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils'; username: apiConfig.getTimescaleDbUsername(), password: apiConfig.getTimescaleDbPassword(), applicationName: 'xExchangeService', - ssl: false, + ssl: true, entities: ['dist/**/*.entities.{ts,js}'], }), inject: [ApiConfigService], @@ -49,6 +57,15 @@ import { DynamicModuleUtils } from 'src/utils/dynamic.module.utils'; PriceCandleMinute, PriceCandleHourly, PriceCandleDaily, + TokenCandlesMinute, + TokenCandlesHourly, + TokenCandlesDaily, + PairFirstTokenCandlesMinute, + PairFirstTokenCandlesHourly, + PairFirstTokenCandlesDaily, + PairSecondTokenCandlesMinute, + PairSecondTokenCandlesHourly, + PairSecondTokenCandlesDaily, ]), ], providers: [TimescaleDBQueryService, TimescaleDBWriteService], From 7c7f20487b9ef2fc97cb0412db1854ee0a0c797f Mon Sep 17 00:00:00 2001 From: phybyte Date: Fri, 21 Mar 2025 13:03:08 +0100 Subject: [PATCH 4/7] remove basic password --- config/devnet/2-mx-exchange-service/.env | 8 ++++---- config/devnet/2-mx-exchange-service/docker-compose.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/devnet/2-mx-exchange-service/.env b/config/devnet/2-mx-exchange-service/.env index 1c2be5d..4e4e405 100644 --- a/config/devnet/2-mx-exchange-service/.env +++ b/config/devnet/2-mx-exchange-service/.env @@ -21,8 +21,8 @@ REDIS_DB=0 #MongoDB MONGODB_URL=mongodb://localhost:27018 MONGODB_DATABASE=development -MONGODB_USERNAME=admin -MONGODB_PASSWORD=admin +MONGODB_USERNAME=admin_XXX +MONGODB_PASSWORD=admin_XXX #Elasticsearch server to use for logging. Optional ELASTICSEARCH_URL="https://testnet-index.multiversx.com" @@ -69,5 +69,5 @@ AWS_TIMESTREAM_WRITE=false TIMESCALEDB_URL="localhost" TIMESCALEDB_PORT=5432 TIMESCALEDB_DATABASE="postgres" -TIMESCALEDB_USERNAME="postgres" -TIMESCALEDB_PASSWORD="postgres" \ No newline at end of file +TIMESCALEDB_USERNAME="postgres_XXX" +TIMESCALEDB_PASSWORD="postgres_XXX" \ No newline at end of file diff --git a/config/devnet/2-mx-exchange-service/docker-compose.yml b/config/devnet/2-mx-exchange-service/docker-compose.yml index 54c4f50..2bf7467 100644 --- a/config/devnet/2-mx-exchange-service/docker-compose.yml +++ b/config/devnet/2-mx-exchange-service/docker-compose.yml @@ -14,8 +14,8 @@ services: environment: HOSTNAME: rabbitmq RABBITMQ_NODENAME: rabbitmq - RABBITMQ_DEFAULT_USER: "guest" - RABBITMQ_DEFAULT_PASS: "guest" + RABBITMQ_DEFAULT_USER: "guest_XXX" + RABBITMQ_DEFAULT_PASS: "guest_XXX" volumes: - /var/lib/rabbitmq ports: @@ -25,8 +25,8 @@ services: image: mongo:latest environment: - MONGODB_DATABASE=development - - MONGO_INITDB_ROOT_USERNAME=admin - - MONGO_INITDB_ROOT_PASSWORD=admin + - MONGO_INITDB_ROOT_USERNAME=admin_XXX + - MONGO_INITDB_ROOT_PASSWORD=admin_XXX ports: - "27018:27017" timescaledb: From de130b65fa1479ae7017b7a36b56d11095ad54eb Mon Sep 17 00:00:00 2001 From: phybyte Date: Fri, 21 Mar 2025 13:13:10 +0100 Subject: [PATCH 5/7] update mainnet branch --- config/mainnet/2-mx-exchange-service/.env | 8 ++++---- config/mainnet/2-mx-exchange-service/docker-compose.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/mainnet/2-mx-exchange-service/.env b/config/mainnet/2-mx-exchange-service/.env index cd182c9..f0a20e6 100644 --- a/config/mainnet/2-mx-exchange-service/.env +++ b/config/mainnet/2-mx-exchange-service/.env @@ -21,8 +21,8 @@ REDIS_DB=0 #MongoDB MONGODB_URL=mongodb://localhost:27018 MONGODB_DATABASE=development -MONGODB_USERNAME=admin -MONGODB_PASSWORD=admin +MONGODB_USERNAME=admin_XXX +MONGODB_PASSWORD=admin_XXX #Elasticsearch server to use for logging. Optional ELASTICSEARCH_URL="https://testnet-index.multiversx.com" @@ -69,5 +69,5 @@ AWS_TIMESTREAM_WRITE=false TIMESCALEDB_URL="localhost" TIMESCALEDB_PORT=5432 TIMESCALEDB_DATABASE="postgres" -TIMESCALEDB_USERNAME="postgres" -TIMESCALEDB_PASSWORD="postgres" \ No newline at end of file +TIMESCALEDB_USERNAME="postgres_XXX" +TIMESCALEDB_PASSWORD="postgres_XXX" \ No newline at end of file diff --git a/config/mainnet/2-mx-exchange-service/docker-compose.yml b/config/mainnet/2-mx-exchange-service/docker-compose.yml index 54c4f50..2bf7467 100644 --- a/config/mainnet/2-mx-exchange-service/docker-compose.yml +++ b/config/mainnet/2-mx-exchange-service/docker-compose.yml @@ -14,8 +14,8 @@ services: environment: HOSTNAME: rabbitmq RABBITMQ_NODENAME: rabbitmq - RABBITMQ_DEFAULT_USER: "guest" - RABBITMQ_DEFAULT_PASS: "guest" + RABBITMQ_DEFAULT_USER: "guest_XXX" + RABBITMQ_DEFAULT_PASS: "guest_XXX" volumes: - /var/lib/rabbitmq ports: @@ -25,8 +25,8 @@ services: image: mongo:latest environment: - MONGODB_DATABASE=development - - MONGO_INITDB_ROOT_USERNAME=admin - - MONGO_INITDB_ROOT_PASSWORD=admin + - MONGO_INITDB_ROOT_USERNAME=admin_XXX + - MONGO_INITDB_ROOT_PASSWORD=admin_XXX ports: - "27018:27017" timescaledb: From 68f54be73a057e97358b6b6d15a4c9efe4338573 Mon Sep 17 00:00:00 2001 From: phybyte Date: Mon, 24 Mar 2025 18:17:16 +0100 Subject: [PATCH 6/7] update docker compose restart and password for mongodb --- config/devnet/1-mx-chain-es-indexer-go/docker-compose.yml | 3 ++- config/devnet/3-mx-api-service/docker-compose.yml | 2 +- config/mainnet/1-mx-chain-es-indexer-go/docker-compose.yml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/devnet/1-mx-chain-es-indexer-go/docker-compose.yml b/config/devnet/1-mx-chain-es-indexer-go/docker-compose.yml index f161bce..68446a4 100644 --- a/config/devnet/1-mx-chain-es-indexer-go/docker-compose.yml +++ b/config/devnet/1-mx-chain-es-indexer-go/docker-compose.yml @@ -6,7 +6,7 @@ services: environment: - "discovery.type=single-node" - "xpack.security.enabled=false" - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" + - "ES_JAVA_OPTS=-Xms2g -Xmx2g" ulimits: memlock: soft: -1 @@ -16,6 +16,7 @@ services: ports: - "9200:9200" - "9300:9300" + restart: unless-stopped kibana: container_name: kb-container image: docker.elastic.co/kibana/kibana:7.16.1 diff --git a/config/devnet/3-mx-api-service/docker-compose.yml b/config/devnet/3-mx-api-service/docker-compose.yml index 44035c5..911ebe2 100644 --- a/config/devnet/3-mx-api-service/docker-compose.yml +++ b/config/devnet/3-mx-api-service/docker-compose.yml @@ -20,7 +20,7 @@ services: image: mongo:latest environment: MONGO_INITDB_ROOT_USERNAME: root - MONGO_INITDB_ROOT_PASSWORD: secret + MONGO_INITDB_ROOT_PASSWORD: secret_1234 ports: - 27017:27017 diff --git a/config/mainnet/1-mx-chain-es-indexer-go/docker-compose.yml b/config/mainnet/1-mx-chain-es-indexer-go/docker-compose.yml index f161bce..68446a4 100644 --- a/config/mainnet/1-mx-chain-es-indexer-go/docker-compose.yml +++ b/config/mainnet/1-mx-chain-es-indexer-go/docker-compose.yml @@ -6,7 +6,7 @@ services: environment: - "discovery.type=single-node" - "xpack.security.enabled=false" - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" + - "ES_JAVA_OPTS=-Xms2g -Xmx2g" ulimits: memlock: soft: -1 @@ -16,6 +16,7 @@ services: ports: - "9200:9200" - "9300:9300" + restart: unless-stopped kibana: container_name: kb-container image: docker.elastic.co/kibana/kibana:7.16.1 From 152530d601aa27aff7a8b6df97a15a4b8a7d62f9 Mon Sep 17 00:00:00 2001 From: phybyte Date: Tue, 25 Mar 2025 00:10:56 +0100 Subject: [PATCH 7/7] udate env and docker compose --- config/devnet/2-mx-exchange-service/.env | 8 ++++---- .../devnet/2-mx-exchange-service/docker-compose.yml | 8 ++++---- config/mainnet/2-mx-exchange-service/.env | 8 ++++---- .../mainnet/2-mx-exchange-service/docker-compose.yml | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/config/devnet/2-mx-exchange-service/.env b/config/devnet/2-mx-exchange-service/.env index 4e4e405..1c64a90 100644 --- a/config/devnet/2-mx-exchange-service/.env +++ b/config/devnet/2-mx-exchange-service/.env @@ -21,8 +21,8 @@ REDIS_DB=0 #MongoDB MONGODB_URL=mongodb://localhost:27018 MONGODB_DATABASE=development -MONGODB_USERNAME=admin_XXX -MONGODB_PASSWORD=admin_XXX +MONGODB_USERNAME=admin_1234 +MONGODB_PASSWORD=admin_1234 #Elasticsearch server to use for logging. Optional ELASTICSEARCH_URL="https://testnet-index.multiversx.com" @@ -69,5 +69,5 @@ AWS_TIMESTREAM_WRITE=false TIMESCALEDB_URL="localhost" TIMESCALEDB_PORT=5432 TIMESCALEDB_DATABASE="postgres" -TIMESCALEDB_USERNAME="postgres_XXX" -TIMESCALEDB_PASSWORD="postgres_XXX" \ No newline at end of file +TIMESCALEDB_USERNAME="postgres_1234" +TIMESCALEDB_PASSWORD="postgres_1234" \ No newline at end of file diff --git a/config/devnet/2-mx-exchange-service/docker-compose.yml b/config/devnet/2-mx-exchange-service/docker-compose.yml index 2bf7467..e232c66 100644 --- a/config/devnet/2-mx-exchange-service/docker-compose.yml +++ b/config/devnet/2-mx-exchange-service/docker-compose.yml @@ -14,8 +14,8 @@ services: environment: HOSTNAME: rabbitmq RABBITMQ_NODENAME: rabbitmq - RABBITMQ_DEFAULT_USER: "guest_XXX" - RABBITMQ_DEFAULT_PASS: "guest_XXX" + RABBITMQ_DEFAULT_USER: "guest_1234" + RABBITMQ_DEFAULT_PASS: "guest_1234" volumes: - /var/lib/rabbitmq ports: @@ -25,8 +25,8 @@ services: image: mongo:latest environment: - MONGODB_DATABASE=development - - MONGO_INITDB_ROOT_USERNAME=admin_XXX - - MONGO_INITDB_ROOT_PASSWORD=admin_XXX + - MONGO_INITDB_ROOT_USERNAME=admin_1234 + - MONGO_INITDB_ROOT_PASSWORD=admin_1234 ports: - "27018:27017" timescaledb: diff --git a/config/mainnet/2-mx-exchange-service/.env b/config/mainnet/2-mx-exchange-service/.env index f0a20e6..c93bcec 100644 --- a/config/mainnet/2-mx-exchange-service/.env +++ b/config/mainnet/2-mx-exchange-service/.env @@ -21,8 +21,8 @@ REDIS_DB=0 #MongoDB MONGODB_URL=mongodb://localhost:27018 MONGODB_DATABASE=development -MONGODB_USERNAME=admin_XXX -MONGODB_PASSWORD=admin_XXX +MONGODB_USERNAME=admin_1234 +MONGODB_PASSWORD=admin_1234 #Elasticsearch server to use for logging. Optional ELASTICSEARCH_URL="https://testnet-index.multiversx.com" @@ -69,5 +69,5 @@ AWS_TIMESTREAM_WRITE=false TIMESCALEDB_URL="localhost" TIMESCALEDB_PORT=5432 TIMESCALEDB_DATABASE="postgres" -TIMESCALEDB_USERNAME="postgres_XXX" -TIMESCALEDB_PASSWORD="postgres_XXX" \ No newline at end of file +TIMESCALEDB_USERNAME="postgres_1234" +TIMESCALEDB_PASSWORD="postgres_1234" \ No newline at end of file diff --git a/config/mainnet/2-mx-exchange-service/docker-compose.yml b/config/mainnet/2-mx-exchange-service/docker-compose.yml index 2bf7467..f88b7e6 100644 --- a/config/mainnet/2-mx-exchange-service/docker-compose.yml +++ b/config/mainnet/2-mx-exchange-service/docker-compose.yml @@ -14,8 +14,8 @@ services: environment: HOSTNAME: rabbitmq RABBITMQ_NODENAME: rabbitmq - RABBITMQ_DEFAULT_USER: "guest_XXX" - RABBITMQ_DEFAULT_PASS: "guest_XXX" + RABBITMQ_DEFAULT_USER: "guest_1234" + RABBITMQ_DEFAULT_PASS: "guest_1234" volumes: - /var/lib/rabbitmq ports: @@ -25,8 +25,8 @@ services: image: mongo:latest environment: - MONGODB_DATABASE=development - - MONGO_INITDB_ROOT_USERNAME=admin_XXX - - MONGO_INITDB_ROOT_PASSWORD=admin_XXX + - MONGO_INITDB_ROOT_USERNAME=admin_1234 + - MONGO_INITDB_ROOT_PASSWORD=admin_1234 ports: - "27018:27017" timescaledb: @@ -35,7 +35,7 @@ services: ports: - "5432:5432" environment: - POSTGRES_PASSWORD: postgres - POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres_1234 + POSTGRES_USER: postgres_1234 TIMESCALEDB_TELEMETRY: off PGDATA: /var/lib/postgresql/data/pgdata