WIP: fixing the tests

Author: klntsky

CHANGELOG.md

@@ -99,6 +99,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - `ToData`/`FromData` Instances for `purescript-noble-secp256k1` types (PS does not allow orphans)
 - `ToMetadata`/`FromMetadata` instance for `BigInt`: it was partial and unsafe
 - `Cardano.Types.BigNum.toInt'` method
+- `Contract.Address`:
+   - `scriptHashAddress` - use `Contract.Address.mkAddress`
+   - `payPubKeyHashBaseAddress` - use `Contract.Address.mkAddress`
+   - `payPubKeyHashEnterpriseAddress` - use `Contract.Address.mkAddress`
+- `Contract.Value`:
+   - `flattenNonAdaAssets` - use `Cardano.Types.Value.flatten`.
+- `Contract.PlutusData`:
+   - `Datum`: removed, use `Cardano.Types.PlutusData`
+   - `unitDatum`
+- `Contract.TextEnvelope`:
+   - `plutusScriptV1FromEnvelope` - use `plutusScriptFromEnvelope`
+- `Contract.Hashing`
+- `Contract.Transaction`:
+   - `TransactionOutputWithRefScript` - use `Cardano.Types.TransactionOutput`. It comes with refscript included.
+   - `getTxFinalFee`
+
 
 
 

examples/AdditionalUtxos.purs

@@ -5,7 +5,10 @@ module Ctl.Examples.AdditionalUtxos
 
 import Contract.Prelude
 
-import Contract.Address (scriptHashAddress)
+import Cardano.Types.BigNum as BigNum
+import Cardano.Types.Credential (Credential(..))
+import Cardano.Types.PlutusScript as PlutusScript
+import Contract.Address (mkAddress)
 import Contract.BalanceTxConstraints (BalanceTxConstraintsBuilder)
 import Contract.BalanceTxConstraints (mustUseAdditionalUtxos) as BalancerConstraints
 import Contract.Config (ContractParams, testnetNamiConfig)
@@ -75,10 +78,9 @@ payToValidator vhash = do
   scriptRef <- liftEffect (NativeScriptRef <$> randomSampleOne arbitrary)
   let
     value :: Value
-    value = Value.lovelaceValueOf $ BigInt.fromInt 2_000_000
+    value = Value.lovelaceValueOf $ BigNum.fromInt 2_000_000
 
-    datum :: Datum
-    datum = wrap $ Integer $ BigInt.fromInt 42
+    datum = Integer $ BigInt.fromInt 42
 
     constraints :: TxConstraints
     constraints =
@@ -95,12 +97,13 @@ payToValidator vhash = do
 
 spendFromValidator :: Validator -> UtxoMap -> Datum -> Contract Unit
 spendFromValidator validator additionalUtxos datum = do
+  addr <- mkAddress (wrap $ ScriptHashCredential $ PlutusScript.hash validator)
+    Nothing
   let
     scriptUtxos :: UtxoMap
     scriptUtxos =
       additionalUtxos # Map.filter \out ->
-        (unwrap (unwrap out).output).address
-          == scriptHashAddress (validatorHash validator) Nothing
+        (unwrap out).address == addr
 
     scriptOrefs :: Array TransactionInput
     scriptOrefs = Array.fromFoldable $ Map.keys scriptUtxos

examples/BalanceTxConstraints.purs

@@ -5,6 +5,10 @@ module Ctl.Examples.BalanceTxConstraints
 
 import Contract.Prelude
 
+import Cardano.Types (Asset(Asset), BigNum)
+import Cardano.Types.BigNum as BigNum
+import Cardano.Types.Int as Int
+import Cardano.Types.Mint as Mint
 import Contract.Address (Address)
 import Contract.BalanceTxConstraints
   ( BalanceTxConstraintsBuilder
@@ -38,22 +42,22 @@ import Contract.TxConstraints as Constraints
 import Contract.UnbalancedTx (mkUnbalancedTx)
 import Contract.Utxos (utxosAt)
 import Contract.Value (CurrencySymbol, TokenName, Value)
-import Contract.Value (singleton, valueOf) as Value
+import Contract.Value (valueOf) as Value
 import Contract.Wallet
   ( KeyWallet
-  , getWalletAddressesWithNetworkTag
+  , getWalletAddresses
   , getWalletCollateral
   , ownPaymentPubKeyHashes
   , withKeyWallet
   )
 import Control.Monad.Trans.Class (lift)
 import Ctl.Examples.AlwaysMints (alwaysMintsPolicy)
-import Ctl.Examples.Helpers (mkCurrencySymbol, mkTokenName) as Helpers
+import Ctl.Examples.Helpers (mkAssetName, mkCurrencySymbol) as Helpers
 import Data.Array (head)
 import Data.Array (sort) as Array
 import Data.Map (fromFoldable, keys, member) as Map
 import Data.Set (findMin) as Set
-import JS.BigInt (BigInt, fromInt)
+import JS.BigInt as BigInt
 
 newtype ContractParams = ContractParams
   { aliceKeyWallet :: KeyWallet
@@ -87,13 +91,13 @@ assertChangeOutputsPartitionedCorrectly = assertionToCheck
         let
           values :: Array Value
           values =
-            changeOutputs <#> _.amount <<< unwrap <<< _.output <<< unwrap
+            changeOutputs <#> _.amount <<< unwrap
 
-          tokenQuantities :: Array BigInt
+          tokenQuantities :: Array BigNum
           tokenQuantities =
-            Array.sort $ values <#> \v -> Value.valueOf v cs tn
+            Array.sort $ values <#> \v -> Value.valueOf (Asset cs tn) v
 
-        tokenQuantities == map fromInt [ 3, 4, 4 ]
+        tokenQuantities == map BigNum.fromInt [ 3, 4, 4 ]
 
 -- | Checks that the utxo with the specified output reference
 -- | (`nonSpendableOref`) is not consumed during transaction balancing.
@@ -124,7 +128,7 @@ contract (ContractParams p) = do
   aliceAddress <-
     liftedM "Failed to get Alice's address"
       $ head
-      <$> (withKeyWallet p.aliceKeyWallet getWalletAddressesWithNetworkTag)
+      <$> (withKeyWallet p.aliceKeyWallet getWalletAddresses)
 
   alicePubKeyHash <-
     liftedM "Failed to get own PKH" $ head <$> ownPaymentPubKeyHashes
@@ -137,7 +141,7 @@ contract (ContractParams p) = do
   bobAddress <-
     liftedM "Failed to get Bob's address"
       $ head
-      <$> (withKeyWallet p.bobKeyWallet getWalletAddressesWithNetworkTag)
+      <$> (withKeyWallet p.bobKeyWallet getWalletAddresses)
 
   bobsCollateralArray <- withKeyWallet p.bobKeyWallet do
     fold <$> getWalletCollateral
@@ -151,19 +155,20 @@ contract (ContractParams p) = do
       (Set.findMin <<< Map.keys <$> utxosAt aliceAddress)
 
   mp /\ cs <- Helpers.mkCurrencySymbol alwaysMintsPolicy
-  tn <- Helpers.mkTokenName "The Token"
+  tn <- Helpers.mkAssetName "The Token"
   let
     constraints :: Constraints.TxConstraints
     constraints =
-      Constraints.mustMintValue (Value.singleton cs tn $ fromInt 11)
+      Constraints.mustMintValue (Mint.singleton cs tn $ Int.fromInt 11)
         <> foldMap Constraints.mustBeSignedBy [ alicePubKeyHash, bobPubKeyHash ]
 
     lookups :: Lookups.ScriptLookups
     lookups = Lookups.mintingPolicy mp
 
     balanceTxConstraints :: BalanceTxConstraints.BalanceTxConstraintsBuilder
     balanceTxConstraints =
-      BalanceTxConstraints.mustGenChangeOutsWithMaxTokenQuantity (fromInt 4)
+      BalanceTxConstraints.mustGenChangeOutsWithMaxTokenQuantity
+        (BigInt.fromInt 4)
         <> BalanceTxConstraints.mustUseUtxosAtAddress bobAddress
         <> BalanceTxConstraints.mustSendChangeToAddress bobAddress
         <> BalanceTxConstraints.mustNotSpendUtxoWithOutRef nonSpendableOref
@@ -184,11 +189,11 @@ contract (ContractParams p) = do
     awaitTxConfirmed txHash
     logInfo' "Tx submitted successfully!"
 
-    let changeAddress = (unwrap bobAddress).address
+    let changeAddress = bobAddress
     pure
       { txHash
       , changeAddress
-      , nonSpendableAddress: (unwrap aliceAddress).address
+      , nonSpendableAddress: aliceAddress
       , mintedToken: cs /\ tn
       , nonSpendableOref
       }

examples/ChangeGeneration.purs

@@ -2,11 +2,11 @@ module Ctl.Examples.ChangeGeneration (checkChangeOutputsDistribution) where
 
 import Prelude
 
+import Cardano.Types.BigNum as BigNum
 import Contract.BalanceTxConstraints (mustSendChangeWithDatum)
 import Contract.Monad (Contract)
 import Contract.PlutusData
-  ( Datum(Datum)
-  , OutputDatum(OutputDatum)
+  ( OutputDatum(OutputDatum)
   , PlutusData(Integer)
   , unitDatum
   )
@@ -27,9 +27,8 @@ import Contract.Value as Value
 import Contract.Wallet (ownPaymentPubKeyHashes, ownStakePubKeyHashes)
 import Ctl.Examples.AlwaysSucceeds as AlwaysSucceeds
 import Data.Array (fold, length, replicate, take, zip)
-import Data.Lens (to, (^.))
+import Data.Lens ((^.))
 import Data.Maybe (Maybe(Just, Nothing))
-import Data.Newtype (unwrap)
 import Data.Tuple (Tuple(Tuple))
 import JS.BigInt (fromInt) as BigInt
 import Test.Spec.Assertions (shouldEqual)
@@ -45,7 +44,7 @@ checkChangeOutputsDistribution outputsToScript outputsToSelf expectedOutputs =
     validator <- AlwaysSucceeds.alwaysSucceedsScript
     let
       vhash = validatorHash validator
-      value = Value.lovelaceValueOf $ BigInt.fromInt 1000001
+      value = Value.lovelaceValueOf $ BigNum.fromInt 1000001
 
       constraintsToSelf :: TxConstraints
       constraintsToSelf = fold <<< take outputsToSelf <<< fold
@@ -67,11 +66,11 @@ checkChangeOutputsDistribution outputsToScript outputsToSelf expectedOutputs =
     unbalancedTx <- mkUnbalancedTx lookups constraints
     balancedTx <- balanceTxWithConstraints unbalancedTx
       -- just to check that attaching datums works
-      ( mustSendChangeWithDatum $ OutputDatum $ Datum $ Integer $ BigInt.fromInt
+      ( mustSendChangeWithDatum $ OutputDatum $ Integer $ BigInt.fromInt
           1000
       )
     balancedSignedTx <- signTransaction balancedTx
-    let outputs = balancedTx ^. to unwrap <<< _body <<< _outputs
+    let outputs = balancedTx ^. _body <<< _outputs
     length outputs `shouldEqual` expectedOutputs
     txHash <- submit balancedSignedTx
     awaitTxConfirmed txHash

examples/Cip30.purs

@@ -18,7 +18,7 @@ import Cardano.Wallet.Cip30.TypeSafe as Cip30
 import Contract.Config (ContractParams, testnetNamiConfig)
 import Contract.Log (logInfo')
 import Contract.Monad (Contract, launchAff_, liftContractAffM, runContract)
-import Contract.Prim.ByteArray (rawBytesFromAscii)
+import Contract.Prim.ByteArray (byteArrayFromAscii)
 import Contract.Wallet
   ( getChangeAddress
   , getRewardAddresses
@@ -62,7 +62,7 @@ contract = do
   _ <- performAndLog "getUnusedAddresses" getUnusedAddresses
   dataBytes <- liftContractAffM
     ("can't convert : " <> msg <> " to RawBytes")
-    (pure mDataBytes)
+    (pure $ wrap <$> mDataBytes)
   mRewardAddress <- performAndLog "getRewardAddresses" getRewardAddresses
   rewardAddr <- liftMaybe (error "can't get reward address")
     $ head mRewardAddress
@@ -71,7 +71,7 @@ contract = do
   void $ performAndLog "signData rewardAddress" $ signData rewardAddr dataBytes
   where
   msg = "hello world!"
-  mDataBytes = rawBytesFromAscii msg
+  mDataBytes = byteArrayFromAscii msg
 
   performAndLog
     :: forall (a :: Type)