use v2 types

2022-08-15 21:27:57 +08:00 · 2022-08-15 21:27:57 +08:00 · fec449ceb5
commit fec449ceb5
parent b453f2b216
36 changed files with 504 additions and 360 deletions
--- a/agora-specs/Sample/Effect/GovernorMutation.hs
+++ b/agora-specs/Sample/Effect/GovernorMutation.hs
@ -15,15 +15,24 @@ import Agora.Effect.GovernorMutation (
  MutateGovernorDatum (..),
  mutateGovernorValidator,
 )
-import Agora.Governor (GovernorDatum (..))
+import Agora.Governor (GovernorDatum (..), GovernorRedeemer (MutateGovernor))
 import Agora.Proposal (ProposalId (..), ProposalThresholds (..))
 import Agora.Utils (validatorHashToTokenName)
 import Data.Default.Class (Default (def))
 import Data.Tagged (Tagged (..))
-import Plutarch.Api.V1 (mkValidator, validatorHash)
-import PlutusLedgerApi.V1 (
+import Plutarch.Api.V2 (mkValidator, validatorHash)
+import PlutusLedgerApi.V1 qualified as Interval (always)
+import PlutusLedgerApi.V1.Address (scriptHashAddress)
+import PlutusLedgerApi.V1.Value (AssetClass, assetClass)
+import PlutusLedgerApi.V1.Value qualified as Value (
+  assetClassValue,
+  singleton,
+ )
+import PlutusLedgerApi.V2 (
  Address,
  Datum (..),
+  OutputDatum (OutputDatumHash),
+  ScriptPurpose (Spending),
  ToData (..),
  TxInInfo (..),
  TxInfo (..),
@ -32,13 +41,7 @@ import PlutusLedgerApi.V1 (
  Validator,
  ValidatorHash (..),
 )
-import PlutusLedgerApi.V1 qualified as Interval (always)
-import PlutusLedgerApi.V1.Address (scriptHashAddress)
-import PlutusLedgerApi.V1.Value (AssetClass, assetClass)
-import PlutusLedgerApi.V1.Value qualified as Value (
-  assetClassValue,
-  singleton,
- )
+import PlutusTx.AssocMap qualified as AssocMap
 import Sample.Shared (
  agoraScripts,
  authorityTokenSymbol,
@ -46,6 +49,7 @@ import Sample.Shared (
  govAssetClass,
  govValidatorAddress,
  minAda,
+  mkRedeemer,
  signer,
 )
 import Test.Util (datumPair, toDatumHash)
@ -114,7 +118,8 @@ mkEffectTxInfo newGovDatum =
        TxOut
          { txOutAddress = govValidatorAddress
          , txOutValue = gst
-          , txOutDatumHash = Just $ toDatumHash governorInputDatum
+          , txOutDatum = OutputDatumHash $ toDatumHash governorInputDatum
+          , txOutReferenceScript = Nothing
          }

      --
@ -129,7 +134,8 @@ mkEffectTxInfo newGovDatum =
        TxOut
          { txOutAddress = effectValidatorAddress
          , txOutValue = at -- The effect carry an authotity token.
-          , txOutDatumHash = Just $ toDatumHash effectInputDatum
+          , txOutDatum = OutputDatumHash $ toDatumHash effectInputDatum
+          , txOutReferenceScript = Nothing
          }

      --
@ -143,21 +149,28 @@ mkEffectTxInfo newGovDatum =
        TxOut
          { txOutAddress = govValidatorAddress
          , txOutValue = mconcat [gst, minAda]
-          , txOutDatumHash = Just $ toDatumHash governorOutputDatum
+          , txOutDatum = OutputDatumHash $ toDatumHash governorOutputDatum
+          , txOutReferenceScript = Nothing
          }
   in TxInfo
        { txInfoInputs =
            [ TxInInfo effectRef effectInput
            , TxInInfo govRef governorInput
            ]
+        , txInfoReferenceInputs = []
        , txInfoOutputs = [governorOutput]
        , txInfoFee = Value.singleton "" "" 2
        , txInfoMint = burnt
        , txInfoDCert = []
-        , txInfoWdrl = []
+        , txInfoWdrl = AssocMap.empty
        , txInfoValidRange = Interval.always
        , txInfoSignatories = [signer]
-        , txInfoData = datumPair <$> [governorInputDatum, governorOutputDatum, effectInputDatum]
+        , txInfoData = AssocMap.fromList $ datumPair <$> [governorInputDatum, governorOutputDatum, effectInputDatum]
+        , txInfoRedeemers =
+            AssocMap.fromList
+              [ (Spending effectRef, mkRedeemer ())
+              , (Spending govRef, mkRedeemer MutateGovernor)
+              ]
        , txInfoId = "74c75505691e7baa981fa80e50b9b7e88dbe1eda67d4f062d89d203b"
        }

--- a/agora-specs/Sample/Effect/TreasuryWithdrawal.hs
+++ b/agora-specs/Sample/Effect/TreasuryWithdrawal.hs
@ -23,39 +23,31 @@ import Agora.Effect.TreasuryWithdrawal (
  TreasuryWithdrawalDatum (TreasuryWithdrawalDatum),
  treasuryWithdrawalValidator,
 )
-import Data.Default (def)
-import Plutarch.Api.V1 (mkValidator, validatorHash)
-import PlutusLedgerApi.V1 (
+import Plutarch.Api.V2 (mkValidator, validatorHash)
+import PlutusLedgerApi.V1.Interval qualified as Interval (always)
+import PlutusLedgerApi.V1.Value qualified as Value (singleton)
+import PlutusLedgerApi.V2 (
  Address (Address),
  Credential (..),
  CurrencySymbol,
  DatumHash (DatumHash),
+  OutputDatum (OutputDatumHash),
  PubKeyHash,
+  Redeemer (Redeemer),
  ScriptContext (..),
  ScriptPurpose (Spending),
  TokenName (TokenName),
  TxInInfo (TxInInfo),
-  TxInfo (
-    TxInfo,
-    txInfoDCert,
-    txInfoData,
-    txInfoFee,
-    txInfoId,
-    txInfoInputs,
-    txInfoMint,
-    txInfoOutputs,
-    txInfoSignatories,
-    txInfoValidRange,
-    txInfoWdrl
-  ),
+  TxInfo (..),
  TxOut (..),
  TxOutRef (TxOutRef),
  Validator,
  ValidatorHash (ValidatorHash),
  Value,
+  toBuiltinData,
 )
-import PlutusLedgerApi.V1.Interval qualified as Interval (always)
-import PlutusLedgerApi.V1.Value qualified as Value (singleton)
+import PlutusTx.AssocMap qualified as AssocMap
+import Sample.Shared (deterministicTracingConfing)
 import Test.Util (scriptCredentials, userCredentials)

 -- | A sample Currency Symbol.
@ -81,7 +73,8 @@ inputGAT =
    TxOut
      { txOutAddress = Address (ScriptCredential $ validatorHash validator) Nothing
      , txOutValue = Value.singleton currSymbol validatorHashTN 1 -- Stake ST
-      , txOutDatumHash = Just (DatumHash "")
+      , txOutDatum = OutputDatumHash (DatumHash "")
+      , txOutReferenceScript = Nothing
      }

 -- | Create an input given the index of the treasury and the 'Value' at this input.
@ -92,7 +85,8 @@ inputTreasury indx val =
    TxOut
      { txOutAddress = Address (treasuries !! indx) Nothing
      , txOutValue = val
-      , txOutDatumHash = Just (DatumHash "")
+      , txOutDatum = OutputDatumHash (DatumHash "")
+      , txOutReferenceScript = Nothing
      }

 -- | Create a input given the index of the user and the 'Value' at this input.
@ -103,7 +97,8 @@ inputUser indx val =
    TxOut
      { txOutAddress = Address (users !! indx) Nothing
      , txOutValue = val
-      , txOutDatumHash = Just (DatumHash "")
+      , txOutDatum = OutputDatumHash (DatumHash "")
+      , txOutReferenceScript = Nothing
      }

 -- | Create a input representing the collateral given by a user.
@ -114,7 +109,8 @@ inputCollateral indx =
    TxOut
      { txOutAddress = Address (users !! indx) Nothing
      , txOutValue = Value.singleton "" "" 2000000
-      , txOutDatumHash = Just (DatumHash "")
+      , txOutDatum = OutputDatumHash (DatumHash "")
+      , txOutReferenceScript = Nothing
      }

 -- | Create an output at the nth treasury with the given 'Value'.
@ -123,7 +119,8 @@ outputTreasury indx val =
  TxOut
    { txOutAddress = Address (treasuries !! indx) Nothing
    , txOutValue = val
-    , txOutDatumHash = Nothing
+    , txOutDatum = OutputDatumHash (DatumHash "")
+    , txOutReferenceScript = Nothing
    }

 -- | Create an output at the nth user with the given 'Value'.
@ -132,7 +129,8 @@ outputUser indx val =
  TxOut
    { txOutAddress = Address (users !! indx) Nothing
    , txOutValue = val
-    , txOutDatumHash = Nothing
+    , txOutDatum = OutputDatumHash (DatumHash "")
+    , txOutReferenceScript = Nothing
    }

 -- | Create a list of the outputs that are required as encoded in 'TreasuryWithdrawalDatum'.
@ -143,12 +141,13 @@ buildReceiversOutputFromDatum (TreasuryWithdrawalDatum xs _) = f <$> xs
      TxOut
        { txOutAddress = Address (fst x) Nothing
        , txOutValue = snd x
-        , txOutDatumHash = Nothing
+        , txOutDatum = OutputDatumHash (DatumHash "")
+        , txOutReferenceScript = Nothing
        }

 -- | Effect validator instance.
 validator :: Validator
-validator = mkValidator def $ treasuryWithdrawalValidator currSymbol
+validator = mkValidator deterministicTracingConfing $ treasuryWithdrawalValidator currSymbol

 -- | 'TokenName' that represents the hash of the 'Agora.Stake.Stake' validator.
 validatorHashTN :: TokenName
@ -156,20 +155,25 @@ validatorHashTN = let ValidatorHash vh = validatorHash validator in TokenName vh

 buildScriptContext :: [TxInInfo] -> [TxOut] -> ScriptContext
 buildScriptContext inputs outputs =
-  ScriptContext
-    { scriptContextTxInfo =
-        TxInfo
-          { txInfoInputs = inputs
-          , txInfoOutputs = outputs
-          , txInfoFee = Value.singleton "" "" 2
-          , txInfoMint = Value.singleton currSymbol validatorHashTN (-1)
-          , txInfoDCert = []
-          , txInfoWdrl = []
-          , txInfoValidRange = Interval.always
-          , txInfoSignatories = [signer]
-          , txInfoData = []
-          , txInfoId = "0b2086cbf8b6900f8cb65e012de4516cb66b5cb08a9aaba12a8b88be"
-          }
-    , scriptContextPurpose =
-        Spending (TxOutRef "0b2086cbf8b6900f8cb65e012de4516cb66b5cb08a9aaba12a8b88be" 1)
-    }
+  let spending = Spending (TxOutRef "0b2086cbf8b6900f8cb65e012de4516cb66b5cb08a9aaba12a8b88be" 1)
+   in ScriptContext
+        { scriptContextTxInfo =
+            TxInfo
+              { txInfoInputs = inputs
+              , txInfoReferenceInputs = []
+              , txInfoOutputs = outputs
+              , txInfoFee = Value.singleton "" "" 2
+              , txInfoMint = Value.singleton currSymbol validatorHashTN (-1)
+              , txInfoDCert = []
+              , txInfoWdrl = AssocMap.empty
+              , txInfoValidRange = Interval.always
+              , txInfoSignatories = [signer]
+              , txInfoData = AssocMap.empty
+              , txInfoRedeemers =
+                  AssocMap.fromList
+                    [ (spending, Redeemer $ toBuiltinData ())
+                    ]
+              , txInfoId = "0b2086cbf8b6900f8cb65e012de4516cb66b5cb08a9aaba12a8b88be"
+              }
+        , scriptContextPurpose = spending
+        }
--- a/agora-specs/Sample/Governor/Initialize.hs
+++ b/agora-specs/Sample/Governor/Initialize.hs
@ -42,16 +42,16 @@ import Plutarch.Context (
  signedWith,
  txId,
  withDatum,
-  withOutRef,
+  withRef,
  withValue,
 )
-import PlutusLedgerApi.V1 (
+import PlutusLedgerApi.V1.Value (AssetClass (..))
+import PlutusLedgerApi.V1.Value qualified as Value
+import PlutusLedgerApi.V2 (
  CurrencySymbol,
  TxOutRef (TxOutRef),
  ValidatorHash,
 )
-import PlutusLedgerApi.V1.Value (AssetClass (..))
-import PlutusLedgerApi.V1.Value qualified as Value
 import Sample.Shared (
  minAda,
 )
@ -175,7 +175,7 @@ mintGST ps = builder
                mconcat
                  [ pubKey witnessPubKey
                  , withValue witnessValue
-                  , withOutRef witnessRef
+                  , withRef witnessRef
                  ]
            , output $
                mconcat
--- a/agora-specs/Sample/Governor/Mutate.hs
+++ b/agora-specs/Sample/Governor/Mutate.hs
@ -22,7 +22,7 @@ import Agora.Proposal (ProposalId (ProposalId), ProposalThresholds (..))
 import Agora.Scripts (AgoraScripts (..))
 import Agora.Utils (validatorHashToTokenName)
 import Data.Default (def)
-import Plutarch.Api.V1 (PValidator, mkValidator, validatorHash)
+import Plutarch.Api.V2 (PValidator, mkValidator, validatorHash)
 import Plutarch.Context (
  input,
  mint,
@ -30,17 +30,17 @@ import Plutarch.Context (
  pubKey,
  script,
  withDatum,
-  withOutRef,
+  withRef,
  withValue,
 )
-import PlutusLedgerApi.V1 (
+import PlutusLedgerApi.V1.Value qualified as Value
+import PlutusLedgerApi.V2 (
  Data,
  TxOutRef (TxOutRef),
  ValidatorHash,
  Value,
  toData,
 )
-import PlutusLedgerApi.V1.Value qualified as Value
 import Sample.Shared (
  agoraScripts,
  authorityTokenSymbol,
@ -49,7 +49,13 @@ import Sample.Shared (
  minAda,
 )
 import Test.Specification (SpecificationTree, testValidator)
-import Test.Util (CombinableBuilder, mkSpending, pubKeyHashes, sortValue, validatorHashes)
+import Test.Util (
+  CombinableBuilder,
+  mkSpending,
+  pubKeyHashes,
+  sortValue,
+  validatorHashes,
+ )

 --------------------------------------------------------------------------------

@ -150,7 +156,7 @@ mkGovernorBuilder ps =
              [ script govValidatorHash
              , withDatum governorInputDatum
              , withValue value
-              , withOutRef governorRef
+              , withRef governorRef
              ]
        , output $
            mconcat
--- a/agora-specs/Sample/Proposal/Advance.hs
+++ b/agora-specs/Sample/Proposal/Advance.hs
@ -80,11 +80,13 @@ import Plutarch.Context (
  signedWith,
  timeRange,
  withDatum,
-  withOutRef,
+  withRef,
  withValue,
 )
 import Plutarch.Lift (PLifted, PUnsafeLiftDecl)
-import PlutusLedgerApi.V1 (
+import PlutusLedgerApi.V1.Value (AssetClass (..))
+import PlutusLedgerApi.V1.Value qualified as Value
+import PlutusLedgerApi.V2 (
  DatumHash,
  POSIXTime,
  POSIXTimeRange,
@ -92,8 +94,6 @@ import PlutusLedgerApi.V1 (
  TxOutRef (TxOutRef),
  ValidatorHash,
 )
-import PlutusLedgerApi.V1.Value (AssetClass (..))
-import PlutusLedgerApi.V1.Value qualified as Value
 import PlutusTx.AssocMap qualified as AssocMap
 import Sample.Proposal.Shared (
  governorTxRef,
@ -317,7 +317,7 @@ mkProposalBuilder ps =
        [ input $
            mconcat
              [ script proposalValidatorHash
-              , withOutRef proposalRef
+              , withRef proposalRef
              , withDatum (mkProposalInputDatum ps)
              , withValue value
              ]
@ -400,7 +400,7 @@ mkStakeBuilder ps =
              , input $
                  mconcat
                    [ script stakeValidatorHash
-                    , withOutRef (mkStakeRef idx)
+                    , withRef (mkStakeRef idx)
                    , withValue perStakeValue
                    , withDatum i
                    ]
@ -462,14 +462,14 @@ mkGovernorBuilder ps =
            mconcat
              [ script govValidatorHash
              , withValue value
-              , withOutRef governorRef
+              , withRef governorRef
              , withDatum governorInputDatum
              ]
        , output $
            mconcat
              [ script govValidatorHash
              , withValue value
-              , withOutRef governorRef
+              , withRef governorRef
              , withDatum (mkGovernorOutputDatum ps)
              ]
        ]
--- a/agora-specs/Sample/Proposal/Cosign.hs
+++ b/agora-specs/Sample/Proposal/Cosign.hs
@ -46,17 +46,16 @@ import Plutarch.Context (
  timeRange,
  txId,
  withDatum,
-  withOutRef,
-  withTxId,
+  withRef,
  withValue,
 )
-import PlutusLedgerApi.V1 (
+import PlutusLedgerApi.V1.Value qualified as Value
+import PlutusLedgerApi.V2 (
  POSIXTimeRange,
  PubKeyHash,
  TxOutRef (..),
  Value,
 )
-import PlutusLedgerApi.V1.Value qualified as Value
 import PlutusTx.AssocMap qualified as AssocMap
 import Sample.Proposal.Shared (proposalTxRef, stakeTxRef)
 import Sample.Shared (
@ -165,8 +164,7 @@ cosign ps = builder
                        [ script stakeValidatorHash
                        , withValue stakeValue
                        , withDatum stakeDatum
-                        , withTxId stakeTxRef
-                        , withOutRef (mkStakeRef refIdx)
+                        , withRef (mkStakeRef refIdx)
                        ]
                  , output $
                      mconcat
@ -196,8 +194,7 @@ cosign ps = builder
              [ script proposalValidatorHash
              , withValue pst
              , withDatum proposalInputDatum
-              , withTxId proposalTxRef
-              , withOutRef proposalRef
+              , withRef proposalRef
              ]
        , output $
            mconcat
--- a/agora-specs/Sample/Proposal/Create.hs
+++ b/agora-specs/Sample/Proposal/Create.hs
@ -31,7 +31,12 @@ import Agora.Proposal (
  ResultTag (ResultTag),
  emptyVotesFor,
 )
-import Agora.Proposal.Time (MaxTimeRangeWidth (MaxTimeRangeWidth), ProposalStartingTime (..))
+import Agora.Proposal.Time (
+  MaxTimeRangeWidth (
+    MaxTimeRangeWidth
+  ),
+  ProposalStartingTime (..),
+ )
 import Agora.Scripts (AgoraScripts (..))
 import Agora.Stake (
  ProposalLock (..),
@ -50,10 +55,11 @@ import Plutarch.Context (
  timeRange,
  txId,
  withDatum,
-  withOutRef,
+  withRef,
  withValue,
 )
-import PlutusLedgerApi.V1 (
+import PlutusLedgerApi.V1.Value qualified as Value
+import PlutusLedgerApi.V2 (
  DatumHash,
  POSIXTime (POSIXTime),
  POSIXTimeRange,
@ -62,7 +68,6 @@ import PlutusLedgerApi.V1 (
  ValidatorHash,
  always,
 )
-import PlutusLedgerApi.V1.Value qualified as Value
 import PlutusTx.AssocMap qualified as AssocMap
 import Sample.Proposal.Shared (stakeTxRef)
 import Sample.Shared (
@ -303,7 +308,7 @@ createProposal ps = builder
              [ script govValidatorHash
              , withValue governorValue
              , withDatum governorInputDatum
-              , withOutRef governorRef
+              , withRef governorRef
              ]
        , output $
            mconcat
@ -317,7 +322,7 @@ createProposal ps = builder
              [ script stakeValidatorHash
              , withValue stakeValue
              , withDatum (mkStakeInputDatum ps)
-              , withOutRef stakeRef
+              , withRef stakeRef
              ]
        , output $
            mconcat
--- a/agora-specs/Sample/Proposal/Shared.hs
+++ b/agora-specs/Sample/Proposal/Shared.hs
@ -7,7 +7,7 @@ Shared constants for proposal samples.
 -}
 module Sample.Proposal.Shared (proposalTxRef, stakeTxRef, governorTxRef) where

-import PlutusLedgerApi.V1 (TxId)
+import PlutusLedgerApi.V2 (TxId)

 -- | 'TxId' of all the proposal inputs in the samples.
 proposalTxRef :: TxId
--- a/agora-specs/Sample/Proposal/UnlockStake.hs
+++ b/agora-specs/Sample/Proposal/UnlockStake.hs
@ -46,16 +46,16 @@ import Plutarch.Context (
  signedWith,
  txId,
  withDatum,
-  withOutRef,
+  withRef,
  withValue,
 )
-import PlutusLedgerApi.V1 (
+import PlutusLedgerApi.V1.Value qualified as Value
+import PlutusLedgerApi.V2 (
  DatumHash,
  PubKeyHash,
  TxOutRef (..),
  ValidatorHash,
 )
-import PlutusLedgerApi.V1.Value qualified as Value
 import PlutusTx.AssocMap qualified as AssocMap
 import Sample.Proposal.Shared (stakeTxRef)
 import Sample.Shared (
@ -261,7 +261,7 @@ unlockStake ps =
                      [ script proposalValidatorHash
                      , withValue pst
                      , withDatum i
-                      , withOutRef (mkProposalRef idx)
+                      , withRef (mkProposalRef idx)
                      ]
                , output $
                    mconcat
@ -293,7 +293,7 @@ unlockStake ps =
                [ script stakeValidatorHash
                , withValue stakeValue
                , withDatum sInDatum
-                , withOutRef stakeRef
+                , withRef stakeRef
                ]
          , output $
              mconcat
--- a/agora-specs/Sample/Proposal/Vote.hs
+++ b/agora-specs/Sample/Proposal/Vote.hs
@ -40,14 +40,14 @@ import Plutarch.Context (
  timeRange,
  txId,
  withDatum,
-  withOutRef,
+  withRef,
  withValue,
 )
-import PlutusLedgerApi.V1 (
+import PlutusLedgerApi.V1.Value qualified as Value
+import PlutusLedgerApi.V2 (
  PubKeyHash,
  TxOutRef (TxOutRef),
 )
-import PlutusLedgerApi.V1.Value qualified as Value
 import PlutusTx.AssocMap qualified as AssocMap
 import Sample.Proposal.Shared (proposalTxRef, stakeTxRef)
 import Sample.Shared (
@ -222,14 +222,14 @@ vote params =
                [ script proposalValidatorHash
                , withValue pst
                , withDatum proposalInputDatum
-                , withOutRef proposalRef
+                , withRef proposalRef
                ]
          , input $
              mconcat
                [ script stakeValidatorHash
                , withValue stakeValue
                , withDatum stakeInputDatum
-                , withOutRef stakeRef
+                , withRef stakeRef
                ]
          , output $
              mconcat
--- a/agora-specs/Sample/Shared.hs
+++ b/agora-specs/Sample/Shared.hs
@ -14,6 +14,7 @@ module Sample.Shared (
  minAda,
  deterministicTracingConfing,
  mkEffect,
+  mkRedeemer,

  -- * Agora Scripts
  agoraScripts,
@ -75,13 +76,21 @@ import Agora.Utils (
 import Data.Default.Class (Default (..))
 import Data.Tagged (Tagged (..))
 import Plutarch (Config (..), TracingMode (DetTracing))
-import Plutarch.Api.V1 (
+import Plutarch.Api.V2 (
  PValidator,
  mintingPolicySymbol,
  mkValidator,
  validatorHash,
 )
-import PlutusLedgerApi.V1 (
+import PlutusLedgerApi.V1.Address (scriptHashAddress)
+import PlutusLedgerApi.V1.Contexts (TxOut (..))
+import PlutusLedgerApi.V1.Scripts (Validator, ValidatorHash (..))
+import PlutusLedgerApi.V1.Value (AssetClass, TokenName)
+import PlutusLedgerApi.V1.Value qualified as Value (
+  assetClass,
+  singleton,
+ )
+import PlutusLedgerApi.V2 (
  Address (Address),
  Credential (ScriptCredential),
  CurrencySymbol,
@ -91,18 +100,12 @@ import PlutusLedgerApi.V1 (
  MintingPolicy (..),
  POSIXTimeRange,
  PubKeyHash,
+  Redeemer (..),
+  ToData (toBuiltinData),
  TxOutRef (TxOutRef),
  UpperBound (..),
  Value,
 )
-import PlutusLedgerApi.V1.Address (scriptHashAddress)
-import PlutusLedgerApi.V1.Contexts (TxOut (..))
-import PlutusLedgerApi.V1.Scripts (Validator, ValidatorHash (..))
-import PlutusLedgerApi.V1.Value (AssetClass, TokenName)
-import PlutusLedgerApi.V1.Value qualified as Value (
-  assetClass,
-  singleton,
- )
 import PlutusTx qualified

 -- Plutarch compiler configauration.
@ -219,6 +222,9 @@ proposalStartingTimeFromTimeRange _ = error "Given time range should be finite a
 mkEffect :: (PlutusTx.ToData datum) => ClosedTerm PValidator -> CompiledEffect datum
 mkEffect v = CompiledEffect $ mkValidator deterministicTracingConfing v

+mkRedeemer :: forall redeemer. PlutusTx.ToData redeemer => redeemer -> Redeemer
+mkRedeemer = Redeemer . toBuiltinData
+
 ------------------------------------------------------------------

 treasuryOut :: TxOut
--- a/agora-specs/Sample/Stake.hs
+++ b/agora-specs/Sample/Stake.hs
@ -27,8 +27,8 @@ import Data.Tagged (Tagged, untag)
 import Plutarch.Context (
  MintingBuilder,
  SpendingBuilder,
-  buildMintingUnsafe,
-  buildSpendingUnsafe,
+  buildMinting',
+  buildSpending',
  input,
  mint,
  output,
@ -37,22 +37,23 @@ import Plutarch.Context (
  txId,
  withDatum,
  withMinting,
-  withOutRef,
+  withRef,
  withSpendingOutRef,
  withValue,
 )
-import PlutusLedgerApi.V1 (
-  Datum (Datum),
-  ScriptContext (..),
-  ScriptPurpose (Minting),
-  ToData (toBuiltinData),
-  TxInfo (txInfoData, txInfoSignatories),
- )
 import PlutusLedgerApi.V1.Contexts (TxOutRef (..))
 import PlutusLedgerApi.V1.Value qualified as Value (
  assetClassValue,
  singleton,
 )
+import PlutusLedgerApi.V2 (
+  Datum (Datum),
+  ScriptContext (..),
+  ScriptPurpose (Minting),
+  ToData (toBuiltinData),
+  TxInfo (txInfoData, txInfoSignatories),
+ )
+import PlutusTx.AssocMap qualified as AssocMap
 import Sample.Shared (
  governor,
  signer,
@ -83,7 +84,7 @@ stakeCreation =
                ]
          , withMinting stakeSymbol
          ]
-   in buildMintingUnsafe builder
+   in buildMinting' builder

 -- | This ScriptContext should fail because the datum has too much GT.
 stakeCreationWrongDatum :: ScriptContext
@ -91,7 +92,7 @@ stakeCreationWrongDatum =
  let datum :: Datum
      datum = Datum (toBuiltinData $ StakeDatum 4242424242424242 signer Nothing []) -- Too much GT
   in ScriptContext
-        { scriptContextTxInfo = stakeCreation.scriptContextTxInfo {txInfoData = [("", datum)]}
+        { scriptContextTxInfo = stakeCreation.scriptContextTxInfo {txInfoData = AssocMap.fromList [("", datum)]}
        , scriptContextPurpose = Minting stakeSymbol
        }

@ -144,7 +145,7 @@ stakeDepositWithdraw config =
                          <> Value.assetClassValue (untag governor.gtClassRef) (untag stakeBefore.stakedAmount)
                    )
                , withDatum stakeAfter
-                , withOutRef stakeRef
+                , withRef stakeRef
                ]
          , output $
              mconcat
@ -158,4 +159,4 @@ stakeDepositWithdraw config =
                ]
          , withSpendingOutRef stakeRef
          ]
-   in buildSpendingUnsafe builder
+   in buildSpending' builder
--- a/agora-specs/Sample/Stake/SetDelegate.hs
+++ b/agora-specs/Sample/Stake/SetDelegate.hs
@ -28,23 +28,23 @@ import Agora.Stake (
 import Data.Tagged (untag)
 import Plutarch.Context (
  SpendingBuilder,
-  buildSpendingUnsafe,
+  buildSpending',
  input,
  output,
  script,
  signedWith,
  txId,
  withDatum,
-  withOutRef,
+  withRef,
  withSpendingOutRef,
  withValue,
 )
-import PlutusLedgerApi.V1 (
+import PlutusLedgerApi.V1.Value qualified as Value
+import PlutusLedgerApi.V2 (
  PubKeyHash,
  ScriptContext,
  TxOutRef (TxOutRef),
 )
-import PlutusLedgerApi.V1.Value qualified as Value
 import Sample.Shared (
  agoraScripts,
  governor,
@ -91,7 +91,7 @@ mkStakeInputDatum ps =

 -- | Generate a 'ScriptContext' that tries to change the delegate of a stake.
 setDelegate :: Parameters -> ScriptContext
-setDelegate ps = buildSpendingUnsafe builder
+setDelegate ps = buildSpending' builder
  where
    stakeRef :: TxOutRef
    stakeRef = TxOutRef "0ffef57e30cc604342c738e31e0451593837b313e7bfb94b0922b142782f98e6" 1
@ -134,7 +134,7 @@ setDelegate ps = buildSpendingUnsafe builder
              [ script stakeValidatorHash
              , withValue stakeValue
              , withDatum stakeInput
-              , withOutRef stakeRef
+              , withRef stakeRef
              ]
        , output $
            mconcat
--- a/agora-specs/Sample/Treasury.hs
+++ b/agora-specs/Sample/Treasury.hs
@ -19,7 +19,7 @@ module Sample.Treasury (

 import Plutarch.Context (
  MintingBuilder,
-  buildMintingUnsafe,
+  buildMinting',
  credential,
  input,
  mint,
@ -28,22 +28,23 @@ import Plutarch.Context (
  signedWith,
  txId,
  withMinting,
-  withTxId,
+  withRefTxId,
  withValue,
 )
-import PlutusLedgerApi.V1 (
-  Credential (PubKeyCredential),
-  PubKeyHash (PubKeyHash),
- )
 import PlutusLedgerApi.V1.Address (Address (..))
-import PlutusLedgerApi.V1.Contexts (
+import PlutusLedgerApi.V1.Value qualified as Value (singleton)
+import PlutusLedgerApi.V2 (
+  Credential (PubKeyCredential),
+  OutputDatum (NoOutputDatum),
+  PubKeyHash (PubKeyHash),
+  ValidatorHash (ValidatorHash),
+ )
+import PlutusLedgerApi.V2.Contexts (
  ScriptContext (..),
  TxInInfo (..),
  TxOut (..),
  TxOutRef (..),
 )
-import PlutusLedgerApi.V1.Scripts (ValidatorHash (ValidatorHash))
-import PlutusLedgerApi.V1.Value qualified as Value (singleton)
 import Sample.Shared (
  gatCs,
  gatTn,
@ -60,7 +61,7 @@ baseCtxBuilder =
        mconcat
          [ credential trCredential
          , withValue minAda
-          , withTxId "73475cb40a568e8da8a045ced110137e159f890ac4da883b6b17dc651b3a8049"
+          , withRefTxId "73475cb40a568e8da8a045ced110137e159f890ac4da883b6b17dc651b3a8049"
          ]
   in mconcat
        [ txId "73475cb40a568e8da8a045ced110137e159f890ac4da883b6b17dc651b3a8049"
@ -84,10 +85,10 @@ validCtx =
              mconcat
                [ script mockTrEffectHash
                , withValue (Value.singleton gatCs gatTn 1 <> minAda)
-                , withTxId "52b67b60260da3937510ad545c7f46f8d9915bd27e1082e76947fb309f913bd3"
+                , withRefTxId "52b67b60260da3937510ad545c7f46f8d9915bd27e1082e76947fb309f913bd3"
                ]
          ]
-   in buildMintingUnsafe builder
+   in buildMinting' builder

 treasuryRef :: TxOutRef
 treasuryRef =
@ -108,7 +109,8 @@ walletIn =
              0
        , txInInfoResolved =
            TxOut
-              { txOutDatumHash = Nothing
+              { txOutDatum = NoOutputDatum
+              , txOutReferenceScript = Nothing
              , txOutValue = Value.singleton gatCs gatTn 1
              , txOutAddress =
                  Address
@ -127,7 +129,7 @@ trCtxGATNameNotAddress =
              mconcat
                [ script wrongEffHash
                , withValue (Value.singleton gatCs gatTn 1 <> minAda)
-                , withTxId "52b67b60260da3937510ad545c7f46f8d9915bd27e1082e76947fb309f913bd3"
+                , withRefTxId "52b67b60260da3937510ad545c7f46f8d9915bd27e1082e76947fb309f913bd3"
                ]
          ]
-   in buildMintingUnsafe builder
+   in buildMinting' builder