Build with Pact-5

Author: kdafriend

cabal.project

@@ -7,42 +7,26 @@ package pact
 
 source-repository-package
     type: git
-    location: https://github.com/kadena-io/HsYAML.git
-    tag: b3c49dbceb39733dfc07c22f2097d3c74fc86e74
-    --sha256: sha256-lnnUni7D949nM4faMrORMetZi5wJy2Qhchm9ne6Cqv8=
-
-source-repository-package
-    type: git
-    location: https://github.com/kadena-io/HsYAML-aeson.git
-    tag: 84292468200166b96ff4e8c7324ee01e6ab6d181
-    --sha256: sha256-zaDcqwSs4ASb7PO3+E9oGzmSXlSt7bL1NiP0red7CiY=
-
-source-repository-package
-    type: git
-    location: https://github.com/kadena-io/cardano-crypto.git
-    tag: 4590efa638397e952a51a8994b5543e4ea3c1ecd
-    --sha256: 0hl2n3bba5v2j0lmxhs7hs01z3aznh2bwf9cb434icq2g0bl8ms3
-
-source-repository-package
-    type: git
-    location: https://github.com/kadena-io/chainweb-api.git
+    location: https://github.com/kda-community/chainweb-api.git
     tag: 1b2de025cfdc09698bfb1ec3807cd85405d6a339
-    --sha256: sha256-06jvD1kmkmthcRkyWhVLTbytwabghInxqXQD/Lm7kbA=
 
 source-repository-package
     type: git
-    location: https://github.com/kadena-io/pact.git
-    tag: a1c7906efbf32095883e71594a53a21162fbe5a7
-    --sha256: sha256-Mtgz/ilxa81TDUoBKQv5x3BlOftFjNV1Ak0uYzSguNQ=
+    location: https://github.com/kda-community/pact-5.git
+    tag: f9bb9979091f8eae658a804e88bf313b57c924be
 
 source-repository-package
   type: git
-  location: https://github.com/kadena-io/pact-json.git
+  location: https://github.com/kda-community/pact-json.git
   tag: 1d260bfaa48312b54851057885de4c43c420e35f
-  --sha256: 0fzq4mzaszj5clvixx9mn1x6r4dcrnwvbl2znd0p5mmy5h2jr0hh
 
 source-repository-package
   type: git
-  location: https://github.com/kadena-io/kadena-ethereum-bridge.git
-  tag: a32d901e4a79be62af9c27c01152c9a4c3912a62
-  --sha256: sha256-xdawv/tdjh61MbJKcBqm9Fje36+gVljuZsAxOTX1gP0=
+  location: https://github.com/kda-community/kadena-ethereum-bridge.git
+  tag: 8df1cff7f279750490fea8ff580294f3e5a3fcaf
+  --sha256: sha256-HyWTEtw/dKQduXl5avRckS0oNc9Z5yxeUxvX09wDkDY=
+
+source-repository-package
+  type: git
+  location: https://github.com/kda-community/ralist.git
+  tag: fd79fc4454e1b703299ab0a2aa5dabd86c9cacfa

kda-tool.cabal

@@ -81,7 +81,7 @@ library
     , mwc-random
     , network-uri
     , optparse-applicative
-    , pact
+    , pact-tng:pact-request-api
     , pact-json
     , process
     , resource-pool
@@ -164,7 +164,7 @@ test-suite kda-tool-tests
     , mwc-random
     , network-uri
     , optparse-applicative
-    , pact
+    , pact-tng:pact-request-api
     , pact-json
     , process
     , resource-pool

src/Commands/CombineSigs.hs

@@ -17,8 +17,8 @@ import           Data.Text (Text)
 import qualified Data.YAML.Aeson as YA
 import           Kadena.SigningTypes
 import           Katip
-import           Pact.Types.Command
-import           Pact.Types.SigData
+import           Pact.Core.Command.SigData
+import           Pact.Core.Command.Types
 import           System.FilePath
 import           System.IO
 import           Text.Printf

src/Commands/GenTx.hs

@@ -26,11 +26,10 @@ import           Network.Connection
 import           Network.HTTP.Client
 import           Network.HTTP.Client.TLS
 import           Network.HTTP.Types.Status
---import           Pact.ApiReq
-import qualified Pact.ApiReq as Pact
 import qualified Pact.JSON.Encode as J
-import           Pact.Types.Command
-import           Pact.Types.SigData
+import           Pact.Core.Command.SigData
+import           Pact.Core.Command.Types
+import           Pact.Core.Command.Client
 import           System.IO
 import           Text.Printf
 ------------------------------------------------------------------------------
@@ -98,8 +97,8 @@ genFromContents op tplContents useOldOutput = do
                               M.union (M.filter (/= Null) vars) rest
         txts <- hoistEither $ first prettyFailure $ fillValueVars tpl augmentedVars
         txis :: [TxInputs] <- sequence $ map (hoistEither . parseTxInputs) txts
-        apiReqs :: [Pact.ApiReq] <- mapM (lift . txInputsToApiReq) txis
-        cmds :: [Command Text] <- mapM (fmap snd . lift . Pact.mkApiReqCmd True "") apiReqs
+        apiReqs :: [ApiReq] <- mapM (lift . txInputsToApiReq) txis
+        cmds :: [Command Text] <- mapM (fmap snd . lift . mkApiReqCmd True "") apiReqs
         let chooseFormat i =
               if useOldOutput
                 then pure $ encodeText $ J.toJsonViaEncode i

src/Commands/Keygen.hs

@@ -10,7 +10,7 @@ import           Data.ByteString.Base16
 import qualified Data.Map as M
 import qualified Data.Text as T
 import qualified Data.Text.IO as T
-import           Pact.Types.Crypto
+import           Pact.Core.Command.Crypto
 ------------------------------------------------------------------------------
 import           Keys
 import           Types.KeyType

src/Commands/Sign.hs

@@ -21,8 +21,8 @@ import qualified Data.Text.IO as T
 import           Data.Text.Encoding
 import qualified Data.YAML.Aeson as YA
 import           Kadena.SigningTypes
-import           Pact.Types.Command
-import           Pact.Types.SigData
+import           Pact.Core.Command.SigData
+import           Pact.Core.Command.Types
 import           System.Exit
 import           System.FilePath
 import           System.IO

src/Commands/WalletSign.hs

@@ -21,12 +21,8 @@ import qualified Data.YAML.Aeson as YA
 import           Kadena.SigningApi
 import           Kadena.SigningTypes
 import           Katip
-import           Pact.Types.Capability
-import           Pact.Types.ChainMeta
-import           Pact.Types.Command
-import           Pact.Types.KeySet
-import           Pact.Types.Names
-import           Pact.Types.RPC
+import           Pact.Core.Command.RPC
+import           Pact.Core.Command.Types
 import           Servant.API
 import           Servant.Client
 import           System.Exit
@@ -164,7 +160,7 @@ csdToSigningRequest csd = do
       Continuation _ -> Left "Cannot sign CONT transactions with the old signing API"
       Exec m -> do
         let code = _pcCode $ _pmCode m
-            d = _getLegacyValue (_pmData m) ^? _Object
+            d = Just $ _pmData m
         let caps = map mkDappCap $ S.toList $ S.fromList $ concatMap _siCapList $ _pSigners p
         let n = Just $ _pNonce p
             meta = _pMeta p
@@ -178,7 +174,7 @@ csdToSigningRequest csd = do
         pure $ SigningRequest code d caps n cid gasLimit ttl sender extraSigners
 
 mkDappCap :: SigCapability -> DappCap
-mkDappCap sc = DappCap (_qnName $ _scName sc) "desc" sc
+mkDappCap sc = DappCap (_qnName $ _ctName $ _sigCapability  sc) "desc" sc
 
 signYamlFile :: FilePath -> IO (Either String CommandSigData)
 signYamlFile msgFile = do

src/Kadena/SigningApi.hs

@@ -10,10 +10,11 @@ import Data.Aeson
 import Data.Proxy
 import Data.Text (Text)
 import GHC.Generics
-import Pact.Types.Capability (SigCapability(..))
-import Pact.Types.ChainMeta (TTLSeconds(..))
-import Pact.Types.Runtime (GasLimit(..), ChainId, PublicKeyText)
-import Pact.Types.Command (Command)
+import Pact.Core.Command.SigData
+import Pact.Core.Command.Types
+import Pact.Core.Command.Client
+
+
 import Servant.API
 
 import Kadena.SigningTypes
@@ -38,7 +39,7 @@ instance FromJSON DappCap where
 
 data SigningRequest = SigningRequest
   { _signingRequest_code :: Text
-  , _signingRequest_data :: Maybe Object
+  , _signingRequest_data :: Maybe PactValue
   , _signingRequest_caps :: [DappCap]
   , _signingRequest_nonce :: Maybe Text
   , _signingRequest_chainId :: Maybe ChainId

src/Kadena/SigningTypes.hs

@@ -9,9 +9,11 @@
 
 module Kadena.SigningTypes where
 
+import Data.Coerce
 import Control.Lens hiding ((.=))
 import Control.Monad
 import qualified Data.Aeson as A
+import qualified Pact.JSON.Encode as J
 import Data.Aeson.Types
 import qualified Data.ByteString.Lazy as BSL
 import Data.Char as Char
@@ -23,16 +25,9 @@ import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
 import GHC.Generics
 
-import Pact.ApiReq
-import qualified Pact.JSON.Encode as J
-import Pact.Types.Capability (SigCapability(..))
-import Pact.Types.ChainMeta
-import Pact.Types.Command
-import Pact.Types.Hash
-import Pact.Parse
-import Pact.Types.Runtime (GasLimit(..), ChainId, NetworkId, PublicKeyText)
--- TODO: Rip out sig data dependency
-import Pact.Types.SigData (PublicKeyHex(..))
+import Pact.Core.Command.SigData
+import Pact.Core.Command.Types
+import Pact.Core.Command.Client
 
 -- The spec calls this `Signer` but it clashes too much with Pact`s `Signer` type
 data CSDSigner = CSDSigner
@@ -88,15 +83,15 @@ instance FromJSON CommandSigData where
 
 --------------------------------------------------------------------------------
 data SigningOutcome =
-    SO_Success PactHash
+    SO_Success Hash
   | SO_Failure Text
   | SO_NoSig
   deriving (Eq,Ord,Show,Generic)
 
 instance ToJSON SigningOutcome where
   toJSON a = case a of
     SO_Success h -> object ["result" .= ("success" :: Text), "hash" .= hashTxt ]
-      where hashTxt = hashToText $ toUntypedHash h
+      where hashTxt = T.decodeUtf8 $ BSL.toStrict $ J.encode h
     SO_Failure msg -> object ["result" .= ("failure" :: Text), "msg" .= msg ]
     SO_NoSig -> object ["result" .= ("noSig" :: Text)]
 
@@ -155,12 +150,14 @@ commandSigDataToCommand = fmap fst . commandSigDataToParsedCommand
 
 commandSigDataToParsedCommand :: CommandSigData -> Either String (Command Text, Payload PublicMeta ParsedCode)
 commandSigDataToParsedCommand (CommandSigData (SignatureList sigList) c) = do
-  payload :: Payload PublicMeta ParsedCode <- traverse parsePact =<< A.eitherDecodeStrict' (T.encodeUtf8 c)
+  payload :: Payload (StableEncoding PublicMeta) ParsedCode <- traverse parsePact' =<< A.eitherDecodeStrict' (T.encodeUtf8 c)
   let sigMap = M.fromList $ (\(CSDSigner k v) -> (k, v)) <$> sigList
   -- It is ok to use a map here because we're iterating over the signers list and only using the map for lookup.
       sigs = catMaybes $ map (\signer -> join $ M.lookup (PublicKeyHex $ _siPubKey signer) sigMap) $ _pSigners payload
       h = hash (T.encodeUtf8 c)
-  pure (Command c sigs h, payload)
+  pure (Command c sigs h, coerce payload)
+    where
+      parsePact' = either (Left . show) Right . parsePact
 
 --------------------------------------------------------------------------------
 newtype AccountName = AccountName
@@ -217,10 +214,22 @@ compactEncoding = defaultOptions
 -- If these orphans conflict with future ToJSON instances, we can remove them.
 
 instance ToJSON SigCapability where toJSON = J.toJsonViaEncode
-instance ToJSON PublicKeyText where toJSON = J.toJsonViaEncode
-instance ToJSON TTLSeconds where toJSON = J.toJsonViaEncode
-instance ToJSON GasLimit where toJSON = J.toJsonViaEncode
-instance ToJSON ChainId where toJSON = J.toJsonViaEncode
+
+instance ToJSON PublicKeyText where toJSON = coerce . J.toJsonViaEncode . StableEncoding
+instance FromJSON PublicKeyText where parseJSON = coerce <$> parseJSON @(StableEncoding PublicKeyText)
+
+instance ToJSON TTLSeconds where toJSON = coerce . J.toJsonViaEncode . StableEncoding
+instance FromJSON TTLSeconds where parseJSON = coerce <$> parseJSON @(StableEncoding TTLSeconds)
+
+instance ToJSON GasLimit where toJSON = coerce . J.toJsonViaEncode . StableEncoding
+instance FromJSON GasLimit where parseJSON = coerce <$> parseJSON @(StableEncoding GasLimit)
+
+instance ToJSON ChainId where toJSON = coerce . J.toJsonViaEncode . StableEncoding
+instance FromJSON ChainId where parseJSON = coerce <$> parseJSON @(StableEncoding ChainId)
+
+instance ToJSON PactValue where toJSON = coerce . J.toJsonViaEncode . StableEncoding
+instance FromJSON PactValue where parseJSON = coerce <$> parseJSON @(StableEncoding PactValue)
+
 instance ToJSON NetworkId where toJSON = J.toJsonViaEncode
 instance J.Encode a => ToJSON (Command a) where toJSON = J.toJsonViaEncode
 instance ToJSON ApiSigner where toJSON = J.toJsonViaEncode

src/Types/TxInputs.hs

@@ -5,6 +5,8 @@ module Types.TxInputs where
 ------------------------------------------------------------------------------
 import           Control.Applicative
 import           Control.Error
+import           Data.Coerce
+import qualified Data.Map as M
 import           Data.Aeson as A
 import           Data.Aeson.Key as A
 import           Data.Aeson.Types
@@ -13,13 +15,12 @@ import           Data.Text (Text)
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
 import qualified Data.Text.IO as T
-import           Pact.ApiReq
 import           Kadena.SigningTypes ()
 import qualified Pact.JSON.Encode as J
 import           Pact.JSON.Legacy.Value
-import           Pact.Types.Lang
-import           Pact.Types.RPC
-import           Pact.Types.Verifier
+import           Pact.Core.Command.RPC
+import           Pact.Core.Command.Client
+import           Pact.Core.Command.Types
 ------------------------------------------------------------------------------
 
 data PactTxType = PttExec | PttCont
@@ -41,7 +42,7 @@ instance FromJSON PactTxType where
 
 data ExecInputs = ExecInputs
   { _execInputs_codeOrFile :: Either Text FilePath
-  , _execInputs_dataOrFile :: Either Value FilePath
+  , _execInputs_dataOrFile :: Either PactValue FilePath
   } deriving (Eq,Show)
 
 execInputsPairs :: (Monoid a, KeyValue e a) => ExecInputs -> a
@@ -77,10 +78,10 @@ txInputsToApiReq txi = do
   case _txInputs_payload txi of
     Left c -> pure $ ApiReq
       (Just t)
-      (let PactId pid = _cmPactId c in hush $ fromText' pid)
+      (parseHash $ coerce $ _cmPactId c)
       (Just $ _cmStep c)
       (Just $ _cmRollback c)
-      (Just $ _getLegacyValue $ _cmData c)
+      (Just $ _cmData c)
       (_cmProof c)
       Nothing
       Nothing
@@ -99,7 +100,7 @@ txInputsToApiReq txi = do
         Nothing
         Nothing
         Nothing
-        (hush d)
+        (coerce <$> hush d)
         Nothing
         Nothing
         (hush c)
@@ -151,9 +152,9 @@ instance FromJSON TxInputs where
           PttCont -> Left <$> parseJSON v
           PttExec -> do
             mc :: Maybe (Either Text FilePath) <- parseMaybePair o "code"
-            md :: Maybe (Either Value FilePath) <- parseMaybePair o "data"
+            md :: Maybe (Either (StableEncoding PactValue) FilePath) <- parseMaybePair o "data"
             c <- maybe (fail "Must have exec or cont fields") pure mc
-            let d = fromMaybe (Left $ object []) md
+            let d = fromMaybe (Left $ PObject M.empty) $ coerce <$> md
             pure $ Right $ ExecInputs c d
 
         -- We want to allow both "meta" and "publicMeta" here to make this tool