Skip to content

Commit

Permalink
Merge branch 'v6.0'
Browse files Browse the repository at this point in the history
  Fixes #341.
  • Loading branch information
KtorZ committed Oct 18, 2023
2 parents 1bb60fa + 62d21dd commit 594faae
Show file tree
Hide file tree
Showing 99 changed files with 1,270 additions and 325 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/continuous-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
matrix:
os: [ linux ]
arch: [ x86_64 ]
compiler: [ ghc8107 ]
compiler: [ ghc810 ]

runs-on: ${{ matrix.os == 'linux' && matrix.arch == 'aarch64' && 'buildjet-4vcpu-ubuntu-2204-arm' || 'ubuntu-latest' }}

Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
- name: 🔨 Build
working-directory: server
run: |
nix develop github:input-output-hk/devx#${{ matrix.compiler }}-static-minimal-iog --no-write-lock-file --refresh --command bash -c "cabal build ogmios:exe:ogmios"
nix develop github:input-output-hk/devx#${{ matrix.compiler }}-static-minimal-iog --no-write-lock-file --refresh --command bash -c "cabal build --enable-executable-static ogmios:exe:ogmios"
env:
GIT_SHA: ${{ github.sha }}

Expand All @@ -85,7 +85,7 @@ jobs:
- name: 📦 Package
run: |
mkdir -p bin
cp ./server/dist-newstyle/build/${{ matrix.arch }}-${{ matrix.os }}/ghc-${{ matrix.compiler == 'ghc8107' && '8.10.7' }}/ogmios-${{ steps.version.outputs.version }}/x/ogmios/build/ogmios/ogmios ./bin/ogmios
cp ./server/dist-newstyle/build/${{ matrix.arch }}-${{ matrix.os }}/ghc-${{ matrix.compiler == 'ghc810' && '8.10.7' }}/ogmios-${{ steps.version.outputs.version }}/x/ogmios/build/ogmios/ogmios ./bin/ogmios
mkdir -p share && chmod +w share
mkdir -p share/zsh/site-functions
./bin/ogmios --zsh-completion-script ogmios > ./share/zsh/site-functions/_ogmios
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/network-synchronization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
network: [ preview ]
ogmios_version: [ v6.0.0-rc3 ]
ogmios_version: [ v6.0.0-rc4 ]
cardano_node_version: [ 8.5.0-pre ]

runs-on: ubuntu-latest
Expand Down
48 changes: 48 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,48 @@ layout: changelog
pre: "<b>5. </b>"
---

### [6.0.0-rc4] - 2023-10-19

#### Added

- Integration with `cardano-ledger-conway==1.9.0.0`. The previous release did (mistakenly) include an older version of the ledger. This caused synchronization of the **Conway** era to fail unexpectedly. This release now includes the latest version of the ledger currently available. It adds new elements to the Conway era:
- A new certificate `DelegateRepresentativeUpdate`.
- New transaction submission errors:
- `GovernanceProposalDepositMismatch`
- `ConflictingCommitteeUpdate`
- `InvalidCommitteeUpdate`
- `TreasuryWithdrawalMismatch`.
- New protocol parameters, only present in Conway onwards:
- `stakePoolVotingThresholds`
- `constitutionalCommitteeMinSize`
- `constitutionalCommitteeMaxTermLength`
- `governanceActionLifetime`
- `governanceActionDeposit`
- `delegateRepresentativeVotingThresholds`
- `delegateRepresentativeDeposit`
- `delegateRepresentativeMaxIdleTime`

#### Changed

- The integration with `cardano-ledger-conway==1.9.0.0` also causes a few (breaking) changes to the existing interface. Mostly located in the **Conway** era:
- `UnknownGovernanceProposal` transaction submission failure is now `UnknownGovernanceProposals` and its data field now contains a list of invalid proposals instead of a single proposal.
- `ConstitutionalCommitteeMember` may now contain an optional `mandate` field.
- The `ConstitutionalCommitte` governance action `members`' field no longer holds a member id. Instead, it contains two fields `added` and `removed` pointing to a list of `ConstitutionalCommitteeMember`.
- The certificate `DelegateRepresentativeRegistration` may now contain an optional `anchor` field.
- The governance action `Constitution` now has a mandatory `anchor` field and an optional `hash` field.
- The `returnAccount` for all governance proposal is now a (bech32-encoded) stake address instead of a key or script hash digest.
- The Conway's genesis has been completely redefined and now contains fields `constitution`, `constitutionalCommittee` and `updatableParameters`.
- The `CredentialDepositMismatch` transaction submission failure now has extra `data`.

- **⚠️ BREAKING-CHANGE ⚠️** The Alonzo's genesis `initialParameters` field has been renamed to `updatableParameters`.

#### Removed

N/A

---
---

### [6.0.0-rc3] - 2023-10-12

#### Added
Expand All @@ -31,6 +73,9 @@ pre: "<b>5. </b>"

N/A

---
---

### [6.0.0-rc2] - 2023-09-08

#### Added
Expand All @@ -49,6 +94,9 @@ N/A

N/A

---
---

### [6.0.0-rc1] - 2023-08-10

> **Note**
Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@

## Compatibility

| Ogmios | Cardano-node |
| --- | --- |
| `v5.6.0` | `1.35.4`, `1.35.7` |
| `v6.0.0-rc1` | `8.1.2`, `8.1.1`, `8.1.0`
| `v6.0.0-rc2` | `8.1.2`, `8.1.1`, `8.1.0`
| `v6.0.0-rc3` | `8.5.0-pre` |
| Ogmios | Cardano-node |
| --- | --- |
| `v5.6.0` | `1.35.4`, `1.35.7` |
| `v6.0.0-rc1` | `8.1.2`, `8.1.1`, `8.1.0` |
| `v6.0.0-rc2` | `8.1.2`, `8.1.1`, `8.1.0` |
| `v6.0.0-rc3` | `8.5.0-pre` (no Conway) |
| `v6.0.0-rc4` | `8.5.0-pre` (with Conway) |

## QuickStart

Expand Down
2 changes: 1 addition & 1 deletion clients/TypeScript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cardano-ogmios",
"version": "6.0.0-rc3",
"version": "6.0.0-rc4",
"private": true,
"description": "TypeScript monorepo with client libraries for Cardano Ogmios",
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions clients/TypeScript/packages/client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cardano-ogmios/client",
"version": "6.0.0-rc3",
"version": "6.0.0-rc4",
"description": "TypeScript client library for Cardano Ogmios",
"engines": {
"node": ">=14"
Expand Down Expand Up @@ -47,7 +47,7 @@
"typescript": "^4.2.3"
},
"dependencies": {
"@cardano-ogmios/schema": "6.0.0-rc3",
"@cardano-ogmios/schema": "6.0.0-rc4",
"@cardanosolutions/json-bigint": "^1.0.1",
"@types/json-bigint": "^1.0.1",
"bech32": "^2.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ describe('Local state queries', () => {
expect((shelleyGenesis as GenesisShelley).startTime).toBeDefined()

const alonzoGenesis = await client.genesisConfiguration('alonzo')
expect((alonzoGenesis as GenesisAlonzo).initialParameters.minUtxoDepositCoefficient).toBeDefined()
expect((alonzoGenesis as GenesisAlonzo).updatableParameters.minUtxoDepositCoefficient).toBeDefined()

const point = await client.ledgerTip() as { slot: Slot, id: DigestBlake2B256 }
expect(point.slot).toBeDefined()
Expand Down
4 changes: 2 additions & 2 deletions clients/TypeScript/packages/repl/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cardano-ogmios/repl",
"version": "6.0.0-rc3",
"version": "6.0.0-rc4",
"description": "REPL for Cardano Ogmios",
"engines": {
"node": ">=14"
Expand Down Expand Up @@ -39,7 +39,7 @@
"typescript": "^4.2.3"
},
"dependencies": {
"@cardano-ogmios/client": "6.0.0-rc3",
"@cardano-ogmios/client": "6.0.0-rc4",
"yargs-parser": "^20.2.7"
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion clients/TypeScript/packages/schema/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cardano-ogmios/schema",
"version": "6.0.0-rc3",
"version": "6.0.0-rc4",
"description": "Generated TypeScript from the Cardano Ogmios schema",
"engines": {
"node": ">=14"
Expand Down
Loading

0 comments on commit 594faae

Please sign in to comment.