Skip to content

Commit ba116c9

Browse files
authored
Merge pull request #751 from input-output-hk/chore/bump-ogmios
chore: bump Ogmios to v5.5.5, support new test networks
2 parents 65bf867 + ac7db4b commit ba116c9

20 files changed

+167
-57
lines changed

.github/workflows/post_integration.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
os: [ ubuntu-20.04 ]
13-
network: [ "mainnet", "testnet" ]
13+
network: [ "mainnet", "preprod", "preview" ]
1414

1515
runs-on: ${{ matrix.os }}
1616
steps:

.github/workflows/post_release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
os: [ ubuntu-20.04 ]
13-
network: [ "mainnet", "testnet" ]
13+
network: [ "mainnet", "preprod", "preview" ]
1414

1515
runs-on: ${{ matrix.os }}
1616
steps:

CHANGELOG.md

+40
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,46 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [7.0.0](https://github.com/input-output-hk/cardano-graphql/compare/6.2.0...7.0.0) (2022-08-19)
6+
7+
### Compatible with:
8+
9+
- [`cardano-node`: `1.35.3`](https://github.com/input-output-hk/cardano-node/releases/tag/1.35.3)
10+
- [`cardano-ogmios`: `v5.5.5`](https://github.com/CardanoSolutions/ogmios/releases/tag/v5.5.5)
11+
- [`cardano-db-sync`: `13.0.4`](https://github.com/input-output-hk/cardano-db-sync/releases/tag/13.0.4) - Note: The database must be recreated using the new version.
12+
- [`hasura/graphql-engine`: `1.3.3`](https://github.com/hasura/graphql-engine/releases/tag/v1.3.3)
13+
14+
### ⚠ BREAKING CHANGES
15+
16+
* collateral outputs
17+
* add ProtocolParams type to better represent current protocol params
18+
* remove remnants of previously deprecated config
19+
* Reward.receivedIn nullability
20+
* `Reward.stakePool` is now nullable to handle rewards of type
21+
`treasury` or `reserves`.
22+
23+
### Features
24+
25+
* add `TransactionOutput`|`CollateralOutput`.`paymentCredential` ([e6e2d45](https://github.com/input-output-hk/cardano-graphql/commit/e6e2d45cdd4c82f40495c39197f3ef79a287add2))
26+
* add Transaction.referenceInputs ([2c5e0b5](https://github.com/input-output-hk/cardano-graphql/commit/2c5e0b5409c783805ec8e0795f322bd1a3d154f7))
27+
* collateral outputs ([a222cb4](https://github.com/input-output-hk/cardano-graphql/commit/a222cb4305b6d3bbd96c1bf82d0252baa09f1af4))
28+
* support Babbage block ([fe484e1](https://github.com/input-output-hk/cardano-graphql/commit/fe484e1a607a61ac413df7736490ea0d6644c1e5))
29+
* support Plutus data ([58f6c48](https://github.com/input-output-hk/cardano-graphql/commit/58f6c48e5786ab97027c1c4ba2ae8a5554035408))
30+
* remove remnants of previously deprecated config ([c3fc2aa](https://github.com/input-output-hk/cardano-graphql/commit/c3fc2aabe0d29e50393906b2aa5947de9b6b0fc1))
31+
* update to Ogmios v5.5.0 cardano-db-sync 13.0.0 ([b821f21](https://github.com/input-output-hk/cardano-graphql/commit/b821f21ade1f1365f1fd4b4012bbb2c982a1fe9a))
32+
33+
34+
### Bug Fixes
35+
36+
* `Redeemer.fee` is nullable in the Babbage era ([813a7ae](https://github.com/input-output-hk/cardano-graphql/commit/813a7ae55b87a9c651cc7cb9e7e4e2141877e6fd))
37+
* add ProtocolParams type to better represent current protocol params ([73cf785](https://github.com/input-output-hk/cardano-graphql/commit/73cf785d266568b4f1c19025a025a22e228c9d7a))
38+
* **api-cardano-db-hasura:** define response as optional in metadata server errors ([ca5d556](https://github.com/input-output-hk/cardano-graphql/commit/ca5d556bcf0c2bd0b022ee3c293851b7ddd8f6f7))
39+
* **cli:** correct services option ([f600d31](https://github.com/input-output-hk/cardano-graphql/commit/f600d31028afe9d3452855be3e8638d56488e4f1))
40+
* gracefully shutdown cardano-db-sync ([2f02e56](https://github.com/input-output-hk/cardano-graphql/commit/2f02e562b26818e8c57ca1fde08a30daf3c4d436)), closes [/github.com/CardanoSolutions/ogmios/blob/c32341e56ccbeb1cf1e803d4607699668a1e2cc2/Dockerfile#L73](https://github.com/input-output-hk//github.com/CardanoSolutions/ogmios/blob/c32341e56ccbeb1cf1e803d4607699668a1e2cc2/Dockerfile/issues/L73)
41+
* Reward.receivedIn nullability ([9a3dcf5](https://github.com/input-output-hk/cardano-graphql/commit/9a3dcf538fb6878cb1977f308adb3aa8322408f6))
42+
* trim whitespace from credentials in server config ([b40a596](https://github.com/input-output-hk/cardano-graphql/commit/b40a5960c9c312141618c77106457d6bae1eeb87))
43+
44+
545
## [6.2.0](https://github.com/input-output-hk/cardano-graphql/compare/6.1.0...6.2.0) (2022-01-26)
646

747
### Compatible with:

README.md

+62-21
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Check the [releases] for the latest version.
4040
``` console
4141
git clone \
4242
--single-branch \
43-
--branch 6.2.0 \
43+
--branch 7.0.0 \
4444
--recurse-submodules \
4545
https://github.com/input-output-hk/cardano-graphql.git \
4646
&& cd cardano-graphql
@@ -61,28 +61,44 @@ Get the most recent weekly snapshot link [here](https://update-cardano-mainnet.i
6161
``` console
6262
DOCKER_BUILDKIT=1 \
6363
COMPOSE_DOCKER_CLI_BUILD=1 \
64-
RESTORE_SNAPSHOT=https://update-cardano-mainnet.iohk.io/cardano-db-sync/12/db-sync-snapshot-schema-12-block-6764999-x86_64.tgz \
64+
RESTORE_SNAPSHOT=https://update-cardano-mainnet.iohk.io/cardano-db-sync/13/db-sync-snapshot-schema-13-block-7643447-x86_64.tgz \
6565
docker-compose up -d --build &&\
6666
docker-compose logs -f
6767
```
6868
</details>
6969

7070
<details>
71-
<summary><i>testnet</i></summary>
71+
<summary><i>preprod</i></summary>
7272

73-
Get the most recent weekly snapshot link [here](https://updates-cardano-testnet.s3.amazonaws.com/cardano-db-sync/index.html#12/), and set it as `RESTORE_SNAPSHOT` below, or omit if you wish to sync from genesis.
7473
``` console
7574
DOCKER_BUILDKIT=1 \
7675
COMPOSE_DOCKER_CLI_BUILD=1 \
77-
NETWORK=testnet \
78-
RESTORE_SNAPSHOT=https://updates-cardano-testnet.s3.amazonaws.com/cardano-db-sync/12/db-sync-snapshot-schema-12-block-3185999-x86_64.tgz \
76+
NETWORK=preprod \
7977
API_PORT=3101 \
8078
HASURA_PORT=8091 \
8179
OGMIOS_PORT=1338 \
8280
POSTGRES_PORT=5433 \
8381
METADATA_SERVER_URI="https://metadata.cardano-testnet.iohkdev.io" \
84-
docker-compose -p testnet up -d --build &&\
85-
docker-compose -p testnet logs -f
82+
docker-compose -p preprod up -d --build &&\
83+
docker-compose -p preprod logs -f
84+
```
85+
86+
</details>
87+
88+
<details>
89+
<summary><i>preview</i></summary>
90+
91+
``` console
92+
DOCKER_BUILDKIT=1 \
93+
COMPOSE_DOCKER_CLI_BUILD=1 \
94+
NETWORK=preview \
95+
API_PORT=3102 \
96+
HASURA_PORT=8092 \
97+
OGMIOS_PORT=1339 \
98+
POSTGRES_PORT=5434 \
99+
METADATA_SERVER_URI="https://metadata.cardano-testnet.iohkdev.io" \
100+
docker-compose -p preview up -d --build &&\
101+
docker-compose -p preview logs -f
86102
```
87103

88104
</details>
@@ -98,25 +114,23 @@ your use-case.
98114
Get the most recent weekly snapshot link [here](https://update-cardano-mainnet.iohk.io/cardano-db-sync/index.html#11/), and set it as `RESTORE_SNAPSHOT` below, or omit if you wish to sync from genesis.
99115
``` console
100116
export NETWORK=mainnet &&\
101-
docker pull inputoutput/cardano-graphql:6.2.0-${NETWORK} &&\
102-
docker pull inputoutput/cardano-graphql-hasura:6.2.0 &&\
103-
docker pull cardanosolutions/cardano-node-ogmios:v5.5.0-${NETWORK} &&\
104-
RESTORE_SNAPSHOT=https://update-cardano-mainnet.iohk.io/cardano-db-sync/13/db-sync-snapshot-schema-13-block-6849999-x86_64.tgz \
117+
docker pull inputoutput/cardano-graphql:7.0.0-${NETWORK} &&\
118+
docker pull inputoutput/cardano-graphql-hasura:7.0.0 &&\
119+
docker pull cardanosolutions/cardano-node-ogmios:v5.5.5_1.35.3-${NETWORK} &&\
120+
RESTORE_SNAPSHOT=https://update-cardano-mainnet.iohk.io/cardano-db-sync/13/db-sync-snapshot-schema-13-block-7643447-x86_64.tgz \
105121
docker-compose up -d &&\
106122
docker-compose logs -f
107123
```
108124
</details>
109125

110126
<details>
111-
<summary><i>testnet</i></summary>
127+
<summary><i>preprod</i></summary>
112128

113-
Get the most recent weekly snapshot link [here](https://updates-cardano-testnet.s3.amazonaws.com/cardano-db-sync/index.html#11/), and set it as `RESTORE_SNAPSHOT` below, or omit if you wish to sync from genesis.
114129
``` console
115-
export NETWORK=testnet &&\
116-
docker pull inputoutput/cardano-graphql:6.2.0-${NETWORK} &&\
117-
docker pull inputoutput/cardano-graphql-hasura:6.2.0 &&\
118-
docker pull cardanosolutions/cardano-node-ogmios:v5.5.0-${NETWORK} &&\
119-
RESTORE_SNAPSHOT=https://updates-cardano-testnet.s3.amazonaws.com/cardano-db-sync/13/db-sync-snapshot-schema-13-block-3654385-x86_64.tgz \
130+
export NETWORK=preprod &&\
131+
docker pull inputoutput/cardano-graphql:7.0.0-${NETWORK} &&\
132+
docker pull inputoutput/cardano-graphql-hasura:7.0.0 &&\
133+
docker pull cardanosolutions/cardano-node-ogmios:v5.5.5_1.35.3-${NETWORK} &&\
120134
API_PORT=3101 \
121135
HASURA_PORT=8091 \
122136
OGMIOS_PORT=1338 \
@@ -127,6 +141,24 @@ docker-compose -p ${NETWORK} logs -f
127141

128142
</details>
129143

144+
<details>
145+
<summary><i>preview</i></summary>
146+
147+
``` console
148+
export NETWORK=preview &&\
149+
docker pull inputoutput/cardano-graphql:7.0.0-${NETWORK} &&\
150+
docker pull inputoutput/cardano-graphql-hasura:7.0.0 &&\
151+
docker pull cardanosolutions/cardano-node-ogmios:v5.5.5_1.35.3-${NETWORK} &&\
152+
API_PORT=3102 \
153+
HASURA_PORT=8092 \
154+
OGMIOS_PORT=1339 \
155+
POSTGRES_PORT=5434 \
156+
docker-compose -p ${NETWORK} up -d &&\
157+
docker-compose -p ${NETWORK} logs -f
158+
```
159+
160+
</details>
161+
130162
### Down
131163
The following commands will not remove volumes, however should you wish to do so, append `-v`
132164

@@ -139,10 +171,19 @@ docker-compose down
139171
</details>
140172

141173
<details>
142-
<summary><i>testnet</i></summary>
174+
<summary><i>preprod</i></summary>
175+
176+
``` console
177+
docker-compose -p preprod down
178+
```
179+
180+
</details>
181+
182+
<details>
183+
<summary><i>preview</i></summary>
143184

144185
``` console
145-
docker-compose -p testnet down
186+
docker-compose -p preview down
146187
```
147188

148189
</details>

config

Submodule config updated 42 files

docker-compose.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ services:
2727
cardano-node-ogmios:
2828
build:
2929
args:
30+
- CARDANO_CONFIG_REV=${CARDANO_CONFIG_REV:-303f3a3035c52eb753b533d53ef439c6b4cde9c9}
31+
- CARDANO_NODE_VERSION=${CARDANO_NODE_VERSION:-1.35.3}
3032
- NETWORK=${NETWORK:-mainnet}
3133
cache_from: [ cardanosolutions/cardano-node-ogmios:latest ]
3234
context: ./ogmios
33-
image: cardanosolutions/cardano-node-ogmios:${CARDANO_NODE_OGMIOS_VERSION:-v5.5.3_1.35.3}-${NETWORK:-mainnet}
35+
image: cardanosolutions/cardano-node-ogmios:${OGMIOS_VERSION:-v5.5.5}_${CARDANO_NODE_VERSION:-1.35.3}-${NETWORK:-mainnet}
3436
logging:
3537
driver: "json-file"
3638
options:
@@ -76,7 +78,7 @@ services:
7678
hasura:
7779
build:
7880
context: ./packages/api-cardano-db-hasura/hasura
79-
image: inputoutput/cardano-graphql-hasura:${CARDANO_GRAPHQL_VERSION:-6.2.0}
81+
image: inputoutput/cardano-graphql-hasura:${CARDANO_GRAPHQL_VERSION:-7.0.0}
8082
ports:
8183
- ${HASURA_PORT:-8090}:8080
8284
depends_on:
@@ -103,7 +105,7 @@ services:
103105
cache_from: [ inputoutput/cardano-graphql:latest ]
104106
context: .
105107
target: server
106-
image: inputoutput/cardano-graphql:${CARDANO_GRAPHQL_VERSION:-6.2.0}-${NETWORK:-mainnet}
108+
image: inputoutput/cardano-graphql:${CARDANO_GRAPHQL_VERSION:-7.0.0}-${NETWORK:-mainnet}
107109
environment:
108110
- ALLOW_INTROSPECTION=true
109111
- CACHE_ENABLED=true

ogmios

Submodule ogmios updated 129 files

package.json

+16-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"engines": {
55
"node": ">=14.15.0 <17.0.0"
66
},
7-
"version": "6.2.0",
7+
"version": "7.0.0",
88
"private": true,
99
"workspaces": [
1010
"packages/*"
@@ -21,16 +21,26 @@
2121
"mainnet:up": "yarn mainnet:stack && docker-compose -p mainnet logs -f",
2222
"mainnet:down": "docker-compose -p mainnet down --remove-orphans",
2323
"mainnet:server": "CONTEXT=$PWD NETWORK=mainnet . ./scripts/export_env.sh && yarn workspace @cardano-graphql/server start",
24+
"preprod:stack": "CONTEXT=$PWD NETWORK=preprod . ./scripts/export_env.sh && docker-compose -p preprod up --build -d",
25+
"preprod:dev": "CONTEXT=$PWD NETWORK=preprod . ./scripts/export_env.sh && yarn service-dependencies -p preprod up --build",
26+
"preprod:up": "yarn preprod:stack && docker-compose -p preprod logs -f",
27+
"preprod:down": "docker-compose -p preprod down --remove-orphans",
28+
"preprod:server": "CONTEXT=$PWD NETWORK=preprod . ./scripts/export_env.sh && yarn workspace @cardano-graphql/server start",
29+
"preview:stack": "CONTEXT=$PWD NETWORK=preview . ./scripts/export_env.sh && docker-compose -p preview up --build -d",
30+
"preview:dev": "CONTEXT=$PWD NETWORK=preview . ./scripts/export_env.sh && yarn service-dependencies -p preview up --build",
31+
"preview:up": "yarn preview:stack && docker-compose -p preview logs -f",
32+
"preview:down": "docker-compose -p preview down --remove-orphans",
33+
"preview:server": "CONTEXT=$PWD NETWORK=preview . ./scripts/export_env.sh && yarn workspace @cardano-graphql/server start",
2434
"testnet:stack": "CONTEXT=$PWD NETWORK=testnet . ./scripts/export_env.sh && docker-compose -p testnet up --build -d",
2535
"testnet:dev": "CONTEXT=$PWD NETWORK=testnet . ./scripts/export_env.sh && yarn service-dependencies -p testnet up --build",
2636
"testnet:up": "yarn testnet:stack && docker-compose -p testnet logs -f",
2737
"testnet:down": "docker-compose -p testnet down --remove-orphans",
2838
"testnet:server": "CONTEXT=$PWD NETWORK=testnet . ./scripts/export_env.sh && yarn workspace @cardano-graphql/server start",
29-
"alonzo-qa:stack": "CONTEXT=$PWD NETWORK=alonzo-qa . ./scripts/export_env.sh && docker-compose -p alonzo-qa up --build -d",
30-
"alonzo-qa:dev": "CONTEXT=$PWD NETWORK=alonzo-qa . ./scripts/export_env.sh && yarn service-dependencies -p alonzo-qa up --build",
31-
"alonzo-qa:up": "yarn alonzo-qa:stack && docker-compose -p alonzo-qa logs -f",
32-
"alonzo-qa:down": "docker-compose -p alonzo-qa down --remove-orphans",
33-
"alonzo-qa:server": "CONTEXT=$PWD NETWORK=alonzo-qa . ./scripts/export_env.sh && yarn workspace @cardano-graphql/server start",
39+
"vasil-dev:stack": "CONTEXT=$PWD NETWORK=vasil-dev . ./scripts/export_env.sh && docker-compose -p vasil-dev up --build -d",
40+
"vasil-dev:dev": "CONTEXT=$PWD NETWORK=vasil-dev . ./scripts/export_env.sh && yarn service-dependencies -p vasil-dev up --build",
41+
"vasil-dev:up": "yarn vasil-dev:stack && docker-compose -p vasil-dev logs -f",
42+
"vasil-dev:down": "docker-compose -p vasil-dev down --remove-orphans",
43+
"vasil-dev:server": "CONTEXT=$PWD NETWORK=vasil-dev . ./scripts/export_env.sh && yarn workspace @cardano-graphql/server start",
3444
"lint": "yarn workspaces run lint",
3545
"loadtest:byron-staging": "artillery run test/loadtest/byron-staging-config.yml",
3646
"publish-packages": "yarn workspaces run publish",
-58.6 KB
Binary file not shown.
58.6 KB
Binary file not shown.
-22.6 KB
Binary file not shown.
22.6 KB
Binary file not shown.

packages/api-cardano-db-hasura/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cardano-graphql/api-cardano-db-hasura",
3-
"version": "6.2.0",
3+
"version": "7.0.0",
44
"description": "Module for interfacing with the Cardano DB, populated by cardano-db-sync that utilises Hasura for a powerful query interface",
55
"main": "dist/index.js",
66
"typings": "dist/index.d.ts",
@@ -32,8 +32,8 @@
3232
"schema.graphql"
3333
],
3434
"dependencies": {
35-
"@cardano-graphql/util": "6.2.0",
36-
"@cardano-ogmios/client": "5.5.1",
35+
"@cardano-graphql/util": "7.0.0",
36+
"@cardano-ogmios/client": "5.5.5",
3737
"@cardanosolutions/json-bigint": "^1.0.0",
3838
"@emurgo/cip14-js": "^2.0.0",
3939
"@graphql-tools/delegate": "^6.0.10",
@@ -64,7 +64,7 @@
6464
"ts-log": "^2.2.3"
6565
},
6666
"devDependencies": {
67-
"@cardano-graphql/util-dev": "6.2.0",
67+
"@cardano-graphql/util-dev": "7.0.0",
6868
"@graphql-codegen/cli": "^1.15.2",
6969
"@graphql-codegen/typescript": "^1.15.2",
7070
"@graphql-codegen/typescript-graphql-files-modules": "^1.15.2",

packages/cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cardano-graphql/cli",
3-
"version": "6.2.0",
3+
"version": "7.0.0",
44
"description": "Management tool for managing a Cardano GraphQL deployment",
55
"main": "./dist/index.js",
66
"bin": {

packages/client-ts/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cardano-graphql/client-ts",
3-
"version": "6.2.0",
3+
"version": "7.0.0",
44
"description": "A client package for Cardano GraphQL, including the GraphQL schema and TypeScript definitions generated from it",
55
"repository": {
66
"type": "git",

packages/server/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cardano-graphql/server",
3-
"version": "6.2.0",
3+
"version": "7.0.0",
44
"description": "Serve the Cardano GraphQL API over HTTP",
55
"main": "dist/index.js",
66
"typings": "dist/index.d.ts",
@@ -24,8 +24,8 @@
2424
},
2525
"homepage": "https://github.com/input-output-hk/cardano-graphql/blob/master/packages/server/README.md",
2626
"dependencies": {
27-
"@cardano-graphql/api-cardano-db-hasura": "6.2.0",
28-
"@cardano-ogmios/schema": "5.5.1",
27+
"@cardano-graphql/api-cardano-db-hasura": "7.0.0",
28+
"@cardano-ogmios/schema": "5.5.5",
2929
"@graphql-tools/merge": "^6.0.10",
3030
"apollo-metrics": "^1.0.1",
3131
"apollo-server-core": "^2.14.3",
@@ -46,7 +46,7 @@
4646
"ts-log": "^2.2.3"
4747
},
4848
"devDependencies": {
49-
"@cardano-graphql/util-dev": "6.2.0",
49+
"@cardano-graphql/util-dev": "7.0.0",
5050
"@graphql-codegen/cli": "^1.15.2",
5151
"@types/death": "^1.1.1",
5252
"@types/fs-extra": "^9.0.1",

packages/util-dev/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cardano-graphql/util-dev",
3-
"version": "6.2.0",
3+
"version": "7.0.0",
44
"description": "Common development utilities",
55
"main": "dist/index.js",
66
"typings": "dist/index.d.ts",
@@ -22,7 +22,7 @@
2222
},
2323
"homepage": "https://github.com/input-output-hk/cardano-graphql/blob/master/packages/util-dev/README.md",
2424
"devDependencies": {
25-
"@cardano-graphql/util": "6.2.0",
25+
"@cardano-graphql/util": "7.0.0",
2626
"shx": "^0.3.2"
2727
},
2828
"directories": {

packages/util/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cardano-graphql/util",
3-
"version": "6.2.0",
3+
"version": "7.0.0",
44
"description": "Common utilities",
55
"main": "dist/index.js",
66
"typings": "dist/index.d.ts",

0 commit comments

Comments
 (0)