Skip to content

Commit dea40cc

Browse files
mirceahaseganmirceahasegan
authored
Merge pull request #1522 from input-output-hk/chore/upgrade-node-10
Chore/upgrade node 10
2 parents 7863819 + d5674cd commit dea40cc

35 files changed

+341
-264
lines changed

‎.github/workflows/continuous-integration-blockfrost-e2e.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ env:
2929
WS_PROVIDER_URL: 'http://localhost:4100/ws'
3030

3131
on:
32-
pull_request:
33-
push:
34-
branches: ['master']
35-
tags: ['*.*.*']
32+
workflow_dispatch:
3633

3734
jobs:
3835
build_and_test:

‎compose/aarch64.yml

Lines changed: 4 additions & 4 deletions
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:-13.3.0.0}
5+
image: ghcr.io/input-output-hk/ogmios-tracker/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-13.6.0.0-pre}
66
cardano-node:
7-
image: ghcr.io/input-output-hk/ogmios-tracker/cardano-node:${CARDANO_NODE_VERSION:-9.1.0}
7+
image: ghcr.io/input-output-hk/ogmios-tracker/cardano-node:${CARDANO_NODE_VERSION:-10.1.2}
88
ogmios:
9-
image: ghcr.io/input-output-hk/ogmios-tracker/ogmios:v${OGMIOS_VERSION:-6.5.0}
9+
image: ghcr.io/input-output-hk/ogmios-tracker/ogmios:v${OGMIOS_VERSION:-6.9.0}
1010
cardano-submit-api:
11-
image: ghcr.io/input-output-hk/ogmios-tracker/cardano-submit-api:${CARDANO_NODE_VERSION:-9.1.0}
11+
image: ghcr.io/input-output-hk/ogmios-tracker/cardano-submit-api:${CARDANO_NODE_VERSION:-10.1.2}

‎compose/common.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ x-sdk-environment: &sdk-environment
121121
services:
122122
blockfrost-ryo:
123123
build:
124-
context: 'https://github.com/ginnun/blockfrost-backend-ryo.git#feat/custom-network-support'
124+
context: 'https://github.com/mirceahasegan/blockfrost-backend-ryo.git#feat/custom-network-support'
125125
dockerfile: Dockerfile
126126
environment:
127127
BLOCKFROST_CONFIG_SERVER_LISTEN_ADDRESS: 0.0.0.0
@@ -179,7 +179,7 @@ services:
179179

180180
cardano-node:
181181
<<: *logging
182-
image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-9.1.1}
182+
image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-10.1.2}
183183
command:
184184
[
185185
'run',
@@ -199,7 +199,7 @@ services:
199199

200200
ogmios:
201201
<<: *logging
202-
image: cardanosolutions/ogmios:v${OGMIOS_VERSION:-6.5.0}
202+
image: cardanosolutions/ogmios:v${OGMIOS_VERSION:-6.9.0}
203203
command:
204204
[
205205
'--host',
@@ -225,7 +225,7 @@ services:
225225

226226
cardano-submit-api:
227227
command: --config /config/cardano-submit-api/config.json --listen-address 0.0.0.0 --socket-path /ipc/node.socket $SUBMIT_API_ARGS
228-
image: ghcr.io/intersectmbo/cardano-submit-api:${CARDANO_NODE_VERSION:-9.1.1}
228+
image: ghcr.io/intersectmbo/cardano-submit-api:${CARDANO_NODE_VERSION:-10.1.2}
229229
ports:
230230
- 8090:8090
231231
restart: on-failure

‎compose/pg-agent.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3.9'
2-
31
x-logging: &logging
42
logging:
53
driver: 'json-file'

‎packages/cardano-services/config/.gitrepo

Lines changed: 2 additions & 2 deletions
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 = 7969a73e5c7ee1f3b2a40274b34191fdd8de170b
10-
parent = 6c74e3abdf0ff29b448d94136b8d59c8975ad615
9+
commit = 3c5f35bda1b8fd29ab310ad222403a9167f512de
10+
parent = 846a0eeb6248aca9c9b9481675144d380980bfcb
1111
method = merge
1212
cmdver = 0.4.6

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"port": 3001
66
},
77
{
8-
"address": "backbone.mainnet.emurgornd.com",
8+
"address": "backbone.mainnet.cardanofoundation.org",
99
"port": 3001
1010
},
1111
{
12-
"address": "backbone.mainnet.cardanofoundation.org",
12+
"address": "backbone.mainnet.emurgornd.com",
1313
"port": 3001
1414
}
1515
],

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
"ByronGenesisFile": "../genesis/byron.json",
55
"ByronGenesisHash": "785eb88427e136378a15b0a152a8bfbeec7a611529ccda29c43a1e60ffb48eaa",
66
"ConwayGenesisFile": "../genesis/conway.json",
7-
"ConwayGenesisHash": "e85ee5b7af8ca5c273c20746c9f994aef1a72a79c38b4eea230817e7e66c0741",
7+
"ConwayGenesisHash": "ff31343b814adddfdcaceb76f635647e2b7d1adfc0ddac7c40b70cbdcd82fed9",
88
"EnableP2P": true,
99
"ExperimentalHardForksEnabled": true,
1010
"ExperimentalProtocolsEnabled": true,
1111
"LastKnownBlockVersion-Alt": 0,
1212
"LastKnownBlockVersion-Major": 3,
1313
"LastKnownBlockVersion-Minor": 1,
14-
"MinNodeVersion": "8.12.0",
14+
"MinNodeVersion": "10.0.0",
1515
"PeerSharing": true,
1616
"Protocol": "Cardano",
1717
"RequiresNetworkMagic": "RequiresMagic",

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

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"poolVotingThresholds": {
3-
"committeeNormal": 0.65,
4-
"committeeNoConfidence": 0.65,
3+
"committeeNormal": 0.51,
4+
"committeeNoConfidence": 0.51,
55
"hardForkInitiation": 0.51,
6-
"motionNoConfidence": 0.6,
7-
"ppSecurityGroup": 0.6
6+
"motionNoConfidence": 0.51,
7+
"ppSecurityGroup": 0.51
88
},
99
"dRepVotingThresholds": {
1010
"motionNoConfidence": 0.67,
1111
"committeeNormal": 0.67,
12-
"committeeNoConfidence": 0.65,
12+
"committeeNoConfidence": 0.6,
1313
"updateToConstitution": 0.75,
1414
"hardForkInitiation": 0.6,
1515
"ppNetworkGroup": 0.67,
@@ -18,9 +18,9 @@
1818
"ppGovGroup": 0.75,
1919
"treasuryWithdrawal": 0.67
2020
},
21-
"committeeMinSize": 5,
22-
"committeeMaxTermLength": 146,
23-
"govActionLifetime": 14,
21+
"committeeMinSize": 0,
22+
"committeeMaxTermLength": 1000,
23+
"govActionLifetime": 60,
2424
"govActionDeposit": 100000000000,
2525
"dRepDeposit": 500000000,
2626
"dRepActivity": 20,
@@ -279,20 +279,19 @@
279279
1
280280
],
281281
"constitution": {
282-
"anchor": {
283-
"url": "ipfs://QmQq5hWDNzvDR1ForEktAHrdCQmfSL2u5yctNpzDwoSBu4",
284-
"dataHash": "23b43bebac48a4acc39e578715aa06635d6d900fa3ea7441dfffd6e43b914f7b"
285-
},
286-
"script": "edcd84c10e36ae810dc50847477083069db796219b39ccde790484e0"
282+
"anchor": {
283+
"dataHash": "ca41a91f399259bcefe57f9858e91f6d00e1a38d6d9c63d4052914ea7bd70cb2",
284+
"url": "ipfs://bafkreifnwj6zpu3ixa4siz2lndqybyc5wnnt3jkwyutci4e2tmbnj3xrdm"
285+
},
286+
"script": "fa24fb305126805cf2164c161d852a0e7330cf988f1fe558cf7d4a64"
287287
},
288288
"committee": {
289289
"members": {
290-
"scriptHash-7ceede7d6a89e006408e6b7c6acb3dd094b3f6817e43b4a36d01535b": 500,
291-
"scriptHash-6095e643ea6f1cccb6e463ec34349026b3a48621aac5d512655ab1bf": 500,
292-
"scriptHash-27999ed757d6dac217471ae61d69b1b067b8b240d9e3ff36eb66b5d0": 500,
293-
"scriptHash-87f867a31c0f81360d4d7dcddb6b025ba8383db9bf77a2af7797799d": 500,
294-
"scriptHash-a19a7ba1caede8f3ab3e5e2a928b3798d7d011af18fbd577f7aeb0ec": 500
290+
"keyHash-77c0a65f9302bccab35b44adc1823cb66c88a66c97cf3de8236dd718": 1000
295291
},
296-
"threshold": 0.67
292+
"threshold": {
293+
"numerator": 2,
294+
"denominator": 3
295+
}
297296
}
298297
}

‎packages/cardano-services/docker-compose.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,14 @@ x-sdk-environment: &sdk-environment
99
HANDLE_POLICY_IDS: ${HANDLE_POLICY_IDS:-f0ff48bbb7bbe9d59a40f1ce90e9e9d0ff5002ec48f232b49ca0fb9a}
1010

1111
services:
12-
1312
blockfrost-ryo:
1413
environment:
1514
<<: *sdk-environment
1615
NODE_ENV: local-blockfrost-ryo
1716
BLOCKFROST_CONFIG_NETWORK: ${NETWORK:-mainnet}
1817
BLOCKFROST_CONFIG_TOKEN_REGISTRY_URL: ${TOKEN_METADATA_SERVER_URL:-https://tokens.cardano.org}
19-
2018
volumes:
2119
- ./blockfrost/ryo:/app/config
22-
profiles: [ blockfrost-ryo ]
2320

2421
cardano-node:
2522
volumes:

‎packages/cardano-services/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"tscNoEmit": "echo typescript --noEmit command not implemented yet"
6060
},
6161
"devDependencies": {
62-
"@cardano-ogmios/client": "6.5.0",
62+
"@cardano-ogmios/client": "6.9.0",
6363
"@cardano-sdk/util-dev": "workspace:~",
6464
"@types/bunyan": "^1.8.8",
6565
"@types/cors": "^2.8.13",

‎packages/cardano-services/test/jest-setup/rebuild-test-db.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ PASSWORD=$(cat $SECRETS_DIR/postgres_password)
1212

1313
export DB_SYNC_CONNECTION_STRING="postgresql://${USER}:${PASSWORD}@localhost:5435/${DB_DB_SYNC}"
1414

15-
# yarn cleanup
16-
# yarn
17-
# yarn build
18-
# yarn test:build:verify
15+
yarn cleanup
16+
yarn
17+
yarn build
18+
yarn test:build:verify
1919

20-
# yarn workspace @cardano-sdk/e2e local-network:down
21-
# yarn workspace @cardano-sdk/e2e local-network:up -d --build
20+
yarn workspace @cardano-sdk/e2e local-network:down
21+
yarn workspace @cardano-sdk/e2e local-network:up -d --build
2222

23-
# yarn workspace @cardano-sdk/e2e test:wallet
24-
# yarn workspace @cardano-sdk/e2e test:long-running simple-delegation-rewards.test.ts
25-
# yarn workspace @cardano-sdk/e2e test:local-network register-pool.test.ts
23+
yarn workspace @cardano-sdk/e2e test:wallet
24+
yarn workspace @cardano-sdk/e2e test:long-running simple-delegation-rewards.test.ts
25+
yarn workspace @cardano-sdk/e2e test:local-network register-pool.test.ts
2626

27-
# TL_LEVEL="${TL_LEVEL:=info}" node "$SCRIPT_DIR/mint-handles.js"
27+
TL_LEVEL="${TL_LEVEL:=info}" node "$SCRIPT_DIR/mint-handles.js"
2828

29-
echo 'DO NOT Stop providing data to projectors'
30-
# docker compose -p local-network-e2e stop cardano-node ogmios
29+
echo 'Stop providing data to projectors'
30+
docker compose -p local-network-e2e stop cardano-node ogmios
3131
sleep 2
3232

3333
echo 'Creating snapshots...'
@@ -39,4 +39,4 @@ for DB_FILE in $(
3939
done
4040
echo 'Snapshots created.'
4141

42-
# yarn workspace @cardano-sdk/e2e local-network:down
42+
yarn workspace @cardano-sdk/e2e local-network:down

‎packages/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
},
5858
"dependencies": {
5959
"@biglup/is-cid": "^1.0.3",
60-
"@cardano-ogmios/client": "6.5.0",
61-
"@cardano-ogmios/schema": "6.5.0",
60+
"@cardano-ogmios/client": "6.9.0",
61+
"@cardano-ogmios/schema": "6.9.0",
6262
"@cardano-sdk/crypto": "workspace:~",
6363
"@cardano-sdk/util": "workspace:~",
6464
"@foxglove/crc": "^0.0.3",

‎packages/core/src/CardanoNode/types/CardanoNodeErrors.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ export enum TxSubmissionErrorCode {
9797
UnauthorizedGovernanceAction = 3165,
9898
ReferenceScriptsTooLarge = 3166,
9999
UnknownVoters = 3167,
100+
EmptyTreasuryWithdrawal = 3168,
101+
UnexpectedMempoolError = 3997,
100102
UnrecognizedCertificateType = 3998,
101103
DeserialisationFailure = -32_602
102104
}

‎packages/crypto/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"prepack": "yarn build"
3838
},
3939
"devDependencies": {
40-
"@cardano-ogmios/schema": "6.5.0",
40+
"@cardano-ogmios/schema": "6.9.0",
4141
"@dcspark/cardano-multiplatform-lib-nodejs": "^3.1.1",
4242
"@types/blake2b": "^2.1.0",
4343
"@types/libsodium-wrappers-sumo": "^0.7.5",

‎packages/e2e/.env.example

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@ SCHEDULES="/config/schedules.json"
5555
# Required by test:long-running
5656
STAKE_POOL_PROJECTOR_URL='http://localhost:4002/'
5757

58-
# PRE_CONWAY=stable starts the local-network in babbage era. If this variable is not set, the local-network will start in conway era.
59-
# TODO: Once conway era is stable, remove this variable and start the local-network in conway era by default.
60-
#
61-
# PRE_CONWAY=stable
62-
6358
# NETWORK_SPEED (fast|slow) determines the timeout tests will use when for blockchain events, like transaction confirmation.
6459
# It should be configured to 'slow' when running against real networks like preprod.
6560
# The local-network slotLength is 0.2s when running in fast mode (default), and 1s when running in slow mode.

‎packages/e2e/docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ services:
2727
CARDANO_NODE_LOG_LEVEL: ${CARDANO_NODE_LOG_LEVEL:-Info}
2828
CARDANO_NODE_CHAINDB_LOG_LEVEL: ${CARDANO_NODE_CHAINDB_LOG_LEVEL:-Notice}
2929
NETWORK_SPEED: ${NETWORK_SPEED:-fast}
30-
PRE_CONWAY: ${PRE_CONWAY}
3130
ports:
3231
- 3001:3001
3332
volumes:

‎packages/e2e/local-network/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ FROM ubuntu:${UBUNTU_VERSION} AS builder
55
ENV DEBIAN_FRONTEND=nonintercative
66

77
WORKDIR /build
8-
ARG CARDANO_NODE_BUILD_URL=https://github.com/IntersectMBO/cardano-node/releases/download/9.1.1/cardano-node-9.1.1-linux.tar.gz
9-
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
8+
ARG CARDANO_NODE_BUILD_URL=https://github.com/IntersectMBO/cardano-node/releases/download/10.1.2/cardano-node-10.1.2-linux.tar.gz
9+
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
1010

1111
RUN set -x && \
1212
apt-get update -y && \

‎packages/e2e/local-network/scripts/clean.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ rm -rf ./network-files/node-sp*/*
1212
rm -rf ./sockets/*
1313
rm -rf ./config/*
1414
rm -rf ./logs/*
15+
rm -rf /sdk-ipc/config
16+
rm -rf /sdk-ipc/handle_policy_ids

‎packages/e2e/local-network/scripts/make-babbage.sh

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -153,24 +153,8 @@ echo "TestConwayHardForkAtEpoch: 0" >> "${ROOT}/configuration.yaml"
153153
echo "ExperimentalHardForksEnabled: True" >> "${ROOT}/configuration.yaml"
154154
echo "ExperimentalProtocolsEnabled: True" >> "${ROOT}/configuration.yaml"
155155

156-
# TODO: Remove once mainnet is hardforked to conway-era and we don't need to run the e2e tests on pre-conway too.
157-
# If we want the network to start in Babbage era we need to configure it to hardfork to Conway very far in the future.
158-
# We also need to update the conway transaction cli commands to babbage cli commands.
159-
if [ -n "$PRE_CONWAY" ]; then
160-
echo "Updating scripts for pre-conway eras"
161-
# Start in Babbage era
162-
sed -i '/TestConwayHardForkAtEpoch/d' ./templates/babbage/node-config.json
163-
sed -i '/TestConwayHardForkAtEpoch/d' ${ROOT}/configuration.yaml
164-
165-
# Convert all cardano-cli conway cmds to babbage
166-
find ./scripts/ -type f -name "*.sh" -exec sed -i 's/cardano-cli conway /cardano-cli babbage /g' {} +
167-
168-
# Remove cardano-cli conway specific args
169-
sed -i '/--key-reg-deposit-amt/d' ./scripts/setup-new-delegator-keys.sh
170-
fi
171-
172156
# Copy the cost mode
173-
cardano-cli genesis create-staked --genesis-dir "${ROOT}" \
157+
cardano-cli latest genesis create-staked --genesis-dir "${ROOT}" \
174158
--testnet-magic "${NETWORK_MAGIC}" \
175159
--gen-pools ${NUM_SP_NODES} \
176160
--supply ${MAX_SUPPLY} \
@@ -308,9 +292,9 @@ sed_i -E "s/\"startTime\": [0-9]+/\"startTime\": ${timeUnix}/" ${ROOT}/genesis/b
308292
sed_i -E "s/\"systemStart\": \".*\"/\"systemStart\": \"${timeISO}\"/" ${ROOT}/genesis/shelley/genesis.json
309293

310294
byronGenesisHash=$(cardano-cli byron genesis print-genesis-hash --genesis-json ${ROOT}/genesis/byron/genesis.json)
311-
shelleyGenesisHash=$(cardano-cli genesis hash --genesis ${ROOT}/genesis/shelley/genesis.json)
312-
alonzoGenesisHash=$(cardano-cli genesis hash --genesis ${ROOT}/genesis/shelley/genesis.alonzo.json)
313-
conwayGenesisHash=$(cardano-cli genesis hash --genesis ${ROOT}/genesis/shelley/genesis.conway.json)
295+
shelleyGenesisHash=$(cardano-cli latest genesis hash --genesis ${ROOT}/genesis/shelley/genesis.json)
296+
alonzoGenesisHash=$(cardano-cli latest genesis hash --genesis ${ROOT}/genesis/shelley/genesis.alonzo.json)
297+
conwayGenesisHash=$(cardano-cli latest genesis hash --genesis ${ROOT}/genesis/shelley/genesis.conway.json)
314298

315299
echo "Byron genesis hash: $byronGenesisHash"
316300
echo "Shelley genesis hash: $shelleyGenesisHash"

0 commit comments

Comments
 (0)