Skip to content

Node-10.2.1 & Switch to JSON-based configuration and update dependencies #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Node-10.2.1 & Switch to JSON-based configuration and update dependencies #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion applications/cli/config/download.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Please specify either the version or the full url for the following components
node.version=10.1.4
node.version=10.2.1
ogmios.version=6.11.2
kupo.version=2.10.0
yaci.store.version=0.2.0-graal-preview1
Expand Down
4 changes: 2 additions & 2 deletions applications/cli/config/node.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,5 +95,5 @@
# So, the shiftStartTimeBehind flag should be "false" for non-development / multi-node networks.
#
#########################################################################################################
conwayHardForkAtEpoch=1
shiftStartTimeBehind=true
#conwayHardForkAtEpoch=1
#shiftStartTimeBehind=true
6 changes: 3 additions & 3 deletions applications/cli/src/main/java/com/bloxbean/cardano/yacicli/localcluster/ClusterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,15 +411,15 @@ private void updateSubmitApiFiles(Path destPath, long protocolMagic, int submitA
}

private void updateConfiguration(Path clusterFolder, ClusterInfo clusterInfo, Consumer<String> writer) throws IOException {
Path configurationPath = clusterFolder.resolve("templates").resolve("configuration.yaml");
Path configurationPath = clusterFolder.resolve("templates").resolve("configuration.json");
// if (clusterInfo.getEra() == null || clusterInfo.getEra() == Era.Babbage) {
// configurationPath = clusterFolder.resolve("configuration.yaml");
// } else if (clusterInfo.getEra() == Era.Conway) {
// writer.accept(success("Updating configuration.yaml for conway era"));
// configurationPath = clusterFolder.resolve("configuration.yaml.conway");
// }

Path destConfigPath = clusterFolder.resolve("node").resolve("configuration.yaml");
Path destConfigPath = clusterFolder.resolve("node").resolve("configuration.json");
boolean enableP2P = clusterInfo.isP2pEnabled();

var genesisConfigCopy = genesisConfig.copy();
Expand All @@ -438,7 +438,7 @@ private void updateConfiguration(Path clusterFolder, ClusterInfo clusterInfo, Co
throw new IOException(e);
}

writer.accept(success("Updated configuration.yaml"));
writer.accept(success("Updated configuration.json"));
}

public ClusterInfo getClusterInfo(String clusterName) throws IOException {
Expand Down
12 changes: 11 additions & 1 deletion ...li/src/main/resources/localcluster/templates/devnet/genesis-templates/alonzo-genesis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,17 @@
10,
43574283,
26308,
10
10,
9999999999999,
9999999999999,
9999999999999,
9999999999999,
9999999999999,
9999999999999,
9999999999999,
9999999999999,
9999999999999,
9999999999999
]
},
"executionPrices": {
Expand Down
2 changes: 1 addition & 1 deletion applications/cli/src/main/resources/localcluster/templates/devnet/node/node.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

${BIN_FOLDER}/cardano-node run \
--config configuration.yaml \
--config configuration.json \
--topology topology.json \
--database-path db \
--socket-path node.sock \
Expand Down
2 changes: 1 addition & 1 deletion applications/cli/src/main/resources/localcluster/templates/devnet/ogmios.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

set -e

${OGMIOS_BIN} --node-socket node/node.sock --node-config node/configuration.yaml --host 0.0.0.0 --port ${OGMIOS_PORT}
${OGMIOS_BIN} --node-socket node/node.sock --node-config node/configuration.json --host 0.0.0.0 --port ${OGMIOS_PORT}
2 changes: 1 addition & 1 deletion applications/cli/src/main/resources/localcluster/templates/devnet/templates/node-bp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{BIN_FOLDER}}/cardano-node run \
--config configuration.yaml \
--config configuration.json \
--topology topology.json \
--database-path db \
--socket-path node.sock \
Expand Down
2 changes: 1 addition & 1 deletion applications/cli/src/main/resources/localcluster/templates/devnet/templates/node-relay.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{BIN_FOLDER}}/cardano-node run \
--config configuration.yaml \
--config configuration.json \
--topology topology.json \
--database-path db \
--socket-path node.sock \
Expand Down
Loading