PlutusV3: Datum/Redeemer in ScriptContext, Datum Optional, Unified Sc…

…ript Type (#5934)
IntersectMBO · ramsay-t · Aug 6, 2024 · Apr 17, 2024 · Apr 18, 2024 · Apr 19, 2024
commit 7b3fd3e41abc9cabef0faeb06b5e73cc6f0a9bc5
diff --git a/plutus-benchmark/script-contexts/src/PlutusBenchmark/ScriptContexts.hs b/plutus-benchmark/script-contexts/src/PlutusBenchmark/ScriptContexts.hs
@@ -7,9 +7,9 @@ module PlutusBenchmark.ScriptContexts where
 
 import PlutusLedgerApi.V1.Address
 import PlutusLedgerApi.V1.Value
-import PlutusLedgerApi.V3 (OutputDatum (NoOutputDatum), PubKeyHash (..), ScriptContext (..),
-                           ScriptPurpose (Spending), TxId (..), TxInfo (..), TxOut (..),
-                           TxOutRef (..), always)
+import PlutusLedgerApi.V3 (OutputDatum (NoOutputDatum), PubKeyHash (..), Redeemer (..),
+                           ScriptContext (..), ScriptInfo (SpendingScript), TxId (..), TxInfo (..),
+                           TxOut (..), TxOutRef (..), always)
 import PlutusTx qualified
 import PlutusTx.AssocMap qualified as Map
 import PlutusTx.Builtins qualified as PlutusTx
@@ -19,7 +19,12 @@ import PlutusTx.Prelude qualified as PlutusTx
 -- | A very crude deterministic generator for 'ScriptContext's with size
 -- approximately proportional to the input integer.
 mkScriptContext :: Int -> ScriptContext
-mkScriptContext i = ScriptContext (mkTxInfo i) (Spending (TxOutRef (TxId "") 0))
+mkScriptContext i =
+  ScriptContext
+    (mkTxInfo i)
+    (Redeemer (PlutusTx.toBuiltinData (1 :: Integer)))
+    (SpendingScript (TxOutRef (TxId "") 0) Nothing)
+
 
 mkTxInfo :: Int -> TxInfo
 mkTxInfo i = TxInfo {
@@ -62,7 +67,7 @@ checkScriptContext1 d =
   -- Bang pattern to ensure this is forced, probably not necesssary
   -- since we do use it later
   let !sc = PlutusTx.unsafeFromBuiltinData d
-      (ScriptContext txi _) = sc
+      ScriptContext txi _ _ = sc
   in
   if PlutusTx.length (txInfoOutputs txi) `PlutusTx.modInteger` 2 PlutusTx.== 0
   then ()

diff --git a/plutus-benchmark/script-contexts/test/9.6/checkScriptContext1-20.budget.golden b/plutus-benchmark/script-contexts/test/9.6/checkScriptContext1-20.budget.golden
@@ -1,2 +1,2 @@
-({cpu: 285912869
-| mem: 1059503})
+({cpu: 287479352
+| mem: 1064729})
diff --git a/plutus-benchmark/script-contexts/test/9.6/checkScriptContext1-4.budget.golden b/plutus-benchmark/script-contexts/test/9.6/checkScriptContext1-4.budget.golden
@@ -1,2 +1,2 @@
-({cpu: 84686453
-| mem: 324879})
+({cpu: 86252936
+| mem: 330105})
diff --git a/plutus-benchmark/script-contexts/test/9.6/checkScriptContext1.pir.golden b/plutus-benchmark/script-contexts/test/9.6/checkScriptContext1.pir.golden
@@ -803,77 +803,6 @@
                  (unIData (headList {data} (tailList {data} args))))
             (/\dead -> traceError {TxOutRef} "PT1")
             {all dead. dead}
-    data ScriptPurpose | ScriptPurpose_match where
-      Certifying : integer -> TxCert -> ScriptPurpose
-      Minting : bytestring -> ScriptPurpose
-      Proposing : integer -> ProposalProcedure -> ScriptPurpose
-      Rewarding : Credential -> ScriptPurpose
-      Spending : TxOutRef -> ScriptPurpose
-      Voting : Voter -> ScriptPurpose
-    !`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData` :
-       data -> ScriptPurpose
-      = \(d : data) ->
-          let
-            !tup : pair integer (list data) = unConstrData d
-            !index : integer = fstPair {integer} {list data} tup
-            !args : list data = sndPair {integer} {list data} tup
-          in
-          ifThenElse
-            {all dead. ScriptPurpose}
-            (equalsInteger 0 index)
-            (/\dead -> Minting (unBData (headList {data} args)))
-            (/\dead ->
-               ifThenElse
-                 {all dead. ScriptPurpose}
-                 (equalsInteger 1 index)
-                 (/\dead ->
-                    Spending
-                      (`$fUnsafeFromDataTxOutRef_$cunsafeFromBuiltinData`
-                         (headList {data} args)))
-                 (/\dead ->
-                    ifThenElse
-                      {all dead. ScriptPurpose}
-                      (equalsInteger 2 index)
-                      (/\dead ->
-                         Rewarding
-                           (`$fUnsafeFromDataCredential_$cunsafeFromBuiltinData`
-                              (headList {data} args)))
-                      (/\dead ->
-                         ifThenElse
-                           {all dead. ScriptPurpose}
-                           (equalsInteger 3 index)
-                           (/\dead ->
-                              Certifying
-                                (unIData (headList {data} args))
-                                (`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData`
-                                   (headList {data} (tailList {data} args))))
-                           (/\dead ->
-                              ifThenElse
-                                {all dead. ScriptPurpose}
-                                (equalsInteger 4 index)
-                                (/\dead ->
-                                   Voting
-                                     (`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData`
-                                        (headList {data} args)))
-                                (/\dead ->
-                                   ifThenElse
-                                     {all dead. ScriptPurpose}
-                                     (equalsInteger 5 index)
-                                     (/\dead ->
-                                        Proposing
-                                          (unIData (headList {data} args))
-                                          (`$fUnsafeFromDataProposalProcedure_$cunsafeFromBuiltinData`
-                                             (headList
-                                                {data}
-                                                (tailList {data} args))))
-                                     (/\dead ->
-                                        traceError {ScriptPurpose} "PT1")
-                                     {all dead. dead})
-                                {all dead. dead})
-                           {all dead. dead})
-                      {all dead. dead})
-                 {all dead. dead})
-            {all dead. dead}
     ~`$fUnsafeFromDataValue` :
        data -> (\k v -> List (Tuple2 k v)) bytestring integer
       = `$fUnsafeFromDataMap_$cunsafeFromBuiltinData`
@@ -1007,12 +936,26 @@
                     (headList {data} (tailList {data} args))))
             (/\dead -> traceError {TxInInfo} "PT1")
             {all dead. dead}
+    data ScriptInfo | ScriptInfo_match where
+      CertifyingScript : integer -> TxCert -> ScriptInfo
+      MintingScript : bytestring -> ScriptInfo
+      ProposingScript : integer -> ProposalProcedure -> ScriptInfo
+      RewardingScript : Credential -> ScriptInfo
+      SpendingScript : TxOutRef -> Maybe data -> ScriptInfo
+      VotingScript : Voter -> ScriptInfo
     data (LowerBound :: * -> *) a | LowerBound_match where
       LowerBound : Extended a -> Bool -> LowerBound a
     data (UpperBound :: * -> *) a | UpperBound_match where
       UpperBound : Extended a -> Bool -> UpperBound a
     data (Interval :: * -> *) a | Interval_match where
       Interval : LowerBound a -> UpperBound a -> Interval a
+    data ScriptPurpose | ScriptPurpose_match where
+      Certifying : integer -> TxCert -> ScriptPurpose
+      Minting : bytestring -> ScriptPurpose
+      Proposing : integer -> ProposalProcedure -> ScriptPurpose
+      Rewarding : Credential -> ScriptPurpose
+      Spending : TxOutRef -> ScriptPurpose
+      Voting : Voter -> ScriptPurpose
     data Vote | Vote_match where
       Abstain : Vote
       VoteNo : Vote
@@ -1041,7 +984,7 @@
         Maybe integer ->
         TxInfo
     data ScriptContext | ScriptContext_match where
-      ScriptContext : TxInfo -> ScriptPurpose -> ScriptContext
+      ScriptContext : TxInfo -> data -> ScriptInfo -> ScriptContext
   in
   \(d : data) ->
     ScriptContext_match
@@ -1054,6 +997,9 @@
         {all dead. ScriptContext}
         (equalsInteger 0 index)
         (/\dead ->
+           let
+             !l : list data = tailList {data} args
+           in
            ScriptContext
              (let
                !tup : pair integer (list data)
@@ -1177,7 +1123,78 @@
                     (`$fUnsafeFromDataMap_$cunsafeFromBuiltinData`
                        {ScriptPurpose}
                        {data}
-                       `$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData`
+                       (\(d : data) ->
+                          let
+                            !tup : pair integer (list data) = unConstrData d
+                            !index : integer = fstPair {integer} {list data} tup
+                            !args : list data
+                              = sndPair {integer} {list data} tup
+                          in
+                          ifThenElse
+                            {all dead. ScriptPurpose}
+                            (equalsInteger 0 index)
+                            (/\dead -> Minting (unBData (headList {data} args)))
+                            (/\dead ->
+                               ifThenElse
+                                 {all dead. ScriptPurpose}
+                                 (equalsInteger 1 index)
+                                 (/\dead ->
+                                    Spending
+                                      (`$fUnsafeFromDataTxOutRef_$cunsafeFromBuiltinData`
+                                         (headList {data} args)))
+                                 (/\dead ->
+                                    ifThenElse
+                                      {all dead. ScriptPurpose}
+                                      (equalsInteger 2 index)
+                                      (/\dead ->
+                                         Rewarding
+                                           (`$fUnsafeFromDataCredential_$cunsafeFromBuiltinData`
+                                              (headList {data} args)))
+                                      (/\dead ->
+                                         ifThenElse
+                                           {all dead. ScriptPurpose}
+                                           (equalsInteger 3 index)
+                                           (/\dead ->
+                                              Certifying
+                                                (unIData (headList {data} args))
+                                                (`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData`
+                                                   (headList
+                                                      {data}
+                                                      (tailList {data} args))))
+                                           (/\dead ->
+                                              ifThenElse
+                                                {all dead. ScriptPurpose}
+                                                (equalsInteger 4 index)
+                                                (/\dead ->
+                                                   Voting
+                                                     (`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData`
+                                                        (headList {data} args)))
+                                                (/\dead ->
+                                                   ifThenElse
+                                                     {all dead. ScriptPurpose}
+                                                     (equalsInteger 5 index)
+                                                     (/\dead ->
+                                                        Proposing
+                                                          (unIData
+                                                             (headList
+                                                                {data}
+                                                                args))
+                                                          (`$fUnsafeFromDataProposalProcedure_$cunsafeFromBuiltinData`
+                                                             (headList
+                                                                {data}
+                                                                (tailList
+                                                                   {data}
+                                                                   args))))
+                                                     (/\dead ->
+                                                        traceError
+                                                          {ScriptPurpose}
+                                                          "PT1")
+                                                     {all dead. dead})
+                                                {all dead. dead})
+                                           {all dead. dead})
+                                      {all dead. dead})
+                                 {all dead. dead})
+                            {all dead. dead})
                        `$fUnsafeFromDataBuiltinData_$cunsafeFromBuiltinData`
                        (headList {data} l))
                     (`$fUnsafeFromDataMap_$cunsafeFromBuiltinData`
@@ -1236,12 +1253,77 @@
                        (headList {data} (tailList {data} l))))
                (/\dead -> traceError {TxInfo} "PT1")
                {all dead. dead})
-             (`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData`
-                (headList {data} (tailList {data} args))))
+             (headList {data} l)
+             (let
+               !tup : pair integer (list data)
+                 = unConstrData (headList {data} (tailList {data} l))
+               !index : integer = fstPair {integer} {list data} tup
+               !args : list data = sndPair {integer} {list data} tup
+             in
+             ifThenElse
+               {all dead. ScriptInfo}
+               (equalsInteger 0 index)
+               (/\dead -> MintingScript (unBData (headList {data} args)))
+               (/\dead ->
+                  ifThenElse
+                    {all dead. ScriptInfo}
+                    (equalsInteger 1 index)
+                    (/\dead ->
+                       SpendingScript
+                         (`$fUnsafeFromDataTxOutRef_$cunsafeFromBuiltinData`
+                            (headList {data} args))
+                         (`$fUnsafeFromDataMaybe_$cunsafeFromBuiltinData`
+                            {data}
+                            `$fUnsafeFromDataBuiltinData_$cunsafeFromBuiltinData`
+                            (headList {data} (tailList {data} args))))
+                    (/\dead ->
+                       ifThenElse
+                         {all dead. ScriptInfo}
+                         (equalsInteger 2 index)
+                         (/\dead ->
+                            RewardingScript
+                              (`$fUnsafeFromDataCredential_$cunsafeFromBuiltinData`
+                                 (headList {data} args)))
+                         (/\dead ->
+                            ifThenElse
+                              {all dead. ScriptInfo}
+                              (equalsInteger 3 index)
+                              (/\dead ->
+                                 CertifyingScript
+                                   (unIData (headList {data} args))
+                                   (`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData`
+                                      (headList {data} (tailList {data} args))))
+                              (/\dead ->
+                                 ifThenElse
+                                   {all dead. ScriptInfo}
+                                   (equalsInteger 4 index)
+                                   (/\dead ->
+                                      VotingScript
+                                        (`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData`
+                                           (headList {data} args)))
+                                   (/\dead ->
+                                      ifThenElse
+                                        {all dead. ScriptInfo}
+                                        (equalsInteger 5 index)
+                                        (/\dead ->
+                                           ProposingScript
+                                             (unIData (headList {data} args))
+                                             (`$fUnsafeFromDataProposalProcedure_$cunsafeFromBuiltinData`
+                                                (headList
+                                                   {data}
+                                                   (tailList {data} args))))
+                                        (/\dead ->
+                                           traceError {ScriptInfo} "PT1")
+                                        {all dead. dead})
+                                   {all dead. dead})
+                              {all dead. dead})
+                         {all dead. dead})
+                    {all dead. dead})
+               {all dead. dead}))
         (/\dead -> traceError {ScriptContext} "PT1")
         {all dead. dead})
       {Unit}
-      (\(ipv : TxInfo) (ipv : ScriptPurpose) ->
+      (\(ipv : TxInfo) (ipv : data) (ipv : ScriptInfo) ->
          ifThenElse
            {all dead. Unit}
            (equalsInteger
@@ -1305,4 +1387,5 @@
          , List []
          , Constr 1 []
          , Constr 1 [] ]
-     , Constr 1 [Constr 0 [B #, I 0]] ])
+     , I 1
+     , Constr 1 [Constr 0 [B #, I 0], Constr 1 []] ])
diff --git a/plutus-benchmark/script-contexts/test/9.6/checkScriptContext1.size.golden b/plutus-benchmark/script-contexts/test/9.6/checkScriptContext1.size.golden
@@ -1 +1 @@
-2785
+2961
diff --git a/plutus-benchmark/script-contexts/test/9.6/checkScriptContext2-20.budget.golden b/plutus-benchmark/script-contexts/test/9.6/checkScriptContext2-20.budget.golden
@@ -1,2 +1,2 @@
-({cpu: 275563740
-| mem: 1009660})
+({cpu: 277114223
+| mem: 1014786})
diff --git a/plutus-benchmark/script-contexts/test/9.6/checkScriptContext2-4.budget.golden b/plutus-benchmark/script-contexts/test/9.6/checkScriptContext2-4.budget.golden
@@ -1,2 +1,2 @@
-({cpu: 81588652
-| mem: 310268})
+({cpu: 83139135
+| mem: 315394})