Merge branch 'master' into misha/issue-100-time-conversions

Author: samuelWilliams99

bot-plutus-interface.cabal

@@ -127,6 +127,7 @@ library
     , plutus-pab
     , plutus-tx
     , plutus-tx-plugin
+    , prettyprinter
     , process
     , QuickCheck
     , row-types
@@ -144,6 +145,7 @@ library
     , transformers-except
     , unordered-containers
     , uuid
+    , vector
     , wai
     , warp
     , websockets
@@ -197,6 +199,7 @@ test-suite bot-plutus-interface-test
     , plutus-pab
     , plutus-tx
     , plutus-tx-plugin
+    , prettyprinter
     , QuickCheck
     , quickcheck-instances
     , row-types

flake.lock

@@ -2,7 +2,7 @@
   description = "bot-plutus-interface";
 
   inputs = {
-    haskell-nix.url = "github:L-as/haskell.nix";
+    haskell-nix.url = "github:mlabs-haskell/haskell.nix";
 
     nixpkgs.follows = "haskell-nix/nixpkgs-unstable";
 

flake.nix

@@ -11,7 +11,7 @@ import BotPlutusInterface.Effects (
   PABEffect,
   createDirectoryIfMissingCLI,
   posixTimeRangeToContainedSlotRange,
-  printLog,
+  printBpiLog,
  )
 import BotPlutusInterface.Files (DummyPrivKey, unDummyPrivateKey)
 import BotPlutusInterface.Files qualified as Files
@@ -65,6 +65,7 @@ import Plutus.V1.Ledger.Api (
 
 import BotPlutusInterface.BodyBuilder qualified as BodyBuilder
 import Data.Bifunctor (bimap)
+import Prettyprinter (pretty, viaShow, (<+>))
 import Prelude
 
 {- | Collect necessary tx inputs and collaterals, add minimum lovelace values and balance non ada
@@ -91,7 +92,7 @@ balanceTxIO pabConf ownPkh unbalancedTx =
             (unBalancedTxValidityTimeRange unbalancedTx)
             (unBalancedTxTx unbalancedTx)
 
-      lift $ printLog @w Debug $ show utxoIndex
+      lift $ printBpiLog @w Debug $ viaShow utxoIndex
 
       -- We need this folder on the CLI machine, which may not be the local machine
       lift $ createDirectoryIfMissingCLI @w False (Text.unpack "pcTxFileDir")
@@ -135,7 +136,7 @@ balanceTxIO pabConf ownPkh unbalancedTx =
 
       let minUtxos = prevMinUtxos ++ nextMinUtxos
 
-      lift $ printLog @w Debug $ "Min utxos: " ++ show minUtxos
+      lift $ printBpiLog @w Debug $ "Min utxos:" <+> pretty minUtxos
 
       -- Calculate fees by pre-balancing the tx, building it, and running the CLI on result
       txWithoutFees <-
@@ -147,7 +148,7 @@ balanceTxIO pabConf ownPkh unbalancedTx =
 
       let fees = nonBudgettedFees + getBudgetPrice (getExecutionUnitPrices pabConf) exBudget
 
-      lift $ printLog @w Debug $ "Fees: " ++ show fees
+      lift $ printBpiLog @w Debug $ "Fees:" <+> pretty fees
 
       -- Rebalance the initial tx with the above fees
       balancedTx <- hoistEither $ balanceTxStep minUtxos utxoIndex changeAddr $ tx `withFee` fees