post-merge fixes

- fixed: failing balancing test
- fixed: formatting, linting

Author: mikekeke

src/BotPlutusInterface/Contract.hs

@@ -1,7 +1,6 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
 {-# LANGUAGE RankNTypes #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
-{-# LANGUAGE ViewPatterns #-}
 
 module BotPlutusInterface.Contract (runContract, handleContract) where
 
@@ -64,8 +63,8 @@ import Control.Monad.Trans.Either (EitherT, eitherT, firstEitherT, hoistEither,
 import Control.Monad.Trans.Except (ExceptT, throwE)
 import Data.Aeson (ToJSON, Value (Array, Bool, Null, Number, Object, String))
 import Data.Aeson.Extras (encodeByteString)
-import Data.Either.Combinators (maybeToLeft, swapEither)
 import Data.Aeson.KeyMap qualified as KeyMap
+import Data.Either.Combinators (maybeToLeft, swapEither)
 import Data.Function (fix, (&))
 import Data.Kind (Type)
 import Data.List.NonEmpty (NonEmpty ((:|)))

src/BotPlutusInterface/Types.hs

@@ -58,6 +58,7 @@ import Ledger (
   TxOutRef,
  )
 import Ledger qualified
+import Ledger.Ada qualified as Ada
 import Network.Wai.Handler.Warp (Port)
 import Numeric.Natural (Natural)
 import Plutus.PAB.Core.ContractInstance.STM (Activity)
@@ -71,7 +72,6 @@ import Prettyprinter qualified as PP
 import Servant.Client (BaseUrl (BaseUrl), Scheme (Http))
 import Wallet.Types (ContractInstanceId (..))
 import Prelude
-import Ledger.Ada qualified as Ada
 
 data PABConfig = PABConfig
   { -- | Calling the cli through ssh when set to Remote

src/PlutusConfig/Cardano/Api/Shelley.hs

@@ -21,9 +21,10 @@ import Cardano.Api.Shelley (ProtocolParameters (..))
 --   naturalSpec,
 --   sectionsSpec,
 --  )
+
+import Control.Exception (IOException, catch)
 import Data.Aeson qualified as JSON
 import Data.ByteString.Lazy qualified as LazyByteString
-import Control.Exception (IOException, catch)
 
 -- import Data.Default (def)
 -- import Data.Text qualified as Text
@@ -280,9 +281,9 @@ import Prelude
 --     pure ProtocolParameters {..}
 
 readProtocolParametersJSON :: FilePath -> IO (Either String ProtocolParameters)
-readProtocolParametersJSON fn = 
-  (JSON.eitherDecode <$> LazyByteString.readFile fn) 
-  `catch` (\(e :: IOException) -> pure $ Left (show e))
+readProtocolParametersJSON fn =
+  (JSON.eitherDecode <$> LazyByteString.readFile fn)
+    `catch` (\(e :: IOException) -> pure $ Left (show e))
 
 writeProtocolParametersJSON :: FilePath -> ProtocolParameters -> IO ()
 writeProtocolParametersJSON fn params =

test/Spec/BotPlutusInterface/Balance.hs

@@ -9,6 +9,7 @@ import Data.Set qualified as Set
 import Data.Text qualified as Text
 import Ledger qualified
 import Ledger.Ada qualified as Ada
+import Ledger.Ada qualified as Value
 import Ledger.Address (Address, PaymentPubKeyHash (PaymentPubKeyHash))
 import Ledger.Address qualified as Address
 import Ledger.CardanoWallet qualified as Wallet
@@ -66,7 +67,7 @@ addUtxosForFees = do
       ownAddr = addr1
       ebalancedTx =
         fst $
-          runPABEffectPure def $
+          runPABEffectPure def $ do
             Balance.balanceTxStep @() @'[PABEffect ()] defaultBalanceConfig utxoIndex ownAddr tx
 
   case ebalancedTx of
@@ -75,7 +76,15 @@ addUtxosForFees = do
 
 addUtxosForNativeTokens :: Assertion
 addUtxosForNativeTokens = do
-  let txout = TxOut addr2 (Value.singleton "11223344" "Token" 123) Nothing
+  let minimumAdaRequired = Value.adaValueOf 1
+      {- `minimumAdaRequired` has to be added to `txout` because
+       balancing now decoupled from adjusting minimum Ada amount in output,
+       and adjusting happens during `adjustUnbalancedTx` Contract
+       effect execution *before* balancing. Adding `minimumAdaRequired`
+       to `txout` Value aims to simulate result of `adjustUnbalancedTx` call.
+       Note that 1 Ada is test value - real amount is determined by Ledger and can vary.
+      -}
+      txout = TxOut addr2 (Value.singleton "11223344" "Token" 123 <> minimumAdaRequired) Nothing
       tx = mempty {txOutputs = [txout]} `withFee` 500_000
       utxoIndex = Map.fromList [utxo1, utxo2, utxo3, utxo4]
       ownAddr = addr1

test/Spec/BotPlutusInterface/Collateral.hs

@@ -12,7 +12,7 @@ import Ledger qualified
 import Ledger.Ada qualified as Ada
 import Ledger.Constraints qualified as Constraints
 import Ledger.Scripts qualified as Scripts
-import Ledger.Tx (CardanoTx, TxOut (TxOut), TxOutRef (TxOutRef), ChainIndexTxOut (PublicKeyChainIndexTxOut))
+import Ledger.Tx (CardanoTx, ChainIndexTxOut (PublicKeyChainIndexTxOut), TxOut (TxOut), TxOutRef (TxOutRef))
 import Ledger.Tx qualified as Tx
 import Ledger.Tx qualified as TxId
 import Ledger.Value qualified as Value
@@ -44,13 +44,13 @@ import Control.Concurrent.STM (newTVarIO)
 
 import Spec.BotPlutusInterface.Contract (assertCommandHistory, assertContract)
 
+import Plutus.ChainIndex (OutputDatum (NoOutputDatum))
 import PlutusTx qualified
 import PlutusTx.Builtins (fromBuiltin)
 import System.IO.Unsafe (unsafePerformIO)
 import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.HUnit (Assertion, assertEqual, testCase)
 import Prelude
-import Plutus.ChainIndex (OutputDatum(NoOutputDatum))
 
 tests :: TestTree
 tests =