From 8a805e6a5bc9e0e09dcad234ff82bf4fff0b8bd7 Mon Sep 17 00:00:00 2001 From: Thomas Kammerlocher Date: Mon, 11 Nov 2024 07:52:59 +0100 Subject: [PATCH] feat: added middleware version from pom.xml (#251) --- .../rosetta/api/network/service/NetworkServiceImpl.java | 5 +++-- api/src/main/resources/config/application.yaml | 1 + .../test/resources/config/application-test-integration.yaml | 5 ++--- pom.xml | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/api/src/main/java/org/cardanofoundation/rosetta/api/network/service/NetworkServiceImpl.java b/api/src/main/java/org/cardanofoundation/rosetta/api/network/service/NetworkServiceImpl.java index 39de51504..4d0aaf46d 100644 --- a/api/src/main/java/org/cardanofoundation/rosetta/api/network/service/NetworkServiceImpl.java +++ b/api/src/main/java/org/cardanofoundation/rosetta/api/network/service/NetworkServiceImpl.java @@ -63,6 +63,8 @@ public class NetworkServiceImpl implements NetworkService { private String genesisShelleyPath; @Value("${cardano.rosetta.CARDANO_NODE_VERSION}") private String cardanoNodeVersion; + @Value("${cardano.rosetta.middleware-version}") + private String revision; @PostConstruct public void init() { @@ -83,7 +85,6 @@ public NetworkOptionsResponse getNetworkOptions(NetworkRequest networkRequest) { log.info("[networkOptions] Looking for networkOptions"); String rosettaVersion = getRosettaVersion(); - String implementationVersion = rosettaConfig.getImplementationVersion(); OperationStatus success = new OperationStatus().successful(true) .status(OperationTypeStatus.SUCCESS.getValue()); OperationStatus invalid = new OperationStatus().successful(false) @@ -93,7 +94,7 @@ public NetworkOptionsResponse getNetworkOptions(NetworkRequest networkRequest) { return NetworkOptionsResponse.builder() .version(new Version().nodeVersion(cardanoNodeVersion) .rosettaVersion(rosettaVersion) - .middlewareVersion(implementationVersion) + .middlewareVersion(revision) .metadata(new LinkedHashMap<>())) .allow(new Allow().operationStatuses(operationStatuses) .operationTypes( diff --git a/api/src/main/resources/config/application.yaml b/api/src/main/resources/config/application.yaml index 898925bc9..d9901e243 100644 --- a/api/src/main/resources/config/application.yaml +++ b/api/src/main/resources/config/application.yaml @@ -29,6 +29,7 @@ cardano: rosetta: version: ${ROSETTA_VERSION} + middleware-version: '@revision@' TOPOLOGY_FILEPATH: ${TOPOLOGY_FILEPATH} GENESIS_SHELLEY_PATH: ${GENESIS_SHELLEY_PATH} NODE_SUBMIT_API_PORT: ${NODE_SUBMIT_API_PORT} diff --git a/api/src/test/resources/config/application-test-integration.yaml b/api/src/test/resources/config/application-test-integration.yaml index 2d789f956..a44153baf 100644 --- a/api/src/test/resources/config/application-test-integration.yaml +++ b/api/src/test/resources/config/application-test-integration.yaml @@ -38,11 +38,10 @@ cardano: rosetta: version: ${ROSETTA_VERSION} - implementation-version: - '1.0.0-SNAPSHOT' + middleware-version: '@revision@' TOPOLOGY_FILEPATH: ${TOPOLOGY_FILEPATH:../config/devkit/topology.json} GENESIS_SHELLEY_PATH: ${GENESIS_SHELLEY_PATH:../config/devkit/shelley-genesis.json} - CARDANO_NODE_VERSION: ${CARDANO_NODE_VERSION:8.9.0} + CARDANO_NODE_VERSION: ${CARDANO_NODE_VERSION:10.1.2} CARDANO_NODE_SUBMIT_HOST: ${CARDANO_NODE_SUBMIT_HOST:localhost} NODE_SUBMIT_API_PORT: ${NODE_SUBMIT_API_PORT:8090} CARDANO_NODE_SOCKET_PATH: ${CARDANO_NODE_SOCKET_PATH:""} diff --git a/pom.xml b/pom.xml index 7fe47ad79..a4d8eec19 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ - 1.0.0 + 1.0.4 21 UTF-8 3.2.4