Merge pull request #2260 from input-output-hk/jc/change-total-executi…

…on-units-check Replace totExunits check with redeemer check
IntersectMBO · Apr 28, 2021 · 62fc23a · 62fc23a
2 parents e8f19bc + 0a0b6c6
commit 62fc23a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/alonzo/impl/src/Cardano/Ledger/Alonzo/Rules/Utxo.hs b/alonzo/impl/src/Cardano/Ledger/Alonzo/Rules/Utxo.hs
@@ -24,6 +24,7 @@ import Cardano.Ledger.Alonzo.Tx
     isTwoPhaseScriptAddress,
     minfee,
     txbody,
+    wits',
   )
 import qualified Cardano.Ledger.Alonzo.Tx as Alonzo (ValidatedTx, txins)
 import Cardano.Ledger.Alonzo.TxBody
@@ -32,6 +33,7 @@ import Cardano.Ledger.Alonzo.TxBody
   )
 import qualified Cardano.Ledger.Alonzo.TxBody as Alonzo (TxBody, TxOut)
 import qualified Cardano.Ledger.Alonzo.TxSeq as Alonzo (TxSeq)
+import Cardano.Ledger.Alonzo.TxWitness (TxWitness (txrdmrs'), nullRedeemers)
 import Cardano.Ledger.Coin
 import qualified Cardano.Ledger.Core as Core
 import Cardano.Ledger.Era (Crypto, Era, TxInBlock, ValidateScript (..))
@@ -262,7 +264,7 @@ feesOK pp tx (UTxO m) = do
   -- Part 1
   (minimumFee <= theFee) ?! FeeTooSmallUTxO minimumFee theFee
   -- Part 2
-  if (getField @"totExunits" tx) == (ExUnits 0 0)
+  if nullRedeemers . txrdmrs' . wits' $ tx
     then pure ()
     else do
       -- Part 3

diff --git a/alonzo/impl/src/Cardano/Ledger/Alonzo/TxWitness.hs b/alonzo/impl/src/Cardano/Ledger/Alonzo/TxWitness.hs
@@ -25,6 +25,7 @@ module Cardano.Ledger.Alonzo.TxWitness
         Redeemers'
       ),
     unRedeemers,
+    nullRedeemers,
     TxWitness
       ( TxWitness,
         txwitsVKey,