Skip to content
This repository has been archived by the owner on May 6, 2022. It is now read-only.

Commit

Permalink
[#73] Upgrade to cardano-node-1.29.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tdiesler committed Aug 31, 2021
1 parent f738885 commit f76f5bd
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 162 deletions.
4 changes: 2 additions & 2 deletions build-common.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash

# Also change HaskellNix in nix/sources.json
CARDANO_VER="alonzo-purple-1.0.1"
CARDANO_REV="-dev"
CARDANO_VER="1.29.0"
CARDANO_REV="-rev1"

# https://mmonit.com/monit/#download
MONIT_VER="5.28.0"
Expand Down
124 changes: 0 additions & 124 deletions nix/docker/node/context/config/alonzo-purple-config.json

This file was deleted.

2 changes: 1 addition & 1 deletion nix/docker/node/context/config/mainnet-config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"AlonzoGenesisFile": "mainnet-alonzo-genesis.json",
"AlonzoGenesisHash": "44d65c89cce5f717e839a86fed28af924252ff46eca5aaf15b47ec0dd6a59578",
"AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
"ApplicationName": "cardano-sl",
"ApplicationVersion": 1,
"ByronGenesisFile": "mainnet-byron-genesis.json",
Expand Down
16 changes: 1 addition & 15 deletions nix/docker/node/context/config/testnet-config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"AlonzoGenesisFile": "testnet-alonzo-genesis.json",
"AlonzoGenesisHash": "44d65c89cce5f717e839a86fed28af924252ff46eca5aaf15b47ec0dd6a59578",
"AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
"ApplicationName": "cardano-sl",
"ApplicationVersion": 0,
"ByronGenesisFile": "testnet-byron-genesis.json",
Expand Down Expand Up @@ -58,10 +58,6 @@
[
"StdoutSK",
"stdout"
],
[
"FileSK",
"/opt/cardano/logs/debug.log"
]
],
"hasEKG": [
Expand Down Expand Up @@ -102,16 +98,6 @@
"scKind": "StdoutSK",
"scName": "stdout",
"scRotation": null
},
{
"scFormat": "ScText",
"scKind": "FileSK",
"scName": "/opt/cardano/logs/debug.log",
"scRotation": {
"rpLogLimitBytes": 50000000,
"rpKeepFilesNum": 14,
"rpMaxAgeHours": 24
}
}
]
}
18 changes: 2 additions & 16 deletions nix/docker/node/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
cabalVersion,
ghcVersion,

# https://hydra.iohk.io/build/7189190/download/1/index.html
hydraBuild ? "7189190",
# https://hydra.iohk.io/build/7370192/download/1/index.html
hydraBuild ? "7370192",

baseImage ? import ../baseImage { inherit debianVersion; },
cardano ? import ../../cardano { inherit cardanoVersion cardanoRev cabalVersion ghcVersion; },
Expand All @@ -36,7 +36,6 @@ let

# curl -o "./nix/docker/node/context/config/mainnet-config.json" "https://hydra.iohk.io/build/${hydraBuild}/download/1/mainnet-config.json"
# curl -o "./nix/docker/node/context/config/testnet-config.json" "https://hydra.iohk.io/build/${hydraBuild}/download/1/testnet-config.json"
# curl -o "./nix/docker/node/context/config/alonzo-purple-config.json" "https://hydra.iohk.io/build/${hydraBuild}/download/1/alonzo-purple-config.json"

# The mainet configs for the cardano-node
mainnet-config = ./context/config/mainnet-config.json;
Expand All @@ -52,13 +51,6 @@ let
testnet-shelley-genesis = builtins.fetchurl "https://hydra.iohk.io/build/${hydraBuild}/download/1/testnet-shelley-genesis.json";
testnet-alonzo-genesis = builtins.fetchurl "https://hydra.iohk.io/build/${hydraBuild}/download/1/testnet-alonzo-genesis.json";

# The alonzo-purple configs for the cardano-node
alonzo-purple-config = ./context/config/alonzo-purple-config.json;
alonzo-purple-topology = builtins.fetchurl "https://hydra.iohk.io/build/${hydraBuild}/download/1/alonzo-purple-topology.json";
alonzo-purple-byron-genesis = builtins.fetchurl "https://hydra.iohk.io/build/${hydraBuild}/download/1/alonzo-purple-byron-genesis.json";
alonzo-purple-shelley-genesis = builtins.fetchurl "https://hydra.iohk.io/build/${hydraBuild}/download/1/alonzo-purple-shelley-genesis.json";
alonzo-purple-alonzo-genesis = builtins.fetchurl "https://hydra.iohk.io/build/${hydraBuild}/download/1/alonzo-purple-alonzo-genesis.json";

# Custom mainnet-config.json

# The Docker context with static content
Expand Down Expand Up @@ -132,12 +124,6 @@ in
cp ${testnet-shelley-genesis} opt/cardano/config/testnet-shelley-genesis.json
cp ${testnet-alonzo-genesis} opt/cardano/config/testnet-alonzo-genesis.json
cp ${alonzo-purple-config} opt/cardano/config/alonzo-purple-config.json
cp ${alonzo-purple-topology} opt/cardano/config/alonzo-purple-topology.json
cp ${alonzo-purple-byron-genesis} opt/cardano/config/alonzo-purple-byron-genesis.json
cp ${alonzo-purple-shelley-genesis} opt/cardano/config/alonzo-purple-shelley-genesis.json
cp ${alonzo-purple-alonzo-genesis} opt/cardano/config/alonzo-purple-alonzo-genesis.json
# gLiveView scripts
cp -r ${gLiveView}/cnode-helper-scripts cnode-helper-scripts
Expand Down
8 changes: 4 additions & 4 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"homepage": "https://input-output-hk.github.io/haskell.nix",
"owner": "input-output-hk",
"repo": "haskell.nix",
"_see": "https://github.com/input-output-hk/cardano-node/blob/alonzo-purple-1.0.1/flake.lock#L26",
"rev": "a28099f2f64bad29db409787d84a2ef7ad840351",
"sha256": "F2K6CDXDV02t9fILgCWIornXdtqKNwWuL/EykjxDu3g=",
"_see": "https://github.com/input-output-hk/cardano-node/blob/1.29.0/flake.lock#L154",
"rev": "8407c0fcdb7591d1a323f5ca39abc607f226d0dc",
"sha256": "0jg1kv4adayg4irza1mjgxbhawk6ss7nzs0yl2p7c1knf5zzgifa",
"type": "tarball",
"url": "https://github.com/input-output-hk/haskell.nix/archive/a28099f2f64bad29db409787d84a2ef7ad840351.tar.gz",
"url": "https://github.com/input-output-hk/haskell.nix/archive/8407c0fcdb7591d1a323f5ca39abc607f226d0dc.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}

0 comments on commit f76f5bd

Please sign in to comment.