Merge branch 'master' into v6.6

CardanoSolutions · Sep 1, 2024 · 67135d7 · 67135d7
2 parents a3ae314 + 706941a
commit 67135d7
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 14 deletions.
diff --git a/.github/workflows/network-synchronization.yaml b/.github/workflows/network-synchronization.yaml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         network: [ preview ]
-        ogmios_version: [ latest ]
+        ogmios_version: [ v6.6.0 ]
         cardano_node_version: [ 9.1.0 ]
 
     runs-on: ubuntu-latest

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,21 @@ pre: "<b>6. </b>"
 math: true
 ---
 
+
+### [6.6.1] - UNRELEASED
+
+#### Added
+
+N/A
+
+#### Changed
+
+- Fix Conway block reporting `"babbage"` era.
+
+#### Removed
+
+N/A
+
 ### [6.6.0] - 2024-08-15
 
 #### Added
@@ -108,7 +123,7 @@ $$
   </tr>
   <tr>
   <td>$[179200; 204800[$</td>
-  <td>$157.66$</td>
+  <td>$157.6599552$</td>
   </tr>
   </tbody>
   </table>

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -24,10 +24,6 @@ services:
 
   ogmios:
     image: cardanosolutions/ogmios:latest
-    build:
-      context: .
-      target: ogmios
-      cache_from: [cardanosolutions/ogmios:latest]
     restart: on-failure
     command: [
       "--host", "0.0.0.0",

diff --git a/docs/content/getting-started/building.md b/docs/content/getting-started/building.md
@@ -124,7 +124,7 @@ Clone the git repository from Github:
 
 ```console
 $ git clone --depth 1 --recursive --shallow-submodules [email protected]:cardanosolutions/ogmios.git
-$ cd cardano-ogmios/server
+$ cd ogmios/server
 ```
 
 Then, use cabal to compile the project source code from the `server` directory:
@@ -155,7 +155,7 @@ Clone the git repository from Github:
 
 ```console
 $ git clone --depth 1 --recursive --shallow-submodules [email protected]:cardanosolutions/ogmios.git
-$ cd cardano-ogmios/clients/TypeScript
+$ cd ogmios/clients/TypeScript
 ```
 
 Then, use Yarn to install dependencies and compile the project source code from the

diff --git a/docs/content/getting-started/docker.md b/docs/content/getting-started/docker.md
@@ -127,8 +127,8 @@ Configuration files are available from within the image under `/config` in folde
 Alternatively, you may use Docker's [compose](https://docs.docker.com/compose/) to run either Ogmios standalone, or an orchestration of cardano-node and Ogmios talking to each other. Compose is a handy tool to orchestrate multiple services packaged as containers. It works from a compose file which is available in the project repository, get it via:
 
 ```console
-$ git clone --depth 1 [email protected]:cardanosolutions/ogmios.git
-$ cd cardano-ogmios
+$ git clone --depth 1 --recursive --shallow-submodules [email protected]:cardanosolutions/ogmios.git
+$ cd ogmios
 ```
 
 Then, starts the components stack using:

diff --git a/docs/static/cardano.json b/docs/static/cardano.json
@@ -2724,7 +2724,7 @@
     { "title": "UInt64"
     , "type": "integer"
     , "minimum": 0
-    , "maximum": 18446744073709552999
+    , "maximum": 18446744073709551615
     }
 
   , "UtcTime":

diff --git a/server/ogmios.cabal b/server/ogmios.cabal
diff --git a/server/package.yaml b/server/package.yaml
@@ -1,7 +1,7 @@
 _config: !include ".hpack.config.yaml"
 
 name:                ogmios
-version:             6.6.0
+version:             0
 stability:           stable
 github:              "cardanosolutions/ogmios"
 license:             MPL-2.0

diff --git a/server/src/Ogmios/Data/Json/Conway.hs b/server/src/Ogmios/Data/Json/Conway.hs
@@ -99,7 +99,7 @@ encodeBlock opts (ShelleyBlock (Ledger.Block blkHeader txs) headerHash) =
     encodeObject
         ( "type" .= encodeText "praos"
         <>
-          "era" .= encodeText "babbage"
+          "era" .= encodeText "conway"
         <>
           "id" .= Shelley.encodeShelleyHash headerHash
         <>