Skip to content

Commit

Permalink
RA-87: Api default port updated
Browse files Browse the repository at this point in the history
  • Loading branch information
mlinnik committed May 8, 2024
1 parent 9c81095 commit 73bf621
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 32 deletions.
15 changes: 9 additions & 6 deletions .env.IntegrationTest
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
## Main variables
LOG=INFO
NETWORK=devkit
# mainnet, preprod, preview, sanchonet, devkit
PROTOCOL_MAGIC=42
# mainnet 764824073, preprod 1, preview 2, sanchonet 4, devkit 42
NETWORK_MAGIC=${PROTOCOL_MAGIC}

## Postgres image
DB_IMAGE_NAME=postgres
Expand All @@ -21,8 +21,10 @@ DB_PATH=data
UPDATE_GENESIS_BLOCK_QUERY="UPDATE preprod.block SET number = 0 WHERE number = -1; UPDATE preprod.block SET prev_hash = 'Genesis' WHERE number = 1"

## Cardano Node variables
CARDANO_NODE_HOST=yaci-cli # Service name in docker-compose or local cardano node
CARDANO_NODE_PORT=9999 # Uncomment if you are using local cardano node
CARDANO_NODE_HOST=yaci-cli
# Service name in docker-compose or local cardano node
CARDANO_NODE_PORT=9999
# Uncomment if you are using local cardano node
CARDANO_NODE_VERSION=8.9.0
CARDANO_NODE_SUBMIT_HOST=cardano-submit-api
NODE_SUBMIT_API_PORT=8090
Expand All @@ -35,6 +37,7 @@ CARDANO_CONFIG=./config/${NETWORK}
API_SPRING_PROFILES_ACTIVE=dev
# staging, h2, test. Additional profiles: mempool (if mempool should be activated)
API_PORT=8081
PRINT_EXCEPTION=true

ROSETTA_VERSION=1.4.13
TOPOLOGY_FILEPATH=/config/${NETWORK}/topology.json
Expand All @@ -43,12 +46,12 @@ GENESIS_BYRON_PATH=/config/${NETWORK}/byron-genesis.json
GENESIS_ALONZO_PATH=/config/${NETWORK}/alonzo-genesis.json
GENESIS_CONWAY_PATH=/config/${NETWORK}/conway-genesis.json

PRINT_EXCEPTION=true

## Yaci Indexer env
YACI_SPRING_PROFILES=postgres
YACI_SPRING_PROFILES=h2
# database profiles: h2, h2-testData, postgres
INDEXER_NODE_PORT=3001
MEMPOOL_ENABLED=false
# Haven't implemented yet
INITIAL_BALANCE_CALCULATION_BLOCK=0

## Devkit env
Expand Down
7 changes: 3 additions & 4 deletions .env.docker-compose
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
## Main variables
LOG=INFO
NETWORK=preprod
# mainnet, preprod, preview, sanchonet, devkit
PROTOCOL_MAGIC=1
# mainnet 764824073, preprod 1, preview 2, sanchonet 4, devkit 42
NETWORK_MAGIC=${PROTOCOL_MAGIC}

## Postgres image
DB_IMAGE_NAME=postgres
Expand Down Expand Up @@ -35,16 +35,15 @@ CARDANO_CONFIG=./config/${NETWORK}
## Api env
API_SPRING_PROFILES_ACTIVE=dev
# staging, h2, test. Additional profiles: mempool (if mempool should be activated)
API_PORT=8081
API_PORT=8080
PRINT_EXCEPTION=true

ROSETTA_VERSION=1.4.13
TOPOLOGY_FILEPATH=/config/${NETWORK}/topology.json
GENESIS_SHELLEY_PATH=/config/${NETWORK}/shelley-genesis.json
GENESIS_BYRON_PATH=/config/${NETWORK}/byron-genesis.json
GENESIS_ALONZO_PATH=/config/${NETWORK}/alonzo-genesis.json
GENESIS_CONWAY_PATH=/config/${NETWORK}/conway-genesis.json
API_NODE_SOCKET_PATH=./node/node.socket
PRINT_EXCEPTION=true

## Yaci Indexer env
YACI_SPRING_PROFILES=postgres
Expand Down
23 changes: 12 additions & 11 deletions .env.h2
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
## Main variables
LOG=INFO
NETWORK=devkit
# mainnet, preprod, preview, sanchonet, devkit
PROTOCOL_MAGIC=42
# mainnet 764824073, preprod 1, preview 2, sanchonet 4, devkit 42
NETWORK_MAGIC=${PROTOCOL_MAGIC}

## H2 image
DB_IMAGE_NAME=h2
DB_IMAGE_TAG=14.11-bullseye

## Postgres env
## Postgres variables
DB_NAME=rosetta-java-preprod
DB_USER=rosetta_db_admin
DB_SECRET=weakpwd#123_d
DB_HOST=db
# Service name in docker-compose or local db
DB_PORT=5432
DB_SCHEMA=${NETWORK}
DB_PATH=data

## H2 settings
MAXIMUM_POOL_SIZE=80
Expand All @@ -39,20 +40,20 @@ CARDANO_CONFIG=./config/${NETWORK}
## Api env
API_SPRING_PROFILES_ACTIVE=h2
# staging, h2, test. Additional profiles: mempool (if mempool should be activated)
API_EXPOSED_PORT=8081
API_BIND_PORT=8081
API_PORT=8080
PRINT_EXCEPTION=true

ROSETTA_VERSION=1.4.13
TOPOLOGY_FILEPATH=config/${NETWORK}/topology.json
GENESIS_SHELLEY_PATH=config/${NETWORK}/shelley-genesis.json
GENESIS_BYRON_PATH=config/${NETWORK}/byron-genesis.json
GENESIS_ALONZO_PATH=config/${NETWORK}/alonzo-genesis.json
GENESIS_CONWAY_PATH=config/${NETWORK}/conway-genesis.json

PRINT_EXCEPTION=true
TOPOLOGY_FILEPATH=./config/${NETWORK}/topology.json
GENESIS_SHELLEY_PATH=./config/${NETWORK}/shelley-genesis.json
GENESIS_BYRON_PATH=./config/${NETWORK}/byron-genesis.json
GENESIS_ALONZO_PATH=./config/${NETWORK}/alonzo-genesis.json
GENESIS_CONWAY_PATH=./config/${NETWORK}/conway-genesis.json

## Yaci Indexer env
YACI_SPRING_PROFILES=h2
# database profiles: h2, h2-testData, postgres
INDEXER_NODE_PORT=3001
MEMPOOL_ENABLED=false
# Haven't implemented yet
INITIAL_BALANCE_CALCULATION_BLOCK=0
2 changes: 1 addition & 1 deletion api/src/main/resources/config/application-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
server:
port: ${API_PORT:8081}
port: ${API_PORT:8080}
compression:
enabled: true
mime-types: text/html,text/plain,text/css,application/javascript,application/json
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/resources/config/application-h2.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
server:
port: ${API_PORT:8081}
port: ${API_PORT:8080}
compression:
enabled: true
mime-types: text/html,text/plain,text/css,application/javascript,application/json
Expand Down
2 changes: 1 addition & 1 deletion api/src/test/resources/application-test-integration.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
server:
port: ${API_PORT:8081}
port: ${API_PORT:8080}
compression:
enabled: true
mime-types: text/html,text/plain,text/css,application/javascript,application/json
Expand Down
3 changes: 0 additions & 3 deletions docker-api-indexer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@ services:
DB_NAME: ${DB_NAME}
DB_USER: ${DB_USER}
DB_SECRET: ${DB_SECRET}
DB_DRIVER_CLASS_NAME: ${DB_DRIVER_CLASS_NAME}
API_PORT: ${API_PORT}
CARDANO_NODE_VERSION: ${CARDANO_NODE_VERSION}
API_SPRING_PROFILES_ACTIVE: ${API_SPRING_PROFILES_ACTIVE}
PROTOCOL_MAGIC: ${PROTOCOL_MAGIC}
NETWORK_MAGIC: ${NETWORK_MAGIC}
TOPOLOGY_FILEPATH: ${TOPOLOGY_FILEPATH}
GENESIS_SHELLEY_PATH: ${GENESIS_SHELLEY_PATH}
NODE_SUBMIT_API_PORT: ${NODE_SUBMIT_API_PORT}
Expand Down Expand Up @@ -55,7 +53,6 @@ services:
DB_NAME: ${DB_NAME}
DB_USER: ${DB_USER}
DB_SECRET: ${DB_SECRET}
DB_DRIVER_CLASS_NAME: ${DB_DRIVER_CLASS_NAME}
CARDANO_NODE_HOST: ${CARDANO_NODE_HOST}
CARDANO_NODE_PORT: ${INDEXER_NODE_PORT}
PROTOCOL_MAGIC: ${PROTOCOL_MAGIC}
Expand Down
2 changes: 1 addition & 1 deletion postmanTests/Rosetta-java-env.postman_environment.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"values": [
{
"key": "URL",
"value": "localhost:8081",
"value": "localhost:8080",
"type": "default",
"enabled": true
},
Expand Down
2 changes: 1 addition & 1 deletion rosetta-cli-tests/data/byron_sample.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"online_url": "http://localhost:8081",
"online_url": "http://localhost:8080",
"data": {
"start_index": 0,
"end_conditions": {
Expand Down
2 changes: 1 addition & 1 deletion rosetta-cli-tests/data/preview_sample.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"online_url": "http://localhost:8081",
"online_url": "http://localhost:8080",
"data": {
"start_index": 1,
"end_conditions": {
Expand Down
2 changes: 1 addition & 1 deletion rosetta-cli-tests/data/shelley_sample.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"online_url": "http://localhost:8081",
"online_url": "http://localhost:8080",
"data": {
"start_index": 4603000,
"end_conditions": {
Expand Down
2 changes: 1 addition & 1 deletion rosetta-cli-tests/data/shelley_transition.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"online_url": "http://localhost:8081",
"online_url": "http://localhost:8080",
"data": {
"start_index": 4490000,
"end_conditions": {
Expand Down
Binary file modified testData/devkit.db.mv.db
Binary file not shown.

0 comments on commit 73bf621

Please sign in to comment.