Skip to content

Commit e1099cf

Browse files
committed
Bump cardano-types to v5.0.0
1 parent bec9cb6 commit e1099cf

File tree

5 files changed

+20
-25
lines changed

5 files changed

+20
-25
lines changed

packages.dhall

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ let additions =
117117
, "unsafe-coerce"
118118
]
119119
, repo = "https://github.com/mlabs-haskell/purescript-cardano-types"
120-
, version = "5fe759a6e3d77450b3998e46fbbc17deafc69613"
120+
, version = "v5.0.0"
121121
}
122122
, cardano-data-lite =
123123
{ dependencies =

spago-packages.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,11 @@ let
187187

188188
"cardano-types" = pkgs.stdenv.mkDerivation {
189189
name = "cardano-types";
190-
version = "5fe759a6e3d77450b3998e46fbbc17deafc69613";
190+
version = "v5.0.0";
191191
src = pkgs.fetchgit {
192192
url = "https://github.com/mlabs-haskell/purescript-cardano-types";
193-
rev = "5fe759a6e3d77450b3998e46fbbc17deafc69613";
194-
sha256 = "0391r5vmq8d3yqb0gwa7ggy6bdpvz9whzs13mq6wfp4nxncz24i9";
193+
rev = "348fbbefa8bec5050e8492f5a9201ac5bb17c9d9";
194+
sha256 = "06977niflqdpk4kw6d3480ak0m2rwi9fngjblxnqddqpdyj6zq1d";
195195
};
196196
phases = "installPhase";
197197
installPhase = "ln -s $src $out";

spago.dhall

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{ name = "uplc-apply-args"
22
, dependencies =
33
[ "aff"
4-
, "bifunctors"
54
, "bytearrays"
65
, "cardano-data-lite"
76
, "cardano-types"
@@ -14,7 +13,6 @@
1413
, "maybe"
1514
, "mote"
1615
, "mote-testplan"
17-
, "newtype"
1816
, "partial"
1917
, "prelude"
2018
, "profunctor"

src/Cardano/Plutus/ApplyArgs.purs

+14-17
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,31 @@ module Cardano.Plutus.ApplyArgs
44

55
import Prelude
66

7-
import Cardano.Data.Lite as CSL
7+
import Cardano.Data.Lite as CDL
88
import Cardano.Types (PlutusScript(PlutusScript))
99
import Cardano.Types.PlutusData (PlutusData(List))
1010
import Cardano.Types.PlutusData as PlutusData
1111
import Cardano.Types.PlutusScript (PlutusScript)
1212
import Cardano.Types.PlutusScript as PlutusScript
13-
import Data.Bifunctor (rmap)
1413
import Data.Either (Either(Left, Right))
15-
import Data.Newtype (unwrap, wrap)
1614
import Data.Tuple.Nested ((/\))
1715

1816
foreign import apply_params_to_script
1917
:: (forall a b. a -> Either a b)
2018
-> (forall a b. b -> Either a b)
21-
-> CSL.PlutusData
22-
-> CSL.PlutusScript
23-
-> Either String CSL.PlutusScript
19+
-> CDL.PlutusData
20+
-> CDL.PlutusScript
21+
-> Either String CDL.PlutusScript
2422

2523
apply_params_to_script_either
26-
:: CSL.PlutusData -> CSL.PlutusScript -> Either String CSL.PlutusScript
27-
apply_params_to_script_either = apply_params_to_script Left Right
24+
:: CDL.PlutusData
25+
-> CDL.PlutusScript
26+
-> Either String CDL.PlutusScript
27+
apply_params_to_script_either =
28+
apply_params_to_script Left Right
2829

29-
applyArgs
30-
:: PlutusScript -> Array PlutusData -> Either String PlutusScript
31-
applyArgs script@(PlutusScript (_ /\ langVersion)) paramsList = do
32-
let params = PlutusData.toCsl (List paramsList)
33-
appliedScript <- apply_params_to_script_either params
34-
(PlutusScript.toCsl script)
35-
-- We manually set PlutusScript.Language again since there's no roundtrip
36-
-- guarantee for this type.
37-
Right $ wrap $ rmap (const langVersion) $ unwrap $ PlutusScript.fromCsl appliedScript
30+
applyArgs :: PlutusScript -> Array PlutusData -> Either String PlutusScript
31+
applyArgs script@(PlutusScript (_ /\ lang)) paramsList = do
32+
let params = PlutusData.toCdl (List paramsList)
33+
appliedScript <- apply_params_to_script_either params $ PlutusScript.toCdl script
34+
Right $ PlutusScript.fromCdl appliedScript lang

test/Main.purs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import Control.Monad.Error.Class (class MonadError, liftEither)
1111
import Data.ByteArray (ByteArray, hexToByteArray, hexToByteArrayUnsafe)
1212
import Data.Foldable (foldl, traverse_)
1313
import Data.List.Lazy (replicate)
14-
import Data.Maybe (Maybe(..), maybe)
14+
import Data.Maybe (Maybe(Just, Nothing), maybe)
1515
import Data.Profunctor.Choice (left)
16-
import Data.Tuple (Tuple(..), uncurry)
16+
import Data.Tuple (Tuple(Tuple), uncurry)
1717
import Data.Tuple.Nested ((/\))
1818
import Effect (Effect)
1919
import Effect.Aff (Aff, Error, error, launchAff_, throwError)

0 commit comments

Comments
 (0)