make verifier proof field JSON for simplicity

kadena-io · Apr 17, 2024 · fc84dce · fc84dce
1 parent eb57e84
commit fc84dce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/lib/Chainweb/Api/PactCommand.hs b/lib/Chainweb/Api/PactCommand.hs
@@ -10,11 +10,13 @@ import Data.Text (Text)
 import Chainweb.Api.ChainwebMeta
 import Chainweb.Api.Payload
 import Chainweb.Api.Signer
+import Chainweb.Api.Verifier
 ------------------------------------------------------------------------------
 
 data PactCommand = PactCommand
   { _pactCommand_payload :: Payload
   , _pactCommand_signers :: [Signer]
+  , _pactCommand_verifiers :: Maybe [Verifier]
   , _pactCommand_meta    :: ChainwebMeta
   , _pactCommand_nonce   :: Text
   , _pactCommand_network :: Maybe Text
@@ -24,6 +26,7 @@ instance ToJSON PactCommand where
   toJSON PactCommand{..} = object
     [ "payload" .= _pactCommand_payload
     , "signers" .= _pactCommand_signers
+    , "verifiers" .= _pactCommand_verifiers
     , "meta" .= _pactCommand_meta
     , "nonce" .= _pactCommand_nonce
     , "networkId" .= _pactCommand_network
@@ -33,6 +36,7 @@ instance FromJSON PactCommand where
   parseJSON = withObject "PactCommand" $ \o -> PactCommand
     <$> o .: "payload"
     <*> o .: "signers"
+    <*> o .: "verifiers"
     <*> o .: "meta"
     <*> o .: "nonce"
     <*> o .: "networkId"
diff --git a/lib/Chainweb/Api/Signer.hs b/lib/Chainweb/Api/Signer.hs
@@ -6,7 +6,6 @@ module Chainweb.Api.Signer where
 import Chainweb.Api.SigCapability
 import Data.Aeson
 import Data.Maybe (fromMaybe, catMaybes)
-import Data.Ord
 import Data.Text (Text)
 ------------------------------------------------------------------------------
 

diff --git a/lib/Chainweb/Api/Verifier.hs b/lib/Chainweb/Api/Verifier.hs
@@ -12,7 +12,7 @@ import Data.Text (Text)
 
 data Verifier = Verifier
   { _verifier_name :: Maybe Text
-  , _verifier_proof :: Maybe Text
+  , _verifier_proof :: Value
   , _verifier_capList :: [SigCapability]
   } deriving (Eq, Show)
 
@@ -22,12 +22,12 @@ instance Ord Verifier where
 instance ToJSON Verifier where
   toJSON Verifier{..} = object $ catMaybes
     [ fmap ("name" .=) _verifier_name
-    , fmap ("proof" .=) _verifier_proof
+    , Just $ "proof" .= _verifier_proof
     , Just $ "clist" .= _verifier_capList
     ]
 
 instance FromJSON Verifier where
   parseJSON = withObject "Verifier" $ \o -> Verifier
     <$> o .:? "name"
-    <*> o .:? "proof"
+    <*> o .: "proof"
     <*> o .: "clist"