resolving TODOs and review comments

Author: mikekeke

src/BotPlutusInterface/CardanoCLI.hs

@@ -34,7 +34,11 @@ import BotPlutusInterface.Types (
   spendBudgets,
  )
 import BotPlutusInterface.UtxoParser qualified as UtxoParser
-import Cardano.Api.Shelley (NetworkId (Mainnet, Testnet), NetworkMagic (..), serialiseAddress)
+import Cardano.Api.Shelley (
+  NetworkId (Mainnet, Testnet),
+  NetworkMagic (NetworkMagic),
+  serialiseAddress,
+ )
 import Control.Monad (join)
 import Control.Monad.Freer (Eff, Member)
 import Data.Aeson qualified as JSON
@@ -53,7 +57,7 @@ import Data.Maybe (fromMaybe)
 import Data.Text (Text)
 import Data.Text qualified as Text
 import Data.Text.Encoding (decodeUtf8)
-import Ledger (Slot (Slot), SlotRange)
+import Ledger (Slot (Slot), SlotRange, TxInType (ConsumeScriptAddress))
 import Ledger qualified
 import Ledger.Ada (fromValue, getLovelace)
 import Ledger.Ada qualified as Ada
@@ -67,17 +71,39 @@ import Ledger.Interval (
  )
 import Ledger.Scripts (Datum, DatumHash (..))
 import Ledger.Scripts qualified as Scripts
-import Ledger.Tx (RedeemerPtr (..), Redeemers, ScriptTag (..), Tx (..), TxId (..), TxIn (..), TxInType (..), TxOut (..), TxOutRef (..), txId)
+import Ledger.Tx (
+  RedeemerPtr (RedeemerPtr),
+  Redeemers,
+  ScriptTag (Mint),
+  Tx (
+    txCollateral,
+    txData,
+    txFee,
+    txInputs,
+    txMint,
+    txMintScripts,
+    txOutputs,
+    txRedeemers,
+    txSignatures,
+    txValidRange
+  ),
+  TxId (TxId),
+  TxIn (TxIn),
+  TxInType (ConsumePublicKeyAddress, ConsumeSimpleScriptAddress),
+  TxOut (TxOut),
+  TxOutRef (TxOutRef),
+  txId,
+ )
 import Ledger.Tx.CardanoAPI (toCardanoAddressInEra)
 import Ledger.Value (Value)
 import Ledger.Value qualified as Value
 import Plutus.Script.Utils.Scripts qualified as ScriptUtils
 import Plutus.V1.Ledger.Api (
-  CurrencySymbol (..),
-  ExBudget (..),
-  ExCPU (..),
-  ExMemory (..),
-  TokenName (..),
+  CurrencySymbol (unCurrencySymbol),
+  ExBudget (ExBudget),
+  ExCPU (ExCPU),
+  ExMemory (ExMemory),
+  TokenName (unTokenName),
  )
 import PlutusTx.Builtins (fromBuiltin)
 import Prelude

src/BotPlutusInterface/Contract.hs

@@ -225,22 +225,6 @@ handlePABReq contractEnv req = do
   printBpiLog @w (Debug [PABLog]) $ pretty resp
   pure resp
 
--- do-not-remove yet, could be handy for debugging of "own" implementation below
--- "own" implementation will be tested with https://github.com/mlabs-haskell/plutip/issues/119
--- on local network
--- adjustUnbalancedTx' ::
---   forall (w :: Type) (effs :: [Type -> Type]).
---   ContractEnvironment w ->
---   UnbalancedTx ->
---   Eff effs (Either Tx.ToCardanoError UnbalancedTx)
--- adjustUnbalancedTx' contractEnv unbalancedTx = do
---   let slotConfig = SlotConfig 200 1654524000
---       networkId = contractEnv.cePABConfig.pcNetwork
---       maybeParams = contractEnv.cePABConfig.pcProtocolParams >>= \pparams -> pure $ Params slotConfig pparams networkId
---   case maybeParams of
---     Just params -> pure $ snd <$> adjustUnbalancedTx params unbalancedTx
---     _ -> pure . Left $ Tx.TxBodyError "no protocol params"
-
 adjustUnbalancedTx' ::
   forall (w :: Type) (effs :: [Type -> Type]).
   Member (PABEffect w) effs =>

test/Spec/BotPlutusInterface/Contract.hs

@@ -257,16 +257,15 @@ sendAdaStaking = do
           --protocol-params-file ./protocol.json --out-file ./txs/tx-?.raw
         |]
         )
-        -- TODO: figure out exact index for this command.
-        -- ,
-        --   ( 8
-        --   , [text|
-        --     cardano-cli transaction sign
-        --     --tx-body-file ./txs/tx-?.raw
-        --     --signing-key-file ./signing-keys/signing-key-${pkh1'}.skey
-        --     --out-file ./txs/tx-?.signed
-        --   |]
-        --   )
+      ,
+        ( 14
+        , [text|
+            cardano-cli transaction sign
+            --tx-body-file ./txs/tx-?.raw
+            --signing-key-file ./signing-keys/signing-key-${pkh1'}.skey
+            --out-file ./txs/tx-?.signed
+          |]
+        )
       ]
 
 multisigSupport :: Assertion
@@ -300,17 +299,16 @@ multisigSupport = do
           --protocol-params-file ./protocol.json --out-file ./txs/tx-?.raw
           |]
         )
-        -- TODO: figure out exact index for this command.
-        -- ,
-        --   ( 8
-        --   , [text|
-        --     cardano-cli transaction sign
-        --     --tx-body-file ./txs/tx-?.raw
-        --     --signing-key-file ./signing-keys/signing-key-${pkh1'}.skey
-        --     --signing-key-file ./signing-keys/signing-key-${pkh3'}.skey
-        --     --out-file ./txs/tx-?.signed
-        --     |]
-        --   )
+      ,
+        ( 14
+        , [text|
+            cardano-cli transaction sign
+            --tx-body-file ./txs/tx-?.raw
+            --signing-key-file ./signing-keys/signing-key-${pkh1'}.skey
+            --signing-key-file ./signing-keys/signing-key-${pkh3'}.skey
+            --out-file ./txs/tx-?.signed
+            |]
+        )
       ]
 
 withoutSigning :: Assertion
@@ -662,8 +660,7 @@ redeemFromValidator = do
   assertContract contract initState $ \state -> do
     assertCommandHistory
       state
-      [ -- TODO: Figure out why we need collateralTxId ?
-
+      [
         ( 1
         , [text|
           cardano-cli transaction build-raw --babbage-era

test/Spec/MockContract.hs

@@ -723,7 +723,6 @@ converCiTxOut (ScriptChainIndexTxOut addr val eitherDatum maybeRefSc _) =
 
 convertMaybeDatum :: Maybe (DatumHash, Maybe Datum) -> OutputDatum
 convertMaybeDatum = \case
-  -- FIXME" tmp implementation, check if something exists already for such conversion
   Nothing -> NoOutputDatum
   Just (dh, Nothing) -> OutputDatumHash dh
   Just (_dh, Just d) -> OutputDatum d