Skip to content

Commit 8115d59

Browse files
matiwinnetouMateusz Czeladka
matiwinnetou
and
Mateusz Czeladka
authored
chore: cardano-node: 10.3.1, cabal: 3.12.1.0, ghc: 9.6.7 (#452)
Co-authored-by: Mateusz Czeladka <mateusz.czeladka@cardanofoundation.org>
1 parent 8fbbb72 commit 8115d59

File tree

34 files changed

+11244
-911
lines changed

34 files changed

+11244
-911
lines changed

‎.env.IntegrationTest

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ SNAPSHOT_DIGEST=latest
4040
AGGREGATOR_ENDPOINT=
4141
# if not set standard values will be used
4242
GENESIS_VERIFICATION_KEY=
43+
ANCILLARY_VERIFICATION_KEY=
44+
4345

4446
## Api env
4547
API_DOCKER_IMAGE_TAG=main

‎.env.docker-compose

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
API_SPRING_PROFILES_ACTIVE=online
33
LOG=INFO
44
NETWORK=mainnet
5-
# mainnet, preprod, preview, sanchonet, devkit
5+
# mainnet, preprod, preview, devkit
66
PROTOCOL_MAGIC=764824073
7-
# mainnet 764824073, preprod 1, preview 2, sanchonet 4, devkit 42
7+
# mainnet 764824073, preprod 1, preview 2, devkit 42
88

99
## Postgres image
1010
PG_VERSION_TAG=REL_14_11
@@ -18,13 +18,12 @@ DB_HOST=db
1818
DB_PORT=5432
1919
DB_SCHEMA=${NETWORK}
2020
DB_PATH=data
21-
2221
## Cardano Node variables
2322
CARDANO_NODE_HOST=cardano-node
2423
# Service name in docker-compose or local cardano node
2524
CARDANO_NODE_PORT=3001
2625
# Uncomment if you are using local cardano node
27-
CARDANO_NODE_VERSION=10.2.1
26+
CARDANO_NODE_VERSION=10.3.1
2827
CARDANO_NODE_SUBMIT_HOST=$CARDANO_NODE_HOST
2928
NODE_SUBMIT_API_PORT=8090
3029
CARDANO_NODE_DIR=/node
@@ -34,11 +33,13 @@ CARDANO_CONFIG=./config/${NETWORK}
3433

3534
## Mithril
3635
MITHRIL_SYNC=true
36+
MITHRIL_VERSION=2517.1
3737
SNAPSHOT_DIGEST=latest
3838
# if not set standard values will be used
3939
AGGREGATOR_ENDPOINT=
4040
# if not set standard values will be used
4141
GENESIS_VERIFICATION_KEY=
42+
ANCILLARY_VERIFICATION_KEY=
4243

4344
## Api env
4445
API_DOCKER_IMAGE_TAG=main

‎.env.docker-compose-preprod

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
API_SPRING_PROFILES_ACTIVE=online
33
LOG=INFO
44
NETWORK=preprod
5-
# mainnet, preprod, preview, sanchonet, devkit
5+
# mainnet, preprod, preview, devkit
66
PROTOCOL_MAGIC=1
7-
# mainnet 764824073, preprod 1, preview 2, sanchonet 4, devkit 42
7+
# mainnet 764824073, preprod 1, preview 2, devkit 42
88

99
## Postgres image
1010
PG_VERSION_TAG=REL_14_11
@@ -22,22 +22,25 @@ DB_PATH=/opt/rosetta-java-preprod/sql_data
2222
## Cardano Node variables
2323
CARDANO_NODE_HOST=cardano-node
2424
# Service name in docker-compose or local cardano node
25-
CARDANO_NODE_PORT=3002
26-
CARDANO_NODE_VERSION=10.2.1
25+
CARDANO_NODE_PORT=3001
26+
# Uncomment if you are using local cardano node
27+
CARDANO_NODE_VERSION=10.3.1
2728
CARDANO_NODE_SUBMIT_HOST=$CARDANO_NODE_HOST
28-
NODE_SUBMIT_API_PORT=8091
29+
NODE_SUBMIT_API_PORT=8090
2930
CARDANO_NODE_DIR=/opt/rosetta-java-preprod/node_data
3031
CARDANO_NODE_SOCKET_PATH=${CARDANO_NODE_DIR}/node.socket
3132
CARDANO_NODE_DB=${CARDANO_NODE_DIR}/db
3233
CARDANO_CONFIG=./config/${NETWORK}
3334

3435
## Mithril
3536
MITHRIL_SYNC=true
37+
MITHRIL_VERSION=2517.1
3638
SNAPSHOT_DIGEST=latest
3739
# if not set standard values will be used
3840
AGGREGATOR_ENDPOINT=
3941
# if not set standard values will be used
4042
GENESIS_VERIFICATION_KEY=
43+
ANCILLARY_VERIFICATION_KEY=
4144

4245
## Api env
4346
API_DOCKER_IMAGE_TAG=main

‎.env.h2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
## Main variables
22
LOG=INFO
33
NETWORK=devkit
4-
# mainnet, preprod, preview, sanchonet, devkit
4+
# mainnet, preprod, preview, devkit
55
PROTOCOL_MAGIC=42
6-
# mainnet 764824073, preprod 1, preview 2, sanchonet 4, devkit 42
6+
# mainnet 764824073, preprod 1, preview 2, devkit 42
77

88
## H2 image
99
DB_IMAGE_NAME=h2
@@ -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.2.1
22+
CARDANO_NODE_VERSION=10.3.1
2323
CARDANO_NODE_SUBMIT_HOST=localhost
2424
NODE_SUBMIT_API_PORT=8090
2525

‎.env.h2-testdata

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
## Main variables
22
LOG=INFO
33
NETWORK=devkit
4-
# mainnet, preprod, preview, sanchonet, devkit
4+
# mainnet, preprod, preview, devkit
55
PROTOCOL_MAGIC=42
6-
# mainnet 764824073, preprod 1, preview 2, sanchonet 4, devkit 42
6+
# mainnet 764824073, preprod 1, preview 2, devkit 42
77

88
## H2 image
99
DB_IMAGE_NAME=h2
@@ -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.2.1
22+
CARDANO_NODE_VERSION=10.3.1
2323
CARDANO_NODE_SUBMIT_HOST=localhost
2424
NODE_SUBMIT_API_PORT=8090
2525

‎README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
[![License](https://img.shields.io:/github/license/cardano-foundation/cardano-rosetta-java?label=license)](https://github.com/cardano-foundation/cardano-rosetta-java/blob/master/LICENSE)
33
![Discord](https://img.shields.io/discord/1022471509173882950)
44
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=cardano-foundation_cardano-rosetta-java&metric=coverage)](https://sonarcloud.io/summary/overall?id=cardano-foundation_cardano-rosetta-java)
5-
[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B45571%2Fgithub.com%2Fcardano-foundation%2Fcardano-rosetta-java.svg?type=shield&issueType=license)](https://app.fossa.com/projects/custom%2B45571%2Fgithub.com%2Fcardano-foundation%2Fcardano-rosetta-java?ref=badge_shield&issueType=license)
65

76
## What the project is about?
87

‎api/src/main/java/org/cardanofoundation/rosetta/api/network/service/NetworkServiceImpl.java

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
import org.cardanofoundation.rosetta.common.util.Constants;
3030
import org.cardanofoundation.rosetta.common.util.RosettaConstants;
3131

32+
import static org.cardanofoundation.rosetta.common.util.Constants.*;
33+
3234
@Service
3335
@Slf4j
3436
@RequiredArgsConstructor
@@ -124,11 +126,11 @@ public Network getSupportedNetwork() {
124126
int networkMagic = genesisDataProvider.getProtocolMagic();
125127

126128
return switch (networkMagic) {
127-
case Constants.MAINNET_NETWORK_MAGIC -> Networks.mainnet();
128-
case Constants.PREPROD_NETWORK_MAGIC -> Networks.preprod();
129-
case Constants.PREVIEW_NETWORK_MAGIC -> Networks.preview();
129+
case MAINNET_NETWORK_MAGIC -> Networks.mainnet();
130+
case PREPROD_NETWORK_MAGIC -> Networks.preprod();
131+
case PREVIEW_NETWORK_MAGIC -> Networks.preview();
130132
case Constants.SANCHONET_NETWORK_MAGIC -> new Network(0b0000, Constants.SANCHONET_NETWORK_MAGIC);
131-
case Constants.DEVKIT_NETWORK_MAGIC -> new Network(0b0000, Constants.DEVKIT_NETWORK_MAGIC);
133+
case DEVKIT_NETWORK_MAGIC -> new Network(0b0000, DEVKIT_NETWORK_MAGIC);
132134

133135
default -> throw ExceptionFactory.invalidNetworkError();
134136
};
@@ -186,30 +188,17 @@ private boolean verifyBlockchain(String blockchain) {
186188
return blockchain.equals(Constants.CARDANO_BLOCKCHAIN);
187189
}
188190

189-
private boolean verifyNetwork(String network) {
190-
Network supportedNetwork = getSupportedNetwork();
191+
private boolean verifyNetwork(String inputNetwork) {
192+
Network currentNetwork = getSupportedNetwork();
191193

192-
switch ((int) supportedNetwork.getProtocolMagic()) {
193-
case Constants.MAINNET_NETWORK_MAGIC -> {
194-
return network.equalsIgnoreCase(Constants.MAINNET);
195-
}
196-
case Constants.PREPROD_NETWORK_MAGIC -> {
197-
return network.equals(Constants.PREPROD);
198-
}
199-
case Constants.PREVIEW_NETWORK_MAGIC -> {
200-
return network.equals(Constants.PREVIEW);
201-
}
202-
case Constants.DEVKIT_NETWORK_MAGIC -> {
203-
return network.equals(Constants.DEVKIT);
204-
}
205-
case Constants.SANCHONET_NETWORK_MAGIC -> {
206-
return network.equals(Constants.SANCHONET);
207-
}
208-
default -> {
209-
return false;
210-
}
211-
}
212-
}
194+
return switch ((int) currentNetwork.getProtocolMagic()) {
195+
case MAINNET_NETWORK_MAGIC -> inputNetwork.equalsIgnoreCase(MAINNET);
196+
case PREPROD_NETWORK_MAGIC -> inputNetwork.equals(PREPROD);
197+
case PREVIEW_NETWORK_MAGIC -> inputNetwork.equals(PREVIEW);
198+
case DEVKIT_NETWORK_MAGIC -> inputNetwork.equals(DEVKIT);
213199

200+
default -> false;
201+
};
202+
}
214203

215204
}

‎api/src/main/java/org/cardanofoundation/rosetta/common/enumeration/NetworkEnum.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ public enum NetworkEnum {
1616
MAINNET(Constants.MAINNET, Networks.mainnet()),
1717
PREPROD(Constants.PREPROD, Networks.preprod()),
1818
DEVNET(Constants.DEVKIT, new Network(0b0000, 42)),
19-
PREVIEW(Constants.PREVIEW, Networks.preview()),
20-
SANCHONET(Constants.SANCHONET, new Network(0b0000, 4));
19+
PREVIEW(Constants.PREVIEW, Networks.preview());
2120

2221
private final String name;
2322
private final Network network;

‎api/src/main/java/org/cardanofoundation/rosetta/common/util/Constants.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ private Constants() {
208208

209209
public static final String LOVELACE = "lovelace";
210210
public static final String DEVKIT = "devkit";
211-
public static final String SANCHONET = "sanchonet";
212211

213212
public static final String ROSETTA_API_PATH = "classpath:/rosetta-specifications-1.4.15/api.yaml";
214213
}

‎api/src/main/java/org/cardanofoundation/rosetta/config/CardanoConvertersConfig.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ public CardanoConverters cardanoConverters() {
5050
return ClasspathConversionsFactory.createConverters(PREVIEW);
5151
}
5252

53-
if (protocolMagic == Constants.SANCHONET_NETWORK_MAGIC) {
54-
log.info("Creating CardanoConverters for sanchonet");
55-
return ClasspathConversionsFactory.createConverters(SANCHONET);
56-
}
57-
5853
if (protocolMagic == Constants.DEVKIT_NETWORK_MAGIC) {
5954
log.info("Creating CardanoConverters for devkit, no converters available");
6055
// Cardano Converters for DevKit is not supported but we still need to return something sensible

0 commit comments

Comments
 (0)