diff --git a/doc/docusaurus/static/code/AuctionMintingPolicy.hs b/doc/docusaurus/static/code/AuctionMintingPolicy.hs index 8783d34f021..c015cde53b7 100644 --- a/doc/docusaurus/static/code/AuctionMintingPolicy.hs +++ b/doc/docusaurus/static/code/AuctionMintingPolicy.hs @@ -3,6 +3,7 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE ImportQualifiedPost #-} {-# LANGUAGE MultiParamTypeClasses #-} +{-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE PatternSynonyms #-} {-# LANGUAGE ScopedTypeVariables #-} @@ -18,16 +19,17 @@ {-# OPTIONS_GHC -fno-unbox-small-strict-fields #-} {-# OPTIONS_GHC -fno-unbox-strict-fields #-} {-# OPTIONS_GHC -fplugin PlutusTx.Plugin #-} -{-# OPTIONS_GHC -fplugin-opt PlutusTx.Plugin:target-version=1.0.0 #-} +{-# OPTIONS_GHC -fplugin-opt PlutusTx.Plugin:target-version=1.1.0 #-} module AuctionMintingPolicy where -import PlutusCore.Version (plcVersion100) -import PlutusLedgerApi.V1.Value (flattenValue) -import PlutusLedgerApi.V2 (PubKeyHash, ScriptContext (..), TxInfo (..)) -import PlutusLedgerApi.V2.Contexts (ownCurrencySymbol, txSignedBy) import PlutusTx -import PlutusTx.Prelude qualified as PlutusTx +import PlutusTx.Prelude + +import PlutusCore.Version (plcVersion110) +import PlutusLedgerApi.V1.Value (flattenValue) +import PlutusLedgerApi.V3 (PubKeyHash, ScriptContext (..), TxInfo (..), mintValueMinted) +import PlutusLedgerApi.V3.Contexts (ownCurrencySymbol, txSignedBy) -- BLOCK1 type AuctionMintingParams = PubKeyHash @@ -39,13 +41,14 @@ auctionTypedMintingPolicy :: ScriptContext -> Bool auctionTypedMintingPolicy pkh _redeemer ctx = - txSignedBy txInfo pkh PlutusTx.&& mintedExactlyOneToken + txSignedBy txInfo pkh && mintedExactlyOneToken where txInfo = scriptContextTxInfo ctx - mintedExactlyOneToken = case flattenValue (txInfoMint txInfo) of - [(currencySymbol, _tokenName, quantity)] -> - currencySymbol PlutusTx.== ownCurrencySymbol ctx PlutusTx.&& quantity PlutusTx.== 1 - _ -> False + mintedExactlyOneToken = + case flattenValue (mintValueMinted (txInfoMint txInfo)) of + [(currencySymbol, _tokenName, quantity)] -> + currencySymbol == ownCurrencySymbol ctx && quantity == 1 + _ -> False -- BLOCK2 {-# INLINEABLE auctionTypedMintingPolicy #-} @@ -53,18 +56,18 @@ auctionUntypedMintingPolicy :: AuctionMintingParams -> BuiltinData -> BuiltinData -> - PlutusTx.BuiltinUnit + BuiltinUnit auctionUntypedMintingPolicy pkh redeemer ctx = - PlutusTx.check + check ( auctionTypedMintingPolicy pkh - (PlutusTx.unsafeFromBuiltinData redeemer) - (PlutusTx.unsafeFromBuiltinData ctx) + (unsafeFromBuiltinData redeemer) + (unsafeFromBuiltinData ctx) ) auctionMintingPolicyScript :: AuctionMintingParams -> - CompiledCode (BuiltinData -> BuiltinData -> PlutusTx.BuiltinUnit) + CompiledCode (BuiltinData -> BuiltinData -> BuiltinUnit) auctionMintingPolicyScript pkh = - $$(PlutusTx.compile [||auctionUntypedMintingPolicy||]) - `PlutusTx.unsafeApplyCode` PlutusTx.liftCode plcVersion100 pkh + $$(compile [||auctionUntypedMintingPolicy||]) + `unsafeApplyCode` liftCode plcVersion110 pkh diff --git a/doc/docusaurus/static/code/AuctionValidator.hs b/doc/docusaurus/static/code/AuctionValidator.hs index ad2067b45e7..979d7d24218 100644 --- a/doc/docusaurus/static/code/AuctionValidator.hs +++ b/doc/docusaurus/static/code/AuctionValidator.hs @@ -24,6 +24,7 @@ {-# OPTIONS_GHC -fno-unbox-small-strict-fields #-} {-# OPTIONS_GHC -fno-unbox-strict-fields #-} {-# OPTIONS_GHC -fplugin PlutusTx.Plugin #-} +{-# OPTIONS_GHC -fplugin-opt PlutusTx.Plugin:target-version=1.1.0 #-} module AuctionValidator where @@ -31,8 +32,7 @@ import GHC.Generics (Generic) import PlutusTx.Prelude -import PlutusLedgerApi.V1 (lovelaceValueOf, valueOf) -import PlutusLedgerApi.V1.Address (toPubKeyHash) +import PlutusLedgerApi.V1 (lovelaceValueOf, toPubKeyHash, valueOf) import PlutusLedgerApi.V1.Interval (contains) import PlutusLedgerApi.V3 (CurrencySymbol, Datum (Datum, getDatum), Lovelace, OutputDatum (NoOutputDatum, OutputDatum, OutputDatumHash), POSIXTime,