merge fixes

Author: mikekeke

bot-plutus-interface.cabal

@@ -84,12 +84,11 @@ library
     BotPlutusInterface.Effects
     BotPlutusInterface.Estimate
     BotPlutusInterface.Files
+    BotPlutusInterface.Helpers
     BotPlutusInterface.QueryNode
     BotPlutusInterface.Server
     BotPlutusInterface.Types
     BotPlutusInterface.UtxoParser
-    BotPlutusInterface.Server
-    BotPlutusInterface.Helpers
   build-depends:
     , aeson                      ^>=1.5.0.0
     , QuickCheck

examples/ex-units/app/Main.hs

@@ -71,6 +71,7 @@ mkPabConf pparams pparamsFile clusterDir ownPkh =
     , pcTipPollingInterval = 1_000_000
     , pcSlotConfig = def
     , pcOwnPubKeyHash = ownPkh
+    , pcOwnStakePubKeyHash = Nothing
     , pcScriptFileDir = Text.pack $ clusterDir </> "bot-plutus-interface/scripts"
     , pcSigningKeyFileDir = Text.pack $ clusterDir </> "bot-plutus-interface/signing-keys"
     , pcTxFileDir = Text.pack $ clusterDir </> "bot-plutus-interface/txs"

examples/ex-units/ex-units.cabal

@@ -86,6 +86,7 @@ library
     , plutus-pab
     , plutus-tx
     , text
+    , plutus-tx-plugin
 
 
 

src/BotPlutusInterface/CardanoCLI.hs

@@ -185,7 +185,7 @@ buildDraftTx ::
   Eff effs (Either Text FilePath)
 buildDraftTx pabConf privKeys tx = do
   _ <- buildTx @w pabConf privKeys emptyBudget tx
-  return $ Right (Text.unpack $ txFilePath pabConf "raw" tx)
+  return $ Right (Text.unpack $ txFilePath pabConf "raw" (txId tx))
 
 -- | Build a tx body and write it to disk
 buildTx ::