Fix inlineDatum option in output

dQuadrant · Feb 20, 2023 · af5f758 · af5f758
1 parent 4578136
commit af5f758
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ Kuber can be stared easily with [docker-compose.yml](./docker-compose.yml) file.
 
 ```bash
 git clone https://github.com/dquadrant/kuber.git
-git checkout 2.3.0
+git checkout 2.3.1
 docker-compose up -d
 ```
 
@@ -71,7 +71,7 @@ In summary, to prepare your system for building kuber from sources, you have to:
 Once everything is installed and ready, kuber will also be ready to run
  ```
 cabal update
-CARDANO_NODE_SOCKET_PATH=/home/user/.cardano/testnet/node.socket cabal run exe:kuber
+CARDANO_NODE_SOCKET_PATH=/home/user/.cardano/preprod/node.socket NETWORK=preprod cabal run exe:kuber
  ```
 
 This will start kuber on port `8081`.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,9 +16,9 @@ services:
         max-size: "200k"
         max-file: "10"
   kuber:
-    image: dquadrant/kuber:${KUBER_VERSION:-2.2.0}
+    image: dquadrant/kuber:${KUBER_VERSION:-2.3.1}
     environment:
-      NETWORK: ${NETWORK:- preprod}
+      NETWORK: ${NETWORK:- preprod} 
     volumes:
       - node-ipc:/root/.cardano/preprod/
 #      -node-ipc:/root/.cardano/mainnet/ for NETWORK=mainnet   or set CARDANO_NODE_SOCKET_PATH explicitly

diff --git a/kuber.cabal b/kuber.cabal
@@ -1,6 +1,6 @@
 cabal-version:      2.4
 name:               kuber
-version:            2.3.0.0
+version:            2.3.1.0
 
 -- A short (one-line) description of the package.
 -- synopsis:

diff --git a/server/kuber-server.cabal b/server/kuber-server.cabal
@@ -1,6 +1,6 @@
 cabal-version:      2.4
 name:               kuber-server
-version:            2.3.0.0
+version:            2.3.1.0
 
 -- A short (one-line) description of the package.
 -- synopsis:

diff --git a/src/Cardano/Kuber/Data/TxBuilderAeson.hs b/src/Cardano/Kuber/Data/TxBuilderAeson.hs
@@ -511,17 +511,13 @@ instance FromJSON (TxOutput TxOutputContent ) where
         Just val -> parseJSON  val
         _ -> pure $ valueFromList []
     datumHashE <- parseData
-    shouldEmbed <- v .:? "inline" .!= True
-    let txOutDatum=if shouldEmbed
-                                then case datumHashE of
-                                  Nothing -> TxOutDatumNone
-                                  Just (Left sd) -> TxOutDatumInline ReferenceTxInsScriptsInlineDatumsInBabbageEra sd
-                                  Just (Right dh) -> TxOutDatumHash ScriptDataInBabbageEra dh
-                                else (case datumHashE of
-                                  Just (Left datum) -> TxOutDatumHash ScriptDataInBabbageEra (hashScriptData datum)
-                                  Just (Right dh)   -> TxOutDatumHash ScriptDataInBabbageEra dh
-                                  _ -> TxOutDatumNone
-                                )
+    shouldEmbed <- v .:? "inlineDatum" .!= True
+    let txOutDatum=case datumHashE of
+                      Nothing -> TxOutDatumNone
+                      Just (Left sd) -> if shouldEmbed 
+                        then TxOutDatumInline ReferenceTxInsScriptsInlineDatumsInBabbageEra sd 
+                        else TxOutDatumHash ScriptDataInBabbageEra (hashScriptData sd)
+                      Just (Right dh) -> TxOutDatumHash ScriptDataInBabbageEra dh
     mScript_ <- v .:? "script"
     mScript <- case mScript_ of
       Nothing ->  v .:? "inlineScript"