Don't adjust the fee within the Shelley transaction layer.

At this point, the fee should already be correct, and deposits should already have been accounted for.
cardano-foundation · Sep 23, 2021 · a32ff83 · a32ff83
1 parent f2ef5ca
commit a32ff83
Showing 1 changed file with 8 additions and 28 deletions.
diff --git a/lib/shelley/src/Cardano/Wallet/Shelley/Transaction.hs b/lib/shelley/src/Cardano/Wallet/Shelley/Transaction.hs
@@ -346,8 +346,8 @@ newTransactionLayer networkId = TransactionLayer
             Nothing -> do
                 withShelleyBasedEra era $ do
                     let payload = TxPayload (view #txMetadata ctx) mempty mempty
-                    let fees = delta
-                    mkTx networkId payload ttl stakeCreds keystore wdrl selection fees
+                    mkTx networkId payload ttl stakeCreds keystore wdrl
+                        selection delta
 
             Just action -> do
                 withShelleyBasedEra era $ do
@@ -357,12 +357,8 @@ newTransactionLayer networkId = TransactionLayer
                             [ mkShelleyWitness unsigned stakeCreds
                             ]
                     let payload = TxPayload (view #txMetadata ctx) certs mkWits
-                    let fees = case action of
-                            RegisterKeyAndJoin{} ->
-                                unsafeSubtractCoin selection delta (stakeKeyDeposit pp)
-                            _ ->
-                                delta
-                    mkTx networkId payload ttl stakeCreds keystore wdrl selection fees
+                    mkTx networkId payload ttl stakeCreds keystore wdrl
+                        selection delta
 
     , mkUnsignedTransaction = \era stakeXPub pp ctx selection -> do
         let ttl   = txTimeToLive ctx
@@ -373,19 +369,15 @@ newTransactionLayer networkId = TransactionLayer
             Nothing -> do
                 withShelleyBasedEra era $ do
                     let md = view #txMetadata ctx
-                    let fees = delta
-                    constructUnsignedTx networkId (md, []) ttl rewardAcct wdrl selection fees
+                    constructUnsignedTx networkId (md, []) ttl rewardAcct wdrl
+                        selection delta
 
             Just action -> do
                 withShelleyBasedEra era $ do
                     let certs = mkDelegationCertificates action stakeXPub
                     let payload = (view #txMetadata ctx, certs)
-                    let fees = case action of
-                            RegisterKeyAndJoin{} ->
-                                unsafeSubtractCoin selection delta (stakeKeyDeposit pp)
-                            _ ->
-                                delta
-                    constructUnsignedTx networkId payload ttl rewardAcct wdrl selection fees
+                    constructUnsignedTx networkId payload ttl rewardAcct wdrl
+                        selection delta
 
     , calcMinimumCost = \pp ctx skeleton ->
         estimateTxCost pp $
@@ -409,18 +401,6 @@ newTransactionLayer networkId = TransactionLayer
     , updateTx = \_sealedTx _inpsOuts ->
             error "updateTx not implemented"
     }
-  where
-    unsafeSubtractCoin
-        :: (HasCallStack, Buildable ctx) => ctx -> Coin -> Coin -> Coin
-    unsafeSubtractCoin ctx a b = case a `subtractCoin` b of
-        Nothing -> error $ unlines
-            [ "unsafeSubtractCoin: got a negative value. Tried to subtract "
-            <> show b <> " from " <> show a <> "."
-            , "In the context of: "
-            , pretty ctx
-            ]
-        Just c ->
-            c
 
 _decodeSealedTx :: SealedTx -> Tx
 _decodeSealedTx (cardanoTx -> InAnyCardanoEra _era tx) = fromCardanoTx tx