Merge pull request #1522 from input-output-hk/chore/upgrade-node-10

Chore/upgrade node 10
input-output-hk · Nov 14, 2024 · dea40cc · dea40cc
2 parents 7863819 + d5674cd
commit dea40cc
Show file tree

Hide file tree

Showing 35 changed files with 341 additions and 264 deletions.
diff --git a/.github/workflows/continuous-integration-blockfrost-e2e.yaml b/.github/workflows/continuous-integration-blockfrost-e2e.yaml
@@ -29,10 +29,7 @@ env:
   WS_PROVIDER_URL: 'http://localhost:4100/ws'
 
 on:
-  pull_request:
-  push:
-    branches: ['master']
-    tags: ['*.*.*']
+  workflow_dispatch:
 
 jobs:
   build_and_test:

diff --git a/compose/aarch64.yml b/compose/aarch64.yml
@@ -2,10 +2,10 @@
 
 services:
   cardano-db-sync:
-    image: ghcr.io/input-output-hk/ogmios-tracker/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-13.3.0.0}
+    image: ghcr.io/input-output-hk/ogmios-tracker/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-13.6.0.0-pre}
   cardano-node:
-    image: ghcr.io/input-output-hk/ogmios-tracker/cardano-node:${CARDANO_NODE_VERSION:-9.1.0}
+    image: ghcr.io/input-output-hk/ogmios-tracker/cardano-node:${CARDANO_NODE_VERSION:-10.1.2}
   ogmios:
-    image: ghcr.io/input-output-hk/ogmios-tracker/ogmios:v${OGMIOS_VERSION:-6.5.0}
+    image: ghcr.io/input-output-hk/ogmios-tracker/ogmios:v${OGMIOS_VERSION:-6.9.0}
   cardano-submit-api:
-    image: ghcr.io/input-output-hk/ogmios-tracker/cardano-submit-api:${CARDANO_NODE_VERSION:-9.1.0}
+    image: ghcr.io/input-output-hk/ogmios-tracker/cardano-submit-api:${CARDANO_NODE_VERSION:-10.1.2}
diff --git a/compose/common.yml b/compose/common.yml
@@ -121,7 +121,7 @@ x-sdk-environment: &sdk-environment
 services:
   blockfrost-ryo:
     build:
-      context: 'https://github.com/ginnun/blockfrost-backend-ryo.git#feat/custom-network-support'
+      context: 'https://github.com/mirceahasegan/blockfrost-backend-ryo.git#feat/custom-network-support'
       dockerfile: Dockerfile
     environment:
       BLOCKFROST_CONFIG_SERVER_LISTEN_ADDRESS: 0.0.0.0
@@ -179,7 +179,7 @@ services:
 
   cardano-node:
     <<: *logging
-    image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-9.1.1}
+    image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-10.1.2}
     command:
       [
         'run',
@@ -199,7 +199,7 @@ services:
 
   ogmios:
     <<: *logging
-    image: cardanosolutions/ogmios:v${OGMIOS_VERSION:-6.5.0}
+    image: cardanosolutions/ogmios:v${OGMIOS_VERSION:-6.9.0}
     command:
       [
         '--host',
@@ -225,7 +225,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:-9.1.1}
+    image: ghcr.io/intersectmbo/cardano-submit-api:${CARDANO_NODE_VERSION:-10.1.2}
     ports:
       - 8090:8090
     restart: on-failure

diff --git a/compose/pg-agent.yml b/compose/pg-agent.yml
@@ -1,5 +1,3 @@
-version: '3.9'
-
 x-logging: &logging
   logging:
     driver: 'json-file'

diff --git a/packages/cardano-services/config/.gitrepo b/packages/cardano-services/config/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/input-output-hk/cardano-configurations.git
 	branch = master
-	commit = 7969a73e5c7ee1f3b2a40274b34191fdd8de170b
-	parent = 6c74e3abdf0ff29b448d94136b8d59c8975ad615
+	commit = 3c5f35bda1b8fd29ab310ad222403a9167f512de
+	parent = 846a0eeb6248aca9c9b9481675144d380980bfcb
 	method = merge
 	cmdver = 0.4.6
diff --git a/packages/cardano-services/config/network/mainnet/cardano-node/topology.json b/packages/cardano-services/config/network/mainnet/cardano-node/topology.json
@@ -5,11 +5,11 @@
       "port": 3001
     },
     {
-      "address": "backbone.mainnet.emurgornd.com",
+      "address": "backbone.mainnet.cardanofoundation.org",
       "port": 3001
     },
     {
-      "address": "backbone.mainnet.cardanofoundation.org",
+      "address": "backbone.mainnet.emurgornd.com",
       "port": 3001
     }
   ],

diff --git a/packages/cardano-services/config/network/sanchonet/cardano-node/config.json b/packages/cardano-services/config/network/sanchonet/cardano-node/config.json
@@ -4,14 +4,14 @@
   "ByronGenesisFile": "../genesis/byron.json",
   "ByronGenesisHash": "785eb88427e136378a15b0a152a8bfbeec7a611529ccda29c43a1e60ffb48eaa",
   "ConwayGenesisFile": "../genesis/conway.json",
-  "ConwayGenesisHash": "e85ee5b7af8ca5c273c20746c9f994aef1a72a79c38b4eea230817e7e66c0741",
+  "ConwayGenesisHash": "ff31343b814adddfdcaceb76f635647e2b7d1adfc0ddac7c40b70cbdcd82fed9",
   "EnableP2P": true,
   "ExperimentalHardForksEnabled": true,
   "ExperimentalProtocolsEnabled": true,
   "LastKnownBlockVersion-Alt": 0,
   "LastKnownBlockVersion-Major": 3,
   "LastKnownBlockVersion-Minor": 1,
-  "MinNodeVersion": "8.12.0",
+  "MinNodeVersion": "10.0.0",
   "PeerSharing": true,
   "Protocol": "Cardano",
   "RequiresNetworkMagic": "RequiresMagic",

diff --git a/packages/cardano-services/config/network/sanchonet/genesis/conway.json b/packages/cardano-services/config/network/sanchonet/genesis/conway.json
@@ -1,15 +1,15 @@
 {
   "poolVotingThresholds": {
-    "committeeNormal": 0.65,
-    "committeeNoConfidence": 0.65,
+    "committeeNormal": 0.51,
+    "committeeNoConfidence": 0.51,
     "hardForkInitiation": 0.51,
-    "motionNoConfidence": 0.6,
-    "ppSecurityGroup": 0.6
+    "motionNoConfidence": 0.51,
+    "ppSecurityGroup": 0.51
   },
   "dRepVotingThresholds": {
     "motionNoConfidence": 0.67,
     "committeeNormal": 0.67,
-    "committeeNoConfidence": 0.65,
+    "committeeNoConfidence": 0.6,
     "updateToConstitution": 0.75,
     "hardForkInitiation": 0.6,
     "ppNetworkGroup": 0.67,
@@ -18,9 +18,9 @@
     "ppGovGroup": 0.75,
     "treasuryWithdrawal": 0.67
   },
-  "committeeMinSize": 5,
-  "committeeMaxTermLength": 146,
-  "govActionLifetime": 14,
+  "committeeMinSize": 0,
+  "committeeMaxTermLength": 1000,
+  "govActionLifetime": 60,
   "govActionDeposit": 100000000000,
   "dRepDeposit": 500000000,
   "dRepActivity": 20,
@@ -279,20 +279,19 @@
     1
   ],
   "constitution": {
-    "anchor": {
-      "url": "ipfs://QmQq5hWDNzvDR1ForEktAHrdCQmfSL2u5yctNpzDwoSBu4",
-      "dataHash": "23b43bebac48a4acc39e578715aa06635d6d900fa3ea7441dfffd6e43b914f7b"
-    },
-		"script": "edcd84c10e36ae810dc50847477083069db796219b39ccde790484e0"
+      "anchor": {
+          "dataHash": "ca41a91f399259bcefe57f9858e91f6d00e1a38d6d9c63d4052914ea7bd70cb2",
+          "url": "ipfs://bafkreifnwj6zpu3ixa4siz2lndqybyc5wnnt3jkwyutci4e2tmbnj3xrdm"
+      },
+      "script": "fa24fb305126805cf2164c161d852a0e7330cf988f1fe558cf7d4a64"
   },
   "committee": {
     "members": {
-			"scriptHash-7ceede7d6a89e006408e6b7c6acb3dd094b3f6817e43b4a36d01535b": 500,
-			"scriptHash-6095e643ea6f1cccb6e463ec34349026b3a48621aac5d512655ab1bf": 500,
-			"scriptHash-27999ed757d6dac217471ae61d69b1b067b8b240d9e3ff36eb66b5d0": 500,
-			"scriptHash-87f867a31c0f81360d4d7dcddb6b025ba8383db9bf77a2af7797799d": 500,
-			"scriptHash-a19a7ba1caede8f3ab3e5e2a928b3798d7d011af18fbd577f7aeb0ec": 500
+        "keyHash-77c0a65f9302bccab35b44adc1823cb66c88a66c97cf3de8236dd718": 1000
     },
-    "threshold": 0.67
+    "threshold": {
+      "numerator": 2,
+      "denominator": 3
+    }
   }
 }
diff --git a/packages/cardano-services/docker-compose.yml b/packages/cardano-services/docker-compose.yml
@@ -9,17 +9,14 @@ x-sdk-environment: &sdk-environment
   HANDLE_POLICY_IDS: ${HANDLE_POLICY_IDS:-f0ff48bbb7bbe9d59a40f1ce90e9e9d0ff5002ec48f232b49ca0fb9a}
 
 services:
-
   blockfrost-ryo:
     environment:
       <<: *sdk-environment
       NODE_ENV: local-blockfrost-ryo
       BLOCKFROST_CONFIG_NETWORK: ${NETWORK:-mainnet}
       BLOCKFROST_CONFIG_TOKEN_REGISTRY_URL: ${TOKEN_METADATA_SERVER_URL:-https://tokens.cardano.org}
-
     volumes:
       - ./blockfrost/ryo:/app/config
-    profiles: [ blockfrost-ryo ]
 
   cardano-node:
     volumes:

diff --git a/packages/cardano-services/package.json b/packages/cardano-services/package.json
@@ -59,7 +59,7 @@
     "tscNoEmit": "echo typescript --noEmit command not implemented yet"
   },
   "devDependencies": {
-    "@cardano-ogmios/client": "6.5.0",
+    "@cardano-ogmios/client": "6.9.0",
     "@cardano-sdk/util-dev": "workspace:~",
     "@types/bunyan": "^1.8.8",
     "@types/cors": "^2.8.13",

diff --git a/packages/cardano-services/test/jest-setup/rebuild-test-db.sh b/packages/cardano-services/test/jest-setup/rebuild-test-db.sh
@@ -12,22 +12,22 @@ PASSWORD=$(cat $SECRETS_DIR/postgres_password)
 
 export DB_SYNC_CONNECTION_STRING="postgresql://${USER}:${PASSWORD}@localhost:5435/${DB_DB_SYNC}"
 
-# yarn cleanup
-# yarn
-# yarn build
-# yarn test:build:verify
+yarn cleanup
+yarn
+yarn build
+yarn test:build:verify
 
-# yarn workspace @cardano-sdk/e2e local-network:down
-# yarn workspace @cardano-sdk/e2e local-network:up -d --build
+yarn workspace @cardano-sdk/e2e local-network:down
+yarn workspace @cardano-sdk/e2e local-network:up -d --build
 
-# yarn workspace @cardano-sdk/e2e test:wallet
-# yarn workspace @cardano-sdk/e2e test:long-running simple-delegation-rewards.test.ts
-# yarn workspace @cardano-sdk/e2e test:local-network register-pool.test.ts
+yarn workspace @cardano-sdk/e2e test:wallet
+yarn workspace @cardano-sdk/e2e test:long-running simple-delegation-rewards.test.ts
+yarn workspace @cardano-sdk/e2e test:local-network register-pool.test.ts
 
-# TL_LEVEL="${TL_LEVEL:=info}" node "$SCRIPT_DIR/mint-handles.js"
+TL_LEVEL="${TL_LEVEL:=info}" node "$SCRIPT_DIR/mint-handles.js"
 
-echo 'DO NOT Stop providing data to projectors'
-# docker compose -p local-network-e2e stop cardano-node ogmios
+echo 'Stop providing data to projectors'
+docker compose -p local-network-e2e stop cardano-node ogmios
 sleep 2
 
 echo 'Creating snapshots...'
@@ -39,4 +39,4 @@ for DB_FILE in $(
 done
 echo 'Snapshots created.'
 
-# yarn workspace @cardano-sdk/e2e local-network:down
+yarn workspace @cardano-sdk/e2e local-network:down
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -57,8 +57,8 @@
   },
   "dependencies": {
     "@biglup/is-cid": "^1.0.3",
-    "@cardano-ogmios/client": "6.5.0",
-    "@cardano-ogmios/schema": "6.5.0",
+    "@cardano-ogmios/client": "6.9.0",
+    "@cardano-ogmios/schema": "6.9.0",
     "@cardano-sdk/crypto": "workspace:~",
     "@cardano-sdk/util": "workspace:~",
     "@foxglove/crc": "^0.0.3",

diff --git a/packages/core/src/CardanoNode/types/CardanoNodeErrors.ts b/packages/core/src/CardanoNode/types/CardanoNodeErrors.ts
@@ -97,6 +97,8 @@ export enum TxSubmissionErrorCode {
   UnauthorizedGovernanceAction = 3165,
   ReferenceScriptsTooLarge = 3166,
   UnknownVoters = 3167,
+  EmptyTreasuryWithdrawal = 3168,
+  UnexpectedMempoolError = 3997,
   UnrecognizedCertificateType = 3998,
   DeserialisationFailure = -32_602
 }

diff --git a/packages/crypto/package.json b/packages/crypto/package.json
@@ -37,7 +37,7 @@
     "prepack": "yarn build"
   },
   "devDependencies": {
-    "@cardano-ogmios/schema": "6.5.0",
+    "@cardano-ogmios/schema": "6.9.0",
     "@dcspark/cardano-multiplatform-lib-nodejs": "^3.1.1",
     "@types/blake2b": "^2.1.0",
     "@types/libsodium-wrappers-sumo": "^0.7.5",

diff --git a/packages/e2e/.env.example b/packages/e2e/.env.example
@@ -55,11 +55,6 @@ SCHEDULES="/config/schedules.json"
 # Required by test:long-running
 STAKE_POOL_PROJECTOR_URL='http://localhost:4002/'
 
-# PRE_CONWAY=stable starts the local-network in babbage era. If this variable is not set, the local-network will start in conway era.
-# TODO: Once conway era is stable, remove this variable and start the local-network in conway era by default.
-#
-# PRE_CONWAY=stable
-
 # NETWORK_SPEED (fast|slow) determines the timeout tests will use when for blockchain events, like transaction confirmation.
 # It should be configured to 'slow' when running against real networks like preprod.
 # The local-network slotLength is 0.2s when running in fast mode (default), and 1s when running in slow mode.

diff --git a/packages/e2e/docker-compose.yml b/packages/e2e/docker-compose.yml
@@ -27,7 +27,6 @@ services:
       CARDANO_NODE_LOG_LEVEL: ${CARDANO_NODE_LOG_LEVEL:-Info}
       CARDANO_NODE_CHAINDB_LOG_LEVEL: ${CARDANO_NODE_CHAINDB_LOG_LEVEL:-Notice}
       NETWORK_SPEED: ${NETWORK_SPEED:-fast}
-      PRE_CONWAY: ${PRE_CONWAY}
     ports:
       - 3001:3001
     volumes:

diff --git a/packages/e2e/local-network/Dockerfile b/packages/e2e/local-network/Dockerfile
@@ -5,8 +5,8 @@ FROM ubuntu:${UBUNTU_VERSION} AS builder
 ENV DEBIAN_FRONTEND=nonintercative
 
 WORKDIR /build
-ARG CARDANO_NODE_BUILD_URL=https://github.com/IntersectMBO/cardano-node/releases/download/9.1.1/cardano-node-9.1.1-linux.tar.gz
-ARG CARDANO_NODE_BUILD_URL_ARM64=https://github.com/input-output-hk/ogmios-tracker/releases/download/0.1.0/cardano-node-9.1.0-aarch64-linux.tar.gz
+ARG CARDANO_NODE_BUILD_URL=https://github.com/IntersectMBO/cardano-node/releases/download/10.1.2/cardano-node-10.1.2-linux.tar.gz
+ARG CARDANO_NODE_BUILD_URL_ARM64=https://github.com/input-output-hk/ogmios-tracker/releases/download/0.1.0/cardano-node-10.1.2-aarch64-linux.tar.gz
 
 RUN set -x && \
   apt-get update -y && \

diff --git a/packages/e2e/local-network/scripts/clean.sh b/packages/e2e/local-network/scripts/clean.sh
@@ -12,3 +12,5 @@ rm -rf ./network-files/node-sp*/*
 rm -rf ./sockets/*
 rm -rf ./config/*
 rm -rf ./logs/*
+rm -rf /sdk-ipc/config
+rm -rf /sdk-ipc/handle_policy_ids
diff --git a/packages/e2e/local-network/scripts/make-babbage.sh b/packages/e2e/local-network/scripts/make-babbage.sh
@@ -153,24 +153,8 @@ echo "TestConwayHardForkAtEpoch: 0" >> "${ROOT}/configuration.yaml"
 echo "ExperimentalHardForksEnabled: True" >> "${ROOT}/configuration.yaml"
 echo "ExperimentalProtocolsEnabled: True" >> "${ROOT}/configuration.yaml"
 
-# TODO: Remove once mainnet is hardforked to conway-era and we don't need to run the e2e tests on pre-conway too.
-# If we want the network to start in Babbage era we need to configure it to hardfork to Conway very far in the future.
-# We also need to update the conway transaction cli commands to babbage cli commands.
-if [ -n "$PRE_CONWAY" ]; then
-  echo "Updating scripts for pre-conway eras"
-  # Start in Babbage era
-  sed -i '/TestConwayHardForkAtEpoch/d' ./templates/babbage/node-config.json
-  sed -i '/TestConwayHardForkAtEpoch/d' ${ROOT}/configuration.yaml
-
-  # Convert all cardano-cli conway cmds to babbage
-  find ./scripts/ -type f -name "*.sh" -exec sed -i 's/cardano-cli conway /cardano-cli babbage /g' {} +
-
-  # Remove cardano-cli conway specific args
-  sed -i '/--key-reg-deposit-amt/d' ./scripts/setup-new-delegator-keys.sh
-fi
-
 # Copy the cost mode
-cardano-cli genesis create-staked --genesis-dir "${ROOT}" \
+cardano-cli latest genesis create-staked --genesis-dir "${ROOT}" \
   --testnet-magic "${NETWORK_MAGIC}" \
   --gen-pools ${NUM_SP_NODES} \
   --supply ${MAX_SUPPLY} \
@@ -308,9 +292,9 @@ sed_i -E "s/\"startTime\": [0-9]+/\"startTime\": ${timeUnix}/" ${ROOT}/genesis/b
 sed_i -E "s/\"systemStart\": \".*\"/\"systemStart\": \"${timeISO}\"/" ${ROOT}/genesis/shelley/genesis.json
 
 byronGenesisHash=$(cardano-cli byron genesis print-genesis-hash --genesis-json ${ROOT}/genesis/byron/genesis.json)
-shelleyGenesisHash=$(cardano-cli genesis hash --genesis ${ROOT}/genesis/shelley/genesis.json)
-alonzoGenesisHash=$(cardano-cli genesis hash --genesis ${ROOT}/genesis/shelley/genesis.alonzo.json)
-conwayGenesisHash=$(cardano-cli genesis hash --genesis ${ROOT}/genesis/shelley/genesis.conway.json)
+shelleyGenesisHash=$(cardano-cli latest genesis hash --genesis ${ROOT}/genesis/shelley/genesis.json)
+alonzoGenesisHash=$(cardano-cli latest genesis hash --genesis ${ROOT}/genesis/shelley/genesis.alonzo.json)
+conwayGenesisHash=$(cardano-cli latest genesis hash --genesis ${ROOT}/genesis/shelley/genesis.conway.json)
 
 echo "Byron genesis hash: $byronGenesisHash"
 echo "Shelley genesis hash: $shelleyGenesisHash"