Apply suggestions

src/BalanceTx/BalanceTx.purs

@@ -36,8 +36,7 @@ module BalanceTx
   , GetPublicKeyTransactionInputError(CannotConvertScriptOutputToTxInput)
   , GetWalletAddressError(CouldNotGetWalletAddress)
   , GetWalletCollateralError
-      ( CannotRequestCollateralForWallet
-      , CouldNotGetCollateral
+      ( CouldNotGetCollateral
       , WalletNotSpecified
       )
   , TxInputLockedError(TxInputLockedError)
@@ -168,8 +167,7 @@ instance Show GetWalletAddressError where
   show = genericShow
 
 data GetWalletCollateralError
-  = CannotRequestCollateralForWallet ImpossibleError
-  | CouldNotGetCollateral
+  = CouldNotGetCollateral
   | WalletNotSpecified
 
 derive instance Generic GetWalletCollateralError _
@@ -445,28 +443,10 @@ _redeemersTxIns = lens' \(UnattachedUnbalancedTx rec@{ redeemersTxIns }) ->
 
 setCollateral
   :: Transaction
-  -> Utxos
   -> QueryM (Either GetWalletCollateralError Transaction)
-setCollateral transaction utxos = runExceptT do
-  wallet <-
-    ExceptT $ asks (_.runtime >>> _.wallet) <#> note WalletNotSpecified
-  collateral <- ExceptT $ selectCollateral wallet
-  -- TODO: https://github.com/Plutonomicon/cardano-transaction-lib/pull/707
+setCollateral transaction = runExceptT do
+  collateral <- ExceptT $ getWalletCollateral <#> note CouldNotGetCollateral
   pure $ addTxCollateral collateral transaction
-  where
-  selectCollateral
-    :: Wallet
-    -> QueryM (Either GetWalletCollateralError (Array TransactionUnspentOutput))
-  selectCollateral (KeyWallet keyWallet) =
-    -- TODO: Combine with getWalletCollateral and supply with fee estimate
-    -- https://github.com/Plutonomicon/cardano-transaction-lib/issues/510
-    (unwrap keyWallet).selectCollateral <$> filterLockedUtxos utxos
-      <#> note CouldNotGetCollateral <<< map Array.singleton
-  selectCollateral wallet
-    | isJust (cip30Wallet wallet) =
-        getWalletCollateral <#> note CouldNotGetCollateral
-    | otherwise =
-        pure $ Left $ CannotRequestCollateralForWallet Impossible
 
 addTxCollateral :: Array TransactionUnspentOutput -> Transaction -> Transaction
 addTxCollateral utxos transaction =
@@ -507,7 +487,7 @@ balanceTxWithAddress
       if Array.null (unattachedTx ^. _redeemersTxIns)
       -- Don't set collateral if tx doesn't contain phase-2 scripts:
       then pure unbalancedTx'
-      else ExceptT $ setCollateral unbalancedTx' utxos
+      else ExceptT $ setCollateral unbalancedTx'
         <#> lmap GetWalletCollateralError'
 
     let

src/QueryM/Utxos.purs

@@ -153,6 +153,7 @@ getWalletCollateral = do
         networkId <- asks $ _.config >>> _.networkId
         addr <- liftAff $ (unwrap kw).address networkId
         utxos <- utxosAt addr <#> map unwrap >>> fromMaybe Map.empty
+          >>= filterLockedUtxos
         pure $ Array.singleton <$> (unwrap kw).selectCollateral utxos
   for_ mbCollateralUTxOs \collateralUTxOs -> do
     pparams <- asks $ _.runtime >>> _.pparams