From d64d26f663f00f48e397485d9fcf7ad154241048 Mon Sep 17 00:00:00 2001
From: Nicholas Clarke <nicholas.clarke@iohk.io>
Date: Thu, 3 Dec 2020 15:37:29 +0100
Subject: [PATCH] Allow UInt64 and NInt64 tokens for coins.

Also print out the offending token on a failed parse.
---
 shelley-ma/impl/src/Cardano/Ledger/Mary/Value.hs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/shelley-ma/impl/src/Cardano/Ledger/Mary/Value.hs b/shelley-ma/impl/src/Cardano/Ledger/Mary/Value.hs
index a1ef024f6eb..57482561a6d 100644
--- a/shelley-ma/impl/src/Cardano/Ledger/Mary/Value.hs
+++ b/shelley-ma/impl/src/Cardano/Ledger/Mary/Value.hs
@@ -182,11 +182,13 @@ decodeValue = do
   tt <- peekTokenType
   case tt of
     TypeUInt -> inject . Coin <$> decodeInteger
+    TypeUInt64 -> inject . Coin <$> decodeInteger
     TypeNInt -> inject . Coin <$> decodeInteger
+    TypeNInt64 -> inject . Coin <$> decodeInteger
     TypeListLen -> decodeValuePair decodeInteger
     TypeListLen64 -> decodeValuePair decodeInteger
     TypeListLenIndef -> decodeValuePair decodeInteger
-    _ -> fail $ "Value: expected array or int"
+    _ -> fail $ "Value: expected array or int, got " ++ show tt
 
 decodeValuePair ::
   ( Typeable (Core.Script era),
@@ -229,10 +231,11 @@ decodeNonNegativeValue = do
   tt <- peekTokenType
   case tt of
     TypeUInt -> inject . Coin <$> decodeNonNegativeInteger
+    TypeUInt64 -> inject . Coin <$> decodeNonNegativeInteger
     TypeListLen -> decodeValuePair decodeNonNegativeInteger
     TypeListLen64 -> decodeValuePair decodeNonNegativeInteger
     TypeListLenIndef -> decodeValuePair decodeNonNegativeInteger
-    _ -> fail $ "Value: expected array or int"
+    _ -> fail $ "Value: expected array or int, got " ++ show tt
 
 instance
   (Era era, Typeable (Core.Script era)) =>
@@ -409,7 +412,10 @@ prune assets =
 -- | Rather than using prune to remove 0 assets, when can avoid adding them in the
 --   first place by using valueFromList to construct a Value.
 valueFromList :: Integer -> [(PolicyID era, AssetName, Integer)] -> Value era
-valueFromList ada triples = foldr (\(p, n, i) ans -> insert (+) p n i ans) (Value ada Map.empty) triples
+valueFromList ada =
+  foldr
+    (\(p, n, i) ans -> insert (+) p n i ans)
+    (Value ada Map.empty)
 
 -- | Display a Value as a String, one token per line
 showValue :: Value era -> String