Revert "Modify estimateTransactionKeyWitnessCount to estimate simpl…

…e scripts too" This reverts commit 26b5d51.
IntersectMBO · Feb 17, 2025 · da871c3 · da871c3
1 parent 26b5d51
commit da871c3
Showing 1 changed file with 1 addition and 24 deletions.
diff --git a/cardano-api/src/Cardano/Api/Internal/Fees.hs b/cardano-api/src/Cardano/Api/Internal/Fees.hs
@@ -89,12 +89,10 @@ import           Control.Monad
 import           Data.Bifunctor (bimap, first, second)
 import           Data.ByteString.Short (ShortByteString)
 import           Data.Function ((&))
-import           Data.List (sortBy)
 import qualified Data.List as List
 import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
 import           Data.Maybe
-import           Data.Ord (Down (Down), comparing)
 import qualified Data.OSet.Strict as OSet
 import           Data.Ratio
 import           Data.Set (Set)
@@ -466,7 +464,7 @@ estimateTransactionKeyWitnessCount
     , txUpdateProposal
     } =
     fromIntegral $
-      sum (map estimateTxInWitnesses txIns)
+      length [() | (_txin, BuildTxWith KeyWitness{}) <- txIns]
         + case txInsCollateral of
           TxInsCollateral _ txins ->
             length txins
@@ -488,27 +486,6 @@ estimateTransactionKeyWitnessCount
           TxUpdateProposal _ (UpdateProposal updatePerGenesisKey _) ->
             Map.size updatePerGenesisKey
           _ -> 0
-   where
-    estimateTxInWitnesses :: (TxIn, BuildTxWith BuildTx (Witness WitCtxTxIn era)) -> Int
-    estimateTxInWitnesses (_, BuildTxWith (KeyWitness _)) = 1
-    estimateTxInWitnesses (_, BuildTxWith (ScriptWitness _ (SimpleScriptWitness _ (SScript simpleScript)))) = maxWitnessesInSimpleScript simpleScript
-    estimateTxInWitnesses (_, BuildTxWith (ScriptWitness _ (SimpleScriptWitness _ (SReferenceScript _)))) = 0
-    estimateTxInWitnesses (_, BuildTxWith (ScriptWitness _ (PlutusScriptWitness{}))) = 0
-
-    -- This is a rough conservative estimate of the maximum number of witnesses
-    -- needed for a simple script to be satisfied. It is conservative because it
-    -- assumes that each key hash only appears once, and it assumes the worst
-    -- scenario. A more accurate estimate for the maximum could be computed by
-    -- keeping track of the possible combinations of key hashes that have
-    -- potentially already been counted, but that would increase complexity a lot,
-    -- and it would still be a conservative estimate.
-    maxWitnessesInSimpleScript :: SimpleScript -> Int
-    maxWitnessesInSimpleScript (RequireSignature _) = 1
-    maxWitnessesInSimpleScript (RequireTimeBefore _) = 0
-    maxWitnessesInSimpleScript (RequireTimeAfter _) = 0
-    maxWitnessesInSimpleScript (RequireAllOf simpleScripts) = sum $ map maxWitnessesInSimpleScript simpleScripts
-    maxWitnessesInSimpleScript (RequireAnyOf simpleScripts) = maximum $ map maxWitnessesInSimpleScript simpleScripts
-    maxWitnessesInSimpleScript (RequireMOf n simpleScripts) = sum $ take n $ sortBy (comparing Down) (map maxWitnessesInSimpleScript simpleScripts)
 
 -- ----------------------------------------------------------------------------
 -- Script execution units