LW-7691 upgrade node and ogmios

compose/common.yml

@@ -142,7 +142,7 @@ services:
 
   cardano-node:
     <<: *logging
-    image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-8.8.0-pre}
+    image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-8.9.1}
     command:
       [
         'run',
@@ -162,7 +162,7 @@ services:
 
   ogmios:
     <<: *logging
-    image: cardanosolutions/ogmios:v${OGMIOS_VERSION:-6.1.0}
+    image: cardanosolutions/ogmios:v${OGMIOS_VERSION:-6.2.0}
     command:
       ['--host', '0.0.0.0', '--node-socket', '/ipc/node.socket', '--node-config', '/config/cardano-node/config.json']
     depends_on:
@@ -178,7 +178,7 @@ services:
 
   cardano-submit-api:
     command: --config /config/cardano-submit-api/config.json --listen-address 0.0.0.0 --socket-path /ipc/node.socket $SUBMIT_API_ARGS
-    image: ghcr.io/intersectmbo/cardano-submit-api:${CARDANO_NODE_VERSION:-8.8.0-pre}
+    image: ghcr.io/intersectmbo/cardano-submit-api:${CARDANO_NODE_VERSION:-8.9.1}
     ports:
       - 8090:8090
     restart: on-failure

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

@@ -1,9 +1,6 @@
 #!/bin/bash
 
 # Download configuration files from a nominated URL for a nominated network
-# If p2p is enabled, create an explicit p2p version, keeping the default aligned with the production
-# networks, at least until https://github.com/input-output-hk/ouroboros-network/pull/3844 has been
-# inclded in a cardano-node release.
 
 CARDANO_CONFIG_URL=$1
 CARDANO_NETWORK=$2
@@ -14,47 +11,18 @@ mkdir -p \
   network/$CARDANO_NETWORK/cardano-db-sync \
   network/$CARDANO_NETWORK/cardano-submit-api
 
-SOURCE_TOPOLOGY=$(wget -qO- $CARDANO_CONFIG_URL/$CARDANO_NETWORK/topology.json)
-NODE_CONFIG=$(wget -qO- $CARDANO_CONFIG_URL/$CARDANO_NETWORK/config.json | jq '.ByronGenesisFile = "../genesis/byron.json" | .ShelleyGenesisFile = "../genesis/shelley.json" | .AlonzoGenesisFile = "../genesis/alonzo.json" | .ConwayGenesisFile = "../genesis/conway.json"')
-DB_SYNC_CONFIG=$(wget -qO- $CARDANO_CONFIG_URL/$CARDANO_NETWORK/db-sync-config.json | jq '.NodeConfigFile = "../cardano-node/config.json"')
-SUBMIT_API_CONFIG=$(wget -qO- $CARDANO_CONFIG_URL/$CARDANO_NETWORK/submit-api-config.json)
+wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/topology.json -O network/$CARDANO_NETWORK/cardano-node/topology.json
+wget -qO- $CARDANO_CONFIG_URL/$CARDANO_NETWORK/config.json \
+  | jq '.ByronGenesisFile = "../genesis/byron.json" | .ShelleyGenesisFile = "../genesis/shelley.json" | .AlonzoGenesisFile = "../genesis/alonzo.json" | .ConwayGenesisFile = "../genesis/conway.json"' \
+  | jq '.' > network/$CARDANO_NETWORK/cardano-node/config.json
+wget -qO- $CARDANO_CONFIG_URL/$CARDANO_NETWORK/db-sync-config.json \
+  | jq '.NodeConfigFile = "../cardano-node/config.json"' \
+  | jq '.' > network/$CARDANO_NETWORK/cardano-db-sync/config.json
+wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/submit-api-config.json -O network/$CARDANO_NETWORK/cardano-submit-api/config.json
 
+
+# Genesis
 wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/byron-genesis.json -O network/$CARDANO_NETWORK/genesis/byron.json
 wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/shelley-genesis.json -O network/$CARDANO_NETWORK/genesis/shelley.json
 wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/alonzo-genesis.json -O network/$CARDANO_NETWORK/genesis/alonzo.json
 wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/conway-genesis.json -O network/$CARDANO_NETWORK/genesis/conway.json
-
-if [ $(echo $SOURCE_TOPOLOGY | jq 'has("publicRoots")') = true ];
-then
-  ACCESS_POINT=$(echo $SOURCE_TOPOLOGY | jq '.publicRoots[0].accessPoints[0]')
-
-  # Add separate p2p config
-  mkdir -p \
-      network/${CARDANO_NETWORK}_p2p/cardano-node \
-      network/${CARDANO_NETWORK}_p2p/genesis \
-      network/${CARDANO_NETWORK}_p2p/cardano-db-sync \
-      network/${CARDANO_NETWORK}_p2p/cardano-submit-api
-
-  wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/byron-genesis.json -O network/${CARDANO_NETWORK}_p2p/genesis/byron.json
-  wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/shelley-genesis.json -O network/${CARDANO_NETWORK}_p2p/genesis/shelley.json
-  wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/alonzo-genesis.json -O network/${CARDANO_NETWORK}_p2p/genesis/alonzo.json
-  wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/conway-genesis.json -O network/${CARDANO_NETWORK}_p2p/genesis/conway.json
-
-  echo $SOURCE_TOPOLOGY | jq '.' > network/${CARDANO_NETWORK}_p2p/cardano-node/topology.json
-  echo $NODE_CONFIG | jq '.' > network/${CARDANO_NETWORK}_p2p/cardano-node/config.json
-  echo $DB_SYNC_CONFIG | jq '.' > network/${CARDANO_NETWORK}_p2p/cardano-db-sync/config.json
-  echo $SUBMIT_API_CONFIG | jq '.' > network/${CARDANO_NETWORK}_p2p/cardano-submit-api/config.json
-
-  # Transform defaults to disable p2p
-  jq -nj --argjson address $(echo $ACCESS_POINT | jq '.address') --argjson port $(echo $ACCESS_POINT | jq '.port') '{"Producers": [{"addr": $address, "port": $port, "valency": 1 }]}' > network/$CARDANO_NETWORK/cardano-node/topology.json
-  # See https://github.com/input-output-hk/cardano-node/blob/0681cdeb07d81b3b088a6c14e703d03751c3d25d/cardano-node/src/Cardano/Node/Tracing/Tracers/Startup.hs#L366
-  echo $NODE_CONFIG | jq '.EnableP2P = false | del(.TestEnableDevelopmentNetworkProtocols)'> network/$CARDANO_NETWORK/cardano-node/config.json
-  echo $DB_SYNC_CONFIG | jq '.' > network/$CARDANO_NETWORK/cardano-db-sync/config.json
-  echo $SUBMIT_API_CONFIG | jq '.' > network/$CARDANO_NETWORK/cardano-submit-api/config.json
-else
-  # Source config doesn't have p2p enabled, so no further transformation required
-  echo $SOURCE_TOPOLOGY | jq '.' > network/$CARDANO_NETWORK/cardano-node/topology.json
-  echo $NODE_CONFIG | jq '.' > network/$CARDANO_NETWORK/cardano-node/config.json
-  echo $DB_SYNC_CONFIG | jq '.' > network/$CARDANO_NETWORK/cardano-db-sync/config.json
-  echo $SUBMIT_API_CONFIG | jq '.' > network/$CARDANO_NETWORK/cardano-submit-api/config.json
-fi

packages/cardano-services/config/.github/workflows/refresh-configurations.yaml

@@ -18,31 +18,31 @@ jobs:
       run: |
         .github/scripts/download-all.sh $CARDANO_CONFIG_URL $CARDANO_NETWORK
       env:
-        CARDANO_CONFIG_URL: https://book.world.dev.cardano.org/environments/
+        CARDANO_CONFIG_URL: https://book.play.dev.cardano.org/environments
         CARDANO_NETWORK: mainnet
 
     - name: Download from The Cardano Book (preprod)
       shell: bash
       run: |
         .github/scripts/download-all.sh $CARDANO_CONFIG_URL $CARDANO_NETWORK
       env:
-        CARDANO_CONFIG_URL: https://book.world.dev.cardano.org/environments
+        CARDANO_CONFIG_URL: https://book.play.dev.cardano.org/environments
         CARDANO_NETWORK: preprod
 
     - name: Download from The Cardano Book (preview)
       shell: bash
       run: |
         .github/scripts/download-all.sh $CARDANO_CONFIG_URL $CARDANO_NETWORK
       env:
-        CARDANO_CONFIG_URL: https://book.world.dev.cardano.org/environments
+        CARDANO_CONFIG_URL: https://book.play.dev.cardano.org/environments
         CARDANO_NETWORK: preview
 
     - name: Download from The Cardano Book (sanchonet)
       shell: bash
       run: |
         .github/scripts/download-all.sh $CARDANO_CONFIG_URL $CARDANO_NETWORK
       env:
-        CARDANO_CONFIG_URL: https://book.world.dev.cardano.org/environments
+        CARDANO_CONFIG_URL: https://book.play.dev.cardano.org/environments
         CARDANO_NETWORK: sanchonet
 
     - name: Push new configurations
@@ -51,4 +51,4 @@ jobs:
         git status -s
         .github/scripts/update-when-new.sh $CARDANO_CONFIG_URL
       env:
-        CARDANO_CONFIG_URL: https://book.world.dev.cardano.org/environments
+        CARDANO_CONFIG_URL: https://book.play.dev.cardano.org/environments

packages/cardano-services/config/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/input-output-hk/cardano-configurations.git
 	branch = master
-	commit = 541ca01f5a934e538a029627283ce7e8601ffb2a
-	parent = 30035cf57212c846fa4e4c495686d119d7c0744b
+	commit = a09256f7bcd2a7e7d8427175a53a7bac10ef2ca3
+	parent = b7e5e3fec49aca549b7cd6a8f54826b0c5402bd3
 	method = merge
 	cmdver = 0.4.6

packages/cardano-services/config/README.md

@@ -1,6 +1,6 @@
 # Cardano Configurations
 
-This repository holds the latest configurations for various core Cardano components (cardano-node, cardano-db-sync...), as well as the genesis configurations of well-known networks (i.e. mainnet and testnet...). It's **updated automatically, when required, by a cron-job once a day**, using the [The Cardano Book](https://book.world.dev.cardano.org/environments.html) as a source, and, since they're a Git repository, can be added to a project as a Git submodule and specific configurations can be pinned via a commit reference. The folder structure is network-centric and works well for setup where the network is fixed via a command-line option or environment variable.
+This repository holds the latest configurations for various core Cardano components (cardano-node, cardano-db-sync...), as well as the genesis configurations of well-known networks (i.e. mainnet and testnet...). It's **updated automatically, when required, by a cron-job once a day**, using the [The Cardano Book](https://book.play.dev.cardano.org/environments.html) as a source, and, since they're a Git repository, can be added to a project as a Git submodule and specific configurations can be pinned via a commit reference. The folder structure is network-centric and works well for setup where the network is fixed via a command-line option or environment variable.
 
 ---
 

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

@@ -4,8 +4,8 @@
   "ByronGenesisFile": "../genesis/byron.json",
   "ByronGenesisHash": "5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb",
   "ConwayGenesisFile": "../genesis/conway.json",
-  "ConwayGenesisHash": "f7d46bdd3b3c8caf38351c4eef3346a89241707270be0d6106e8a407db294cc6",
-  "EnableP2P": false,
+  "ConwayGenesisHash": "de609b281cb3d8ae91a9d63a00c87092975612d603aa54c0f1c6a781e33d6e1e",
+  "EnableP2P": true,
   "LastKnownBlockVersion-Alt": 0,
   "LastKnownBlockVersion-Major": 3,
   "LastKnownBlockVersion-Minor": 0,

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

@@ -1,9 +1,27 @@
 {
-  "Producers": [
+  "bootstrapPeers": [
     {
-      "addr": "backbone.cardano-mainnet.iohk.io",
-      "port": 3001,
+      "address": "backbone.cardano.iog.io",
+      "port": 3001
+    },
+    {
+      "address": "backbone.mainnet.emurgornd.com",
+      "port": 3001
+    }
+  ],
+  "localRoots": [
+    {
+      "accessPoints": [],
+      "advertise": false,
+      "trustable": false,
       "valency": 1
     }
-  ]
-}
+  ],
+  "publicRoots": [
+    {
+      "accessPoints": [],
+      "advertise": false
+    }
+  ],
+  "useLedgerAfterSlot": 116812831
+}

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

@@ -1,28 +1,29 @@
 {
   "poolVotingThresholds": {
-    "pvtCommitteeNormal": 0.51,
-    "pvtCommitteeNoConfidence": 0.51,
-    "pvtHardForkInitiation": 0.51,
-    "pvtMotionNoConfidence": 0.51
+    "committeeNormal": 0.51,
+    "committeeNoConfidence": 0.51,
+    "hardForkInitiation": 0.51,
+    "motionNoConfidence": 0.51,
+    "ppSecurityGroup": 0.51
   },
   "dRepVotingThresholds": {
-    "dvtMotionNoConfidence": 0.51,
-    "dvtCommitteeNormal": 0.51,
-    "dvtCommitteeNoConfidence": 0.51,
-    "dvtUpdateToConstitution": 0.51,
-    "dvtHardForkInitiation": 0.51,
-    "dvtPPNetworkGroup": 0.51,
-    "dvtPPEconomicGroup": 0.51,
-    "dvtPPTechnicalGroup": 0.51,
-    "dvtPPGovGroup": 0.51,
-    "dvtTreasuryWithdrawal": 0.51
+    "motionNoConfidence": 0.51,
+    "committeeNormal": 0.51,
+    "committeeNoConfidence": 0.51,
+    "updateToConstitution": 0.51,
+    "hardForkInitiation": 0.51,
+    "ppNetworkGroup": 0.51,
+    "ppEconomicGroup": 0.51,
+    "ppTechnicalGroup": 0.51,
+    "ppGovGroup": 0.51,
+    "treasuryWithdrawal": 0.51
   },
   "committeeMinSize": 0,
-  "committeeMaxTermLength": 60,
-  "govActionLifetime": 14,
-  "govActionDeposit": 0,
-  "dRepDeposit": 0,
-  "dRepActivity": 0,
+  "committeeMaxTermLength": 200,
+  "govActionLifetime": 10,
+  "govActionDeposit": 1000000000,
+  "dRepDeposit": 2000000,
+  "dRepActivity": 20,
   "constitution": {
     "anchor": {
       "url": "",