Fix buildRaw throwing away build errors

Author: szg251

src/BotPlutusInterface/BodyBuilder.hs

@@ -10,6 +10,7 @@ import BotPlutusInterface.Effects (PABEffect, estimateBudget)
 
 import BotPlutusInterface.Files (
   DummyPrivKey,
+  txFilePath,
  )
 import BotPlutusInterface.Types (PABConfig, TxFile (Raw))
 import Control.Monad.Freer (Eff, Member)
@@ -18,7 +19,7 @@ import Data.Kind (Type)
 import Data.Map (Map)
 import Data.Text (Text)
 import Data.Text qualified as Text
-import Ledger (ExBudget, Tx)
+import Ledger (ExBudget, Tx, txId)
 import Ledger.Crypto (PubKeyHash)
 import Prelude
 
@@ -36,10 +37,10 @@ buildRaw ::
   Eff effs (Either Text ExBudget)
 buildRaw pabConf privKeys tx = runEitherT $ do
   buildDraftTxBody
-    >>= estimateBudgetByDraftBody
+    >> estimateBudgetByDraftBody (Text.unpack $ txFilePath pabConf "raw" (txId tx))
     >>= buildBodyUsingEstimatedBudget
   where
-    buildDraftTxBody = newEitherT $ CardanoCLI.buildDraftTx @w pabConf privKeys tx
+    buildDraftTxBody = newEitherT $ CardanoCLI.buildTx @w pabConf privKeys mempty tx
 
     estimateBudgetByDraftBody path =
       firstEitherT toText . newEitherT $ estimateBudget @w (Raw path)

src/BotPlutusInterface/CardanoCLI.hs

@@ -12,7 +12,6 @@ module BotPlutusInterface.CardanoCLI (
   policyScriptFilePath,
   utxosAt,
   queryTip,
-  buildDraftTx,
 ) where
 
 import BotPlutusInterface.Effects (PABEffect, ShellArgs (..), callCommand)
@@ -25,7 +24,7 @@ import BotPlutusInterface.Files (
   txFilePath,
   validatorScriptFilePath,
  )
-import BotPlutusInterface.Types (MintBudgets, PABConfig, SpendBudgets, Tip, TxBudget, emptyBudget, mintBudgets, spendBudgets)
+import BotPlutusInterface.Types (MintBudgets, PABConfig, SpendBudgets, Tip, TxBudget, mintBudgets, spendBudgets)
 import BotPlutusInterface.UtxoParser qualified as UtxoParser
 import Cardano.Api.Shelley (NetworkId (Mainnet, Testnet), NetworkMagic (..), serialiseAddress)
 import Control.Monad (join)
@@ -173,20 +172,6 @@ calculateMinFee pabConf tx =
         , cmdOutParser = mapLeft Text.pack . parseOnly UtxoParser.feeParser . Text.pack
         }
 
-{- | Build draft tx body w/o setting ExBudget for inputs.
- This body will be used to estimate `ExBudget` with `Cardano.Api` by `BodyBuilder`
--}
-buildDraftTx ::
-  forall (w :: Type) (effs :: [Type -> Type]).
-  Member (PABEffect w) effs =>
-  PABConfig ->
-  Map PubKeyHash DummyPrivKey ->
-  Tx ->
-  Eff effs (Either Text FilePath)
-buildDraftTx pabConf privKeys tx = do
-  _ <- buildTx @w pabConf privKeys emptyBudget tx
-  return $ Right (Text.unpack $ txFilePath pabConf "raw" (txId tx))
-
 -- | Build a tx body and write it to disk
 buildTx ::
   forall (w :: Type) (effs :: [Type -> Type]).

src/BotPlutusInterface/Types.hs

@@ -20,7 +20,6 @@ module BotPlutusInterface.Types (
   BudgetEstimationError (..),
   SpendBudgets,
   MintBudgets,
-  emptyBudget,
 ) where
 
 import Cardano.Api (NetworkId (Testnet), NetworkMagic (..), ScriptExecutionError, ScriptWitnessIndex)
@@ -185,9 +184,11 @@ data TxBudget = TxBudget
   }
   deriving stock (Show)
 
--- | Budget with no estimations for `CardanoCLI.buildDraftTx`
-emptyBudget :: TxBudget
-emptyBudget = TxBudget mempty mempty
+instance Semigroup TxBudget where
+  TxBudget s m <> TxBudget s' m' = TxBudget (s <> s') (m <> m')
+
+instance Monoid TxBudget where
+  mempty = TxBudget mempty mempty
 
 type SpendBudgets = Map TxOutRef ExBudget