implement Mary's 'encodeUTxO' and adjust related JSON-WSP definition

CardanoSolutions · Feb 19, 2021 · 6743c8b · 6743c8b
1 parent cb8e9c1
commit 6743c8b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/docs/static/ogmios.wsp.json b/docs/static/ogmios.wsp.json
@@ -798,6 +798,10 @@
     , "pattern": "[1-9A-HJ-NP-Za-km-z]*"
     }
 
+  , "AssetQuantity":
+    { "type": "integer"
+    }
+
   , "Block":
     { "type": "object"
     , "oneOf":
@@ -2135,7 +2139,12 @@
     , "required": [ "address", "value" ]
     , "properties":
       { "address": { "$ref": "#/definitions/Address" }
-      , "value": { "$ref": "#/definitions/Lovelace" }
+      , "value":
+        { "oneOf":
+            [ { "$ref": "#/definitions/Lovelace" }
+            , { "$ref": "#/definitions/Value" }
+            ]
+        }
       }
     }
 
@@ -2347,6 +2356,19 @@
       }
     }
 
+  , "Value":
+    { "type": "object"
+    , "additionalProperties": false
+    , "required": [ "coins", "assets" ]
+    , "properties":
+      { "coins": { "$ref": "#/definitions/Lovelace" }
+      , "assets":
+        { "type": "object"
+        , "additionalProperties": { "$ref": "#/definitions/AssetQuantity" }
+        }
+      }
+    }
+
   , "Vote":
     { "type": "object"
     , "additionalProperties": false

diff --git a/ogmios-server/src/Ogmios/Data/Json/Mary.hs b/ogmios-server/src/Ogmios/Data/Json/Mary.hs
@@ -158,7 +158,9 @@ encodeUtxo
     => Sh.UTxO (MaryEra crypto)
     -> Json
 encodeUtxo =
-    undefined
+    encodeList id . Map.foldrWithKey (\i o -> (:) (encodeIO i o)) [] . Sh.unUTxO
+  where
+    encodeIO = curry (encode2Tuple Shelley.encodeTxIn encodeTxOut)
 
 encodeValue
     :: MA.Value crypto