Skip to content

Commit 9778ea5

Browse files
author
Mateusz Czeladka
committed
Merge remote-tracking branch 'origin/main' into develop
2 parents da62f24 + 5a49e83 commit 9778ea5

File tree

11 files changed

+26
-20
lines changed

11 files changed

+26
-20
lines changed

‎.env.docker-compose‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ CARDANO_NODE_HOST=cardano-node
2424
# Service name in docker-compose or local cardano node
2525
CARDANO_NODE_PORT=3001
2626
# Uncomment if you are using local cardano node
27-
CARDANO_NODE_VERSION=10.5.1
27+
CARDANO_NODE_VERSION=10.5.3
2828
CARDANO_NODE_SUBMIT_HOST=cardano-submit-api
2929
NODE_SUBMIT_API_PORT=8090
3030
CARDANO_NODE_DIR=/node

‎.env.docker-compose-preprod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ CARDANO_NODE_HOST=cardano-node
2424
# Service name in docker-compose or local cardano node
2525
CARDANO_NODE_PORT=3001
2626
# Uncomment if you are using local cardano node
27-
CARDANO_NODE_VERSION=10.5.1
27+
CARDANO_NODE_VERSION=10.5.3
2828
CARDANO_NODE_SUBMIT_HOST=cardano-submit-api
2929
NODE_SUBMIT_API_PORT=8090
3030
CARDANO_NODE_DIR=/opt/rosetta-java-preprod/node_data

‎.env.h2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ CARDANO_NODE_HOST=localhost
1919
# Service name in docker-compose or local cardano node
2020
CARDANO_NODE_PORT=3001
2121
# Uncomment if you are using local cardano node
22-
CARDANO_NODE_VERSION=10.5.1
22+
CARDANO_NODE_VERSION=10.5.3
2323
CARDANO_NODE_SUBMIT_HOST=localhost
2424
NODE_SUBMIT_API_PORT=8090
2525

‎.env.h2-testdata‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ CARDANO_NODE_HOST=localhost
1919
# Service name in docker-compose or local cardano node
2020
CARDANO_NODE_PORT=3001
2121
# Uncomment if you are using local cardano node
22-
CARDANO_NODE_VERSION=10.5.1
22+
CARDANO_NODE_VERSION=10.5.3
2323
CARDANO_NODE_SUBMIT_HOST=localhost
2424
NODE_SUBMIT_API_PORT=8090
2525

‎.github/actions/build_docker_images/action.yml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,44 +29,50 @@ secrets:
2929
runs:
3030
using: composite
3131
steps:
32-
- name: Read versions from .env
32+
- name: Read versions from .env.docker-compose
3333
id: envver
3434
shell: bash
3535
run: |
3636
NODE_KEY='${{ inputs.node_version_key }}'
3737
PG_KEY='${{ inputs.pg_version_key }}'
3838
MITHRIL_KEY='${{ inputs.mithril_version_key }}'
3939
40-
if [[ ! -f .env ]]; then
41-
echo ".env not found"
42-
exit 0
40+
if [[ ! -f .env.docker-compose ]]; then
41+
echo ".env.docker-compose not found"
42+
exit 1
4343
fi
4444
4545
get_val() {
4646
local key="$1"
47-
grep -E "^${key}=" .env | head -1 | cut -d= -f2- | tr -d '\r'
47+
grep -E "^${key}=" .env.docker-compose | head -1 | cut -d= -f2- | tr -d '\r'
4848
}
4949
5050
NODE_VAL="$(get_val "$NODE_KEY")"
5151
PG_VAL="$(get_val "$PG_KEY")"
5252
MITHRIL_VAL="$(get_val "$MITHRIL_KEY")"
53-
53+
5454
if [[ -n "$NODE_VAL" ]]; then
5555
echo "node_version=$NODE_VAL" >> "$GITHUB_OUTPUT"
56+
echo "Found $NODE_KEY=$NODE_VAL"
5657
else
57-
echo "No value for $NODE_KEY in .env"
58+
echo "ERROR: No value for $NODE_KEY in .env.docker-compose"
59+
exit 1
5860
fi
5961
6062
if [[ -n "$PG_VAL" ]]; then
6163
echo "pg_version=$PG_VAL" >> "$GITHUB_OUTPUT"
64+
echo "Found $PG_KEY=$PG_VAL"
6265
else
63-
echo "No value for $PG_KEY in .env"
66+
echo "ERROR: No value for $PG_KEY in .env.docker-compose"
67+
exit 1
6468
fi
6569
6670
if [[ -n "$MITHRIL_VAL" ]]; then
6771
echo "mithril_version=$MITHRIL_VAL" >> "$GITHUB_OUTPUT"
72+
echo "Found $MITHRIL_KEY=$MITHRIL_VAL"
6873
else
69-
echo "No value for $MITHRIL_KEY in .env"
74+
echo "ERROR: No value for $MITHRIL_KEY in .env.docker-compose"
75+
exit 1
7076
fi
7177
7278
- name: API - Build and push Docker ${{ inputs.tag }} image

‎api/src/test/resources/config/application-test-integration.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ cardano:
4343
GENESIS_SHELLEY_PATH: ${GENESIS_SHELLEY_PATH:../config/node/devkit/shelley-genesis.json}
4444
GENESIS_ALONZO_PATH: ${GENESIS_ALONZO_PATH:../config/node/devkit/alonzo-genesis.json}
4545
GENESIS_CONWAY_PATH: ${GENESIS_CONWAY_PATH:../config/node/devkit/conway-genesis.json}
46-
CARDANO_NODE_VERSION: ${CARDANO_NODE_VERSION:10.5.1}
46+
CARDANO_NODE_VERSION: ${CARDANO_NODE_VERSION:10.5.3}
4747
CARDANO_NODE_SUBMIT_HOST: ${CARDANO_NODE_SUBMIT_HOST:localhost}
4848
NODE_SUBMIT_API_PORT: ${NODE_SUBMIT_API_PORT:8090}
4949
CARDANO_NODE_SOCKET_PATH: ${CARDANO_NODE_SOCKET_PATH:""}

‎docker/dockerfiles/node/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ RUN bash -c "curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org
1515

1616
ENV PATH=/root/.local/bin:/root/.ghcup/bin:/root/.cabal/bin:${PATH}
1717

18-
ARG BLST_VERSION="0.3.11"
18+
ARG BLST_VERSION="0.3.14"
1919
ARG LIBSODIUM_VERSION="dbb48cc"
2020
ARG SECP256K1_VERSION="ac83be33"
2121
ARG LMDB_VERSION="ce20108"
2222

2323
ARG CABAL_VERSION=${CABAL_VERSION:-3.12.1.0}
2424
ARG GHC_VERSION=${GHC_VERSION:-9.6.7}
2525

26-
ARG CARDANO_NODE_VERSION=${CARDANO_NODE_VERSION:-10.5.1}
26+
ARG CARDANO_NODE_VERSION=${CARDANO_NODE_VERSION:-10.5.3}
2727

2828
RUN bash -c "ghcup install cabal ${CABAL_VERSION}"
2929
RUN bash -c "ghcup set cabal ${CABAL_VERSION}"

‎docs/docs/core-concepts/architecture.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ _Figure 2: Component Diagram showing internal architecture_
5353
The Cardano Node is a full implementation of the Cardano blockchain protocol that connects to the Cardano network, validates transactions and blocks, and maintains the blockchain state.
5454

5555
:::info
56-
**Version**: 10.5.1 (configurable via build args)
56+
**Version**: 10.5.3 (configurable via build args)
5757
**Built with**: GHC 9.6.7 and Cabal 3.12.1.0
5858
**Runtime socket path**: `/node/node.socket`
5959
**Data directory**: `/node/db`

‎docs/docs/core-concepts/cardano-addons.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ For transaction fields for the `size` and `scriptSize` are added to Transaction
9898
}
9999
```
100100

101-
### `/block/transactions`
101+
### `/block/transaction`
102102

103103
When the block requested contains transactions with multi assets operations, the token bundles associated to each operation will be returned as metadata.
104104

‎docs/docs/install-and-deploy/env-vars.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Hardware profile files should be used **in combination** with a base `.env.docke
5050
| `DB_PATH` | Database path | data | added in release 1.0.0 |
5151
| `CARDANO_NODE_HOST` | Cardano node host | cardano-node | added in release 1.0.0 |
5252
| `CARDANO_NODE_PORT` | Cardano node port | 3001 | added in release 1.0.0 |
53-
| `CARDANO_NODE_VERSION` | Cardano node version | 10.5.1 | added in release 1.0.0 |
53+
| `CARDANO_NODE_VERSION` | Cardano node version | 10.5.3 | added in release 1.0.0 |
5454
| `CARDANO_NODE_SUBMIT_HOST` | Cardano node submit API host | cardano-submit-api | added in release 1.0.0 |
5555
| `NODE_SUBMIT_API_PORT` | Cardano node submit API port | 8090 | added in release 1.0.0 |
5656
| `CARDANO_NODE_DIR` | Cardano node base directory | /node | added in release 1.0.0 |

0 commit comments

Comments
 (0)