Skip to content

Commit 1d4271f

Browse files
mirceahaseganmirceahasegan
authored
Merge pull request #1370 from input-output-hk/chore/lw-10279-node-upgrade-9-0-0
Chore: LW-10279 cardano node upgrade to 9.0.0
2 parents 7a63ab7 + 4e12190 commit 1d4271f

File tree

29 files changed

+555
-349
lines changed

29 files changed

+555
-349
lines changed

‎compose/aarch64.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
services:
44
cardano-db-sync:
5-
image: ghcr.io/input-output-hk/ogmios-tracker/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-sancho-5.0.0}
5+
image: ghcr.io/input-output-hk/ogmios-tracker/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-13.3.0.0}
66
cardano-node:
7-
image: ghcr.io/input-output-hk/ogmios-tracker/cardano-node:${CARDANO_NODE_VERSION:-8.11.0-sancho}
7+
image: ghcr.io/input-output-hk/ogmios-tracker/cardano-node:${CARDANO_NODE_VERSION:-9.0.0}
88
ogmios:
9-
image: ghcr.io/input-output-hk/ogmios-tracker/ogmios:v${OGMIOS_VERSION:-6.4.0}
9+
image: ghcr.io/input-output-hk/ogmios-tracker/ogmios:v${OGMIOS_VERSION:-6.5.0}
1010
cardano-submit-api:
11-
image: ghcr.io/input-output-hk/ogmios-tracker/cardano-submit-api:${CARDANO_NODE_VERSION:-8.11.0-sancho}
11+
image: ghcr.io/input-output-hk/ogmios-tracker/cardano-submit-api:${CARDANO_NODE_VERSION:-9.0.0}

‎compose/common.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ services:
111111
depends_on:
112112
ogmios:
113113
condition: service_healthy
114-
image: ghcr.io/intersectmbo/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-sancho-5.0.0}
114+
image: ghcr.io/intersectmbo/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-13.3.0.0}
115115
restart: on-failure
116116
stop_signal: SIGINT
117117
volumes:
@@ -122,7 +122,7 @@ services:
122122
<<:
123123
- *logging
124124
- *with-postgres
125-
image: ghcr.io/intersectmbo/cardano-smash-server:${CARDANO_DB_SYNC_VERSION:-sancho-5.0.0}
125+
image: ghcr.io/intersectmbo/cardano-smash-server:${CARDANO_DB_SYNC_VERSION:-13.3.0.0}
126126
command: ['--config', '/config/cardano-db-sync/config.json']
127127
environment:
128128
POSTGRES_HOST: postgres
@@ -143,7 +143,7 @@ services:
143143

144144
cardano-node:
145145
<<: *logging
146-
image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-8.11.0-sancho}
146+
image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-9.0.0}
147147
command:
148148
[
149149
'run',
@@ -163,7 +163,7 @@ services:
163163

164164
ogmios:
165165
<<: *logging
166-
image: cardanosolutions/ogmios:v${OGMIOS_VERSION:-6.4.0}
166+
image: cardanosolutions/ogmios:v${OGMIOS_VERSION:-6.5.0}
167167
command:
168168
['--host', '0.0.0.0', '--node-socket', '/ipc/node.socket', '--node-config', '/config/cardano-node/config.json']
169169
depends_on:
@@ -179,7 +179,7 @@ services:
179179

180180
cardano-submit-api:
181181
command: --config /config/cardano-submit-api/config.json --listen-address 0.0.0.0 --socket-path /ipc/node.socket $SUBMIT_API_ARGS
182-
image: ghcr.io/intersectmbo/cardano-submit-api:${CARDANO_NODE_VERSION:-8.11.0-sancho}
182+
image: ghcr.io/intersectmbo/cardano-submit-api:${CARDANO_NODE_VERSION:-9.0.0}
183183
ports:
184184
- 8090:8090
185185
restart: on-failure

‎packages/cardano-services/config/.github/scripts/download-all.sh

+10-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ mkdir -p \
1313

1414
wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/topology.json -O network/$CARDANO_NETWORK/cardano-node/topology.json
1515
wget -qO- $CARDANO_CONFIG_URL/$CARDANO_NETWORK/config.json \
16-
| jq '.ByronGenesisFile = "../genesis/byron.json" | .ShelleyGenesisFile = "../genesis/shelley.json" | .AlonzoGenesisFile = "../genesis/alonzo.json" | .ConwayGenesisFile = "../genesis/conway.json"' \
16+
| jq '.ByronGenesisFile = "../genesis/byron.json" | .ShelleyGenesisFile = "../genesis/shelley.json" | .AlonzoGenesisFile = "../genesis/alonzo.json"' \
1717
| jq '.' > network/$CARDANO_NETWORK/cardano-node/config.json
1818
wget -qO- $CARDANO_CONFIG_URL/$CARDANO_NETWORK/db-sync-config.json \
1919
| jq '.NodeConfigFile = "../cardano-node/config.json"' \
@@ -25,4 +25,12 @@ wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/submit-api-config.json -O network/$
2525
wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/byron-genesis.json -O network/$CARDANO_NETWORK/genesis/byron.json
2626
wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/shelley-genesis.json -O network/$CARDANO_NETWORK/genesis/shelley.json
2727
wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/alonzo-genesis.json -O network/$CARDANO_NETWORK/genesis/alonzo.json
28-
wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/conway-genesis.json -O network/$CARDANO_NETWORK/genesis/conway.json
28+
if wget --spider $CARDANO_CONFIG_URL/$CARDANO_NETWORK/conway-genesis.json 2>/dev/null; then
29+
wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/conway-genesis.json -O network/$CARDANO_NETWORK/genesis/conway.json
30+
mv network/$CARDANO_NETWORK/cardano-node/config.json network/$CARDANO_NETWORK/cardano-node/config.json.tmp
31+
cat network/$CARDANO_NETWORK/cardano-node/config.json.tmp \
32+
| jq '.ConwayGenesisFile = "../genesis/conway.json"' \
33+
| jq '.' > network/$CARDANO_NETWORK/cardano-node/config.json
34+
rm network/$CARDANO_NETWORK/cardano-node/config.json.tmp
35+
fi
36+

‎packages/cardano-services/config/.gitrepo

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = https://github.com/input-output-hk/cardano-configurations.git
88
branch = master
9-
commit = 692010ed0f454bfbb566c06443227c79e2f4dbab
10-
parent = c1a83293a9a7a1310634d1dc3588094e3d925cb3
9+
commit = 6d7fac44d6a877ae9a3cf5eeda163ae539b17774
10+
parent = 7a63ab70ea8640b07cd9c38cb77f22d76875e576
1111
method = merge
1212
cmdver = 0.4.6

‎packages/cardano-services/config/network/mainnet/cardano-node/config.json

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
"AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
44
"ByronGenesisFile": "../genesis/byron.json",
55
"ByronGenesisHash": "5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb",
6-
"ConwayGenesisFile": "../genesis/conway.json",
7-
"ConwayGenesisHash": "de609b281cb3d8ae91a9d63a00c87092975612d603aa54c0f1c6a781e33d6e1e",
86
"EnableP2P": true,
97
"LastKnownBlockVersion-Alt": 0,
108
"LastKnownBlockVersion-Major": 3,

‎packages/cardano-services/config/network/mainnet/genesis/conway.json

-38
This file was deleted.

‎packages/cardano-services/config/network/preprod/cardano-node/config.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,19 @@
33
"AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
44
"ByronGenesisFile": "../genesis/byron.json",
55
"ByronGenesisHash": "d4b8de7a11d929a323373cbab6c1a9bdc931beffff11db111cf9d57356ee1937",
6-
"ConwayGenesisFile": "../genesis/conway.json",
7-
"ConwayGenesisHash": "de609b281cb3d8ae91a9d63a00c87092975612d603aa54c0f1c6a781e33d6e1e",
86
"EnableP2P": true,
97
"LastKnownBlockVersion-Alt": 0,
108
"LastKnownBlockVersion-Major": 2,
119
"LastKnownBlockVersion-Minor": 0,
12-
"MinNodeVersion": "8.9.2",
10+
"MinNodeVersion": "8.12.0",
1311
"PeerSharing": true,
1412
"Protocol": "Cardano",
1513
"RequiresNetworkMagic": "RequiresMagic",
1614
"ShelleyGenesisFile": "../genesis/shelley.json",
1715
"ShelleyGenesisHash": "162d29c4e1cf6b8a84f2d692e67a3ac6bc7851bc3e6e4afe64d15778bed8bd86",
1816
"TargetNumberOfActivePeers": 20,
1917
"TargetNumberOfEstablishedPeers": 50,
20-
"TargetNumberOfKnownPeers": 100,
18+
"TargetNumberOfKnownPeers": 150,
2119
"TargetNumberOfRootPeers": 60,
2220
"TraceAcceptPolicy": true,
2321
"TraceBlockFetchClient": false,

‎packages/cardano-services/config/network/preprod/cardano-node/topology.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
"advertise": false
2020
}
2121
],
22-
"useLedgerAfterSlot": 52358331
22+
"useLedgerAfterSlot": 64454371
2323
}

‎packages/cardano-services/config/network/preprod/genesis/conway.json

-38
This file was deleted.

‎packages/cardano-services/config/network/preview/cardano-node/config.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,21 @@
33
"AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
44
"ByronGenesisFile": "../genesis/byron.json",
55
"ByronGenesisHash": "83de1d7302569ad56cf9139a41e2e11346d4cb4a31c00142557b6ab3fa550761",
6-
"ConwayGenesisFile": "../genesis/conway.json",
7-
"ConwayGenesisHash": "de609b281cb3d8ae91a9d63a00c87092975612d603aa54c0f1c6a781e33d6e1e",
86
"EnableP2P": true,
97
"ExperimentalHardForksEnabled": false,
108
"ExperimentalProtocolsEnabled": false,
119
"LastKnownBlockVersion-Alt": 0,
1210
"LastKnownBlockVersion-Major": 3,
1311
"LastKnownBlockVersion-Minor": 1,
14-
"MinNodeVersion": "8.9.2",
12+
"MinNodeVersion": "8.12.0",
1513
"PeerSharing": true,
1614
"Protocol": "Cardano",
1715
"RequiresNetworkMagic": "RequiresMagic",
1816
"ShelleyGenesisFile": "../genesis/shelley.json",
1917
"ShelleyGenesisHash": "363498d1024f84bb39d3fa9593ce391483cb40d479b87233f868d6e57c3a400d",
2018
"TargetNumberOfActivePeers": 20,
2119
"TargetNumberOfEstablishedPeers": 50,
22-
"TargetNumberOfKnownPeers": 100,
20+
"TargetNumberOfKnownPeers": 150,
2321
"TargetNumberOfRootPeers": 60,
2422
"TestAllegraHardForkAtEpoch": 0,
2523
"TestAlonzoHardForkAtEpoch": 0,

‎packages/cardano-services/config/network/preview/cardano-node/topology.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
"advertise": false
2020
}
2121
],
22-
"useLedgerAfterSlot": 41385503
22+
"useLedgerAfterSlot": 53827185
2323
}

‎packages/cardano-services/config/network/preview/genesis/conway.json

-38
This file was deleted.

‎packages/cardano-services/config/network/sanchonet/cardano-node/config.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
"ByronGenesisFile": "../genesis/byron.json",
55
"ByronGenesisHash": "785eb88427e136378a15b0a152a8bfbeec7a611529ccda29c43a1e60ffb48eaa",
66
"ConwayGenesisFile": "../genesis/conway.json",
7-
"ConwayGenesisHash": "79766b0c18076e9abefc806526714f30d42b14dba9f187fb316bd4e70c815ef4",
7+
"ConwayGenesisHash": "e85ee5b7af8ca5c273c20746c9f994aef1a72a79c38b4eea230817e7e66c0741",
88
"EnableP2P": true,
99
"ExperimentalHardForksEnabled": true,
1010
"ExperimentalProtocolsEnabled": true,
1111
"LastKnownBlockVersion-Alt": 0,
1212
"LastKnownBlockVersion-Major": 3,
1313
"LastKnownBlockVersion-Minor": 1,
14-
"MinNodeVersion": "8.11.0",
14+
"MinNodeVersion": "8.12.0",
1515
"PeerSharing": true,
1616
"Protocol": "Cardano",
1717
"RequiresNetworkMagic": "RequiresMagic",
1818
"ShelleyGenesisFile": "../genesis/shelley.json",
1919
"ShelleyGenesisHash": "f94457ec45a0c6773057a529533cf7ccf746cb44dabd56ae970e1dbfb55bfdb2",
2020
"TargetNumberOfActivePeers": 20,
2121
"TargetNumberOfEstablishedPeers": 50,
22-
"TargetNumberOfKnownPeers": 100,
22+
"TargetNumberOfKnownPeers": 150,
2323
"TargetNumberOfRootPeers": 60,
2424
"TestAllegraHardForkAtEpoch": 0,
2525
"TestAlonzoHardForkAtEpoch": 0,

‎packages/cardano-services/config/network/sanchonet/cardano-node/topology.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
"advertise": false
2020
}
2121
],
22-
"useLedgerAfterSlot": 21599922
22+
"useLedgerAfterSlot": 33695977
2323
}

0 commit comments

Comments
 (0)