wip

IntersectMBO · Oct 25, 2024 · cf638df · cf638df
1 parent fcde6bc
commit cf638df
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 53 deletions.
diff --git a/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs b/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs
@@ -649,11 +649,12 @@ genTxMintValue :: CardanoEra era -> Gen (TxMintValue BuildTx era)
 genTxMintValue =
   inEonForEra
     (pure TxMintNone)
-    $ \supported ->
+    $ \w -> do
+      values <- Gen.list (Range.constant 1 10) (genValueForMinting w)
       Gen.choice
         [ pure TxMintNone
-        -- TODO write a generator for the last parameter of 'TxMintValue' constructor
-        , TxMintValue supported <$> genValueForMinting supported <*> return (pure mempty)
+        -- TODO write a generator for ScriptWitness and use it here
+        , TxMintValue w . (, undefined) <$> values -- FIXME
         ]
 
 genTxBodyContent :: ShelleyBasedEra era -> Gen (TxBodyContent BuildTx era)

diff --git a/cardano-api/internal/Cardano/Api/Fees.hs b/cardano-api/internal/Cardano/Api/Fees.hs
@@ -1353,10 +1353,10 @@ calculateChangeValue
   :: ShelleyBasedEra era -> Value -> TxBodyContent build era -> Value
 calculateChangeValue sbe incoming txbodycontent =
   let outgoing = calculateCreatedUTOValue sbe txbodycontent
-      minted = case txMintValue txbodycontent of
+      mintedValues = case txMintValue txbodycontent of
         TxMintNone -> mempty
-        TxMintValue _ v _ -> v
-   in mconcat [incoming, minted, negateValue outgoing]
+        TxMintValue _ vs -> fst <$> vs
+   in mconcat $ [incoming] <> mintedValues <> [negateValue outgoing]
 
 -- | This is used in the balance calculation in the event where
 -- the user does not supply the UTxO(s) they intend to spend
@@ -1630,24 +1630,25 @@ substituteExecutionUnits
     mapScriptWitnessesMinting
       ( TxMintValue
           supported
-          value
-          (BuildTxWith witnesses)
-        ) =
-        -- TxMintValue supported value $ BuildTxWith $ fromList
-        let mappedScriptWitnesses
-              :: [(PolicyId, Either (TxBodyErrorAutoBalance era) (ScriptWitness WitCtxMint era))]
-            mappedScriptWitnesses =
-              [ (policyid, witness')
-              | -- The minting policies are indexed in policy id order in the value
-              let ValueNestedRep bundle = valueToNestedRep value
-              , (ix, ValueNestedBundle policyid _) <- zip [0 ..] bundle
-              , witness <- maybeToList (Map.lookup policyid witnesses)
-              , let witness' = substituteExecUnits (ScriptWitnessIndexMint ix) witness
-              ]
-         in do
-              final <- traverseScriptWitnesses mappedScriptWitnesses
-              Right . TxMintValue supported value . BuildTxWith $
-                fromList final
+          valueWitnesses
+        ) = undefined
+
+-- FIXME
+-- -- TxMintValue supported value $ BuildTxWith $ fromList
+-- let mappedScriptWitnesses
+--       :: [(PolicyId, Either (TxBodyErrorAutoBalance era) (ScriptWitness WitCtxMint era))]
+--     mappedScriptWitnesses =
+--       [ (policyid, witness')
+--       | -- The minting policies are indexed in policy id order in the value
+--       let ValueNestedRep bundle = valueToNestedRep value
+--       , (ix, ValueNestedBundle policyid _) <- zip [0 ..] bundle
+--       , witness <- maybeToList (Map.lookup policyid witnesses)
+--       , let witness' = substituteExecUnits (ScriptWitnessIndexMint ix) witness
+--       ]
+--  in do
+--       final <- traverseScriptWitnesses mappedScriptWitnesses
+--       Right . TxMintValue supported value . BuildTxWith $
+--         fromList final
 
 traverseScriptWitnesses
   :: [(a, Either (TxBodyErrorAutoBalance era) (ScriptWitness ctx era))]

diff --git a/cardano-api/internal/Cardano/Api/Tx/Body.hs b/cardano-api/internal/Cardano/Api/Tx/Body.hs
@@ -1275,10 +1275,7 @@ data TxMintValue build era where
   TxMintNone :: TxMintValue build era
   TxMintValue
     :: MaryEraOnwards era
-    -> Value
-    -> BuildTxWith
-        build
-        (Map PolicyId (ScriptWitness WitCtxMint era))
+    -> [(Value, BuildTxWith build (ScriptWitness WitCtxMint era))]
     -> TxMintValue build era
 
 deriving instance Eq (TxMintValue build era)
@@ -1862,7 +1859,7 @@ validateMintValue :: TxMintValue build era -> Either TxBodyError ()
 validateMintValue txMintValue =
   case txMintValue of
     TxMintNone -> return ()
-    TxMintValue _ v _ -> guard (selectLovelace v == 0) ?! TxBodyMintAdaError
+    TxMintValue _ vs -> forM_ vs $ \(v, _) -> guard (selectLovelace v == 0) ?! TxBodyMintAdaError
 
 inputIndexDoesNotExceedMax :: [(TxIn, a)] -> Either TxBodyError ()
 inputIndexDoesNotExceedMax txIns =
@@ -2318,20 +2315,26 @@ fromLedgerTxMintValue
   :: ShelleyBasedEra era
   -> Ledger.TxBody (ShelleyLedgerEra era)
   -> TxMintValue ViewTx era
-fromLedgerTxMintValue sbe body =
-  case sbe of
-    ShelleyBasedEraShelley -> TxMintNone
-    ShelleyBasedEraAllegra -> TxMintNone
-    ShelleyBasedEraMary -> toMintValue body MaryEraOnwardsMary
-    ShelleyBasedEraAlonzo -> toMintValue body MaryEraOnwardsAlonzo
-    ShelleyBasedEraBabbage -> toMintValue body MaryEraOnwardsBabbage
-    ShelleyBasedEraConway -> toMintValue body MaryEraOnwardsConway
- where
-  toMintValue txBody maInEra
-    | L.isZero mint = TxMintNone
-    | otherwise = TxMintValue maInEra (fromMaryValue mint) ViewTx
-   where
-    mint = MaryValue (Ledger.Coin 0) (txBody ^. L.mintTxBodyL)
+fromLedgerTxMintValue sbe body = forEraInEon (toCardanoEra sbe) TxMintNone $ \w -> maryEraOnwardsConstraints w $ do
+  let mint = MaryValue (Ledger.Coin 0) (body ^. L.mintTxBodyL)
+  if L.isZero mint
+    then TxMintNone
+    else TxMintValue w [(fromMaryValue mint, ViewTx)]
+
+-- TxMintValue w undefined
+--   case sbe of
+--     ShelleyBasedEraShelley -> TxMintNone
+--     ShelleyBasedEraAllegra -> TxMintNone
+--     ShelleyBasedEraMary -> toMintValue body MaryEraOnwardsMary
+--     ShelleyBasedEraAlonzo -> toMintValue body MaryEraOnwardsAlonzo
+--     ShelleyBasedEraBabbage -> toMintValue body MaryEraOnwardsBabbage
+--     ShelleyBasedEraConway -> toMintValue body MaryEraOnwardsConway
+--  where
+--   toMintValue txBody maInEra
+--     | L.isZero mint = TxMintNone
+--     | otherwise = TxMintValue maInEra (fromMaryValue mint) ViewTx
+--    where
+--     mint = MaryValue (Ledger.Coin 0) (txBody ^. L.mintTxBodyL)
 
 makeByronTransactionBody
   :: ()
@@ -2448,9 +2451,10 @@ convMintValue :: TxMintValue build era -> MultiAsset StandardCrypto
 convMintValue txMintValue =
   case txMintValue of
     TxMintNone -> mempty
-    TxMintValue _ v _ ->
-      case toMaryValue v of
-        MaryValue _ ma -> ma
+    TxMintValue _ vs ->
+      mconcat $ flip map vs $ \(v, _) ->
+        case toMaryValue v of
+          MaryValue _ ma -> ma
 
 convExtraKeyWitnesses
   :: TxExtraKeyWitnesses era -> Set (Shelley.KeyHash Shelley.Witness StandardCrypto)
@@ -3364,13 +3368,14 @@ collectTxBodyScriptWitnesses
       :: TxMintValue BuildTx era
       -> [(ScriptWitnessIndex, AnyScriptWitness era)]
     scriptWitnessesMinting TxMintNone = []
-    scriptWitnessesMinting (TxMintValue _ value (BuildTxWith witnesses)) =
-      [ (ScriptWitnessIndexMint ix, AnyScriptWitness witness)
-      | -- The minting policies are indexed in policy id order in the value
-      let ValueNestedRep bundle = valueToNestedRep value
-      , (ix, ValueNestedBundle policyid _) <- zip [0 ..] bundle
-      , witness <- maybeToList (Map.lookup policyid witnesses)
-      ]
+    scriptWitnessesMinting (TxMintValue _ _vw) = undefined
+    -- FIXME
+    -- [ (ScriptWitnessIndexMint ix, AnyScriptWitness witness)
+    -- \| -- The minting policies are indexed in policy id order in the value
+    -- let ValueNestedRep bundle = valueToNestedRep value
+    -- , (ix, ValueNestedBundle policyid _) <- zip [0 ..] bundle
+    -- , witness <- maybeToList (Map.lookup policyid witnesses)
+    -- ]
 
     scriptWitnessesVoting
       :: TxVotingProcedures BuildTx era