Skip to content

Commit

Permalink
chore: bump cardano-configurations, cardano-node, support new testnets
Browse files Browse the repository at this point in the history
- Updates `vasil-dev` to the re-spun genesis
- Removes `vasil-qa`
- Adds `preprod` and `preview`
- `1.35.2` -> `1.35.3`
- Fix vasil-dev config parsing + add new 'preview' and 'preprod' networks.

  Ogmios.Options
    parseNetworkParameters
      mainnet [✔]
      testnet [✔]
      vasil-dev [✔]
      preview [✔]
      preprod [✔]
  • Loading branch information
rhyslbw committed Aug 19, 2022
1 parent 42895be commit aff6878
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 10 deletions.
1 change: 1 addition & 0 deletions .github/workflows/network-synchronization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ jobs:
with:
db-dir: ${{ runner.temp }}/db-${{ matrix.network }}
network: ${{ matrix.network }}
version: v5.5.4_1.35.2
4 changes: 2 additions & 2 deletions .github/workflows/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ jobs:
matrix:
os: [ ubuntu-20.04 ]
target: [ ogmios, cardano-node-ogmios ]
network: [ "mainnet", "testnet", "vasil-dev" ]
cardano_node_version: [ "1.35.2" ]
network: [ "mainnet", "preprod", "preview" ]
cardano_node_version: [ "1.35.3" ]

runs-on: ${{ matrix.os }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
# ------------------------------- SETUP ------------------------------------- #
# #

ARG CARDANO_NODE_VERSION=1.35.2
ARG CARDANO_NODE_VERSION=1.35.3

FROM nixos/nix:2.3.11 as build

ARG CARDANO_CONFIG_REV=08e6c0572d5d48049fab521995b29607e0a91a9e
ARG CARDANO_CONFIG_REV=f1263df513f4cc5666bc49245e07fd3055097fee

RUN echo "substituters = https://cache.nixos.org https://hydra.iohk.io" >> /etc/nix/nix.conf &&\
echo "trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" >> /etc/nix/nix.conf
Expand Down
4 changes: 2 additions & 2 deletions clients/TypeScript/packages/schema/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ export type SubmitTxError = (
)[];
export type RedeemerPointer = string;
/**
* Errors whcih may occur when evaluating an on-chain script.
* Errors which may occur when evaluating an on-chain script.
*/
export type ScriptFailure = (
| ExtraRedeemers
Expand Down Expand Up @@ -322,7 +322,7 @@ export type GetChainTip = "chainTip";
export type GetBlockHeight = "blockHeight";
export type GetSystemStart = "systemStart";
/**
* A time in seconds relative to another one (typically, system start or era start).
* A time in seconds relative to another one (typically, system start or era start). Starting from v5.5.4, this can be a floating number. Before v5.5.4, the floating value would be rounded to the nearest second.
*/
export type RelativeTime = number;
/**
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.5"

services:
cardano-node:
image: inputoutput/cardano-node:1.35.2
image: inputoutput/cardano-node:1.35.3
command: [
"run",
"--config", "/config/config.json",
Expand Down
2 changes: 1 addition & 1 deletion docs/static/ogmios.wsp.json
Original file line number Diff line number Diff line change
Expand Up @@ -4005,7 +4005,7 @@

, "ScriptFailure":
{ "type": "array"
, "description": "Errors whcih may occur when evaluating an on-chain script."
, "description": "Errors which may occur when evaluating an on-chain script."
, "items":
{ "oneOf":
[ { "$ref": "#/definitions/SubmitTxError[extraRedeemers]" }
Expand Down
14 changes: 13 additions & 1 deletion server/test/unit/Ogmios/OptionsSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,20 @@ spec = parallel $ do
specify "vasil-dev" $ do
params <- parseNetworkParameters (getConfigFile "vasil-dev")
networkMagic params `shouldBe` NetworkMagic 9
systemStart params `shouldBe` mkSystemStart 1654524000
systemStart params `shouldBe` mkSystemStart 1659636000
slotsPerEpoch params `shouldBe` EpochSlots 360

specify "preview" $ do
params <- parseNetworkParameters (getConfigFile "preview")
networkMagic params `shouldBe` NetworkMagic 2
systemStart params `shouldBe` mkSystemStart 1660003200
slotsPerEpoch params `shouldBe` EpochSlots 4320

specify "preprod" $ do
params <- parseNetworkParameters (getConfigFile "preprod")
networkMagic params `shouldBe` NetworkMagic 1
systemStart params `shouldBe` mkSystemStart 1654041600
slotsPerEpoch params `shouldBe` EpochSlots 21600
where
matrix =
[ ( [], shouldFail )
Expand Down

0 comments on commit aff6878

Please sign in to comment.