adjusting to Heinrich refactoring

cardano-foundation · Mar 1, 2024 · bcdbdf5 · bcdbdf5
1 parent 2ef2840
commit bcdbdf5
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 29 deletions.
diff --git a/lib/wallet/api/http/Cardano/Wallet/Api/Http/Shelley/Server.hs b/lib/wallet/api/http/Cardano/Wallet/Api/Http/Shelley/Server.hs
@@ -897,7 +897,7 @@ import qualified Cardano.Wallet.Api.Types.Amount as ApiAmount
 import qualified Cardano.Wallet.Api.Types.WalletAssets as ApiWalletAssets
 import qualified Cardano.Wallet.DB as W
 import qualified Cardano.Wallet.Delegation as WD
-import qualified Cardano.Wallet.IO.Delegation
+import qualified Cardano.Wallet.IO.Delegation as IODeleg
 import qualified Cardano.Wallet.Network as NW
 import qualified Cardano.Wallet.Primitive.Ledger.Convert as Convert
 import qualified Cardano.Wallet.Primitive.Types as W
@@ -2144,7 +2144,7 @@ selectCoinsForJoin ctx knownPools getPoolStatus poolId walletId = do
     poolStatus <- liftIO $ getPoolStatus poolId
     pools <- liftIO knownPools
     withWorkerCtx ctx walletId liftE liftE $ \workerCtx -> liftIO $ do
-        W.CoinSelection{..} <- Cardano.Wallet.IO.Delegation.selectCoinsForJoin
+        W.CoinSelection{..} <- IODeleg.selectCoinsForJoin
             workerCtx
             pools
             poolId
@@ -2177,7 +2177,7 @@ selectCoinsForQuit
 selectCoinsForQuit ctx (ApiT walletId) = do
     withWorkerCtx ctx walletId liftE liftE $ \workerCtx -> liftIO $ do
         W.CoinSelection{..} <-
-            Cardano.Wallet.IO.Delegation.selectCoinsForQuit workerCtx
+            IODeleg.selectCoinsForQuit workerCtx
         pure ApiCoinSelection
             { inputs = mkApiCoinSelectionInput <$> inputs
             , outputs = mkApiCoinSelectionOutput <$> outputs
@@ -2736,15 +2736,15 @@ constructTransaction api argGenChange knownPools poolStatus apiWalletId body = d
         currentEpochSlotting <- liftIO $ getCurrentEpochSlotting netLayer
         optionalDelegationAction <- liftIO $
             forM delegationRequest $
-                Cardano.Wallet.IO.Delegation.handleDelegationRequest
+                IODeleg.handleDelegationRequest
                     wrk
                     currentEpochSlotting knownPools
                     poolStatus withdrawal
 
         optionalVoteAction <- case (body ^. #vote) of
             Just (ApiT action) ->
                 liftIO $ Just <$>
-                    Cardano.Wallet.IO.Delegation.voteAction wrk action
+                    IODeleg.voteAction wrk action
             Nothing ->
                 pure Nothing
 
@@ -3286,13 +3286,13 @@ constructSharedTransaction
 
         optionalDelegationAction <- liftIO $
             forM delegationRequest $
-                Cardano.Wallet.IO.Delegation.handleDelegationRequest
+                IODeleg.handleDelegationRequest
                     wrk currentEpochSlotting knownPools
                     getPoolStatus NoWithdrawal
 
         optionalVoteAction <- case (body ^. #vote) of
             Just (ApiT action) -> liftIO $ Just <$>
-                Cardano.Wallet.IO.Delegation.voteAction wrk action
+                IODeleg.voteAction wrk action
             Nothing -> pure Nothing
 
         let txCtx = defaultTransactionCtx
@@ -3961,7 +3961,7 @@ joinStakePool
 
     withWorkerCtx ctx walletId liftE liftE $ \wrk -> do
         (BuiltTx{..}, txTime) <- liftIO
-            $ Cardano.Wallet.IO.Delegation.joinStakePool
+            $ IODeleg.joinStakePool
                 wrk
                 walletId
                 pools
@@ -4025,7 +4025,7 @@ quitStakePool ctx@ApiLayer{..} (ApiT walletId) body = do
 
     withWorkerCtx ctx walletId liftE liftE $ \wrk -> do
         (BuiltTx{..}, txTime) <- liftIO
-            $ Cardano.Wallet.IO.Delegation.quitStakePool
+            $ IODeleg.quitStakePool
                 wrk
                 walletId
                 (coerce $ getApiT $ body ^. #passphrase)

diff --git a/lib/wallet/src/Cardano/Wallet/Delegation.hs b/lib/wallet/src/Cardano/Wallet/Delegation.hs
@@ -40,6 +40,9 @@ import Cardano.Wallet.Primitive.Types
 import Cardano.Wallet.Primitive.Types.Coin
     ( Coin (..)
     )
+import Cardano.Wallet.Primitive.Types.DRep
+    ( DRep (..)
+    )
 import Cardano.Wallet.Transaction
     ( ErrCannotJoin (..)
     , Withdrawal (..)
@@ -81,15 +84,18 @@ joinStakePoolDelegationAction
     -> Set PoolId
     -> PoolId
     -> PoolLifeCycleStatus
-    -> Either ErrStakePoolDelegation Tx.DelegationAction
+    -> Bool
+    -> Either ErrStakePoolDelegation (Tx.DelegationAction, Maybe Tx.VotingAction)
 joinStakePoolDelegationAction
-    wallet currentEpochSlotting knownPools poolId poolStatus
+    wallet currentEpochSlotting knownPools poolId poolStatus inConway
   = case guardJoin knownPools delegation poolId retirementInfo of
         Left e -> Left $ ErrStakePoolJoin e
-        Right () -> Right $
-            if stakeKeyIsRegistered
-            then Tx.Join poolId
-            else Tx.JoinRegisteringKey poolId
+        Right () ->
+            Right $ case (inConway, stakeKeyIsRegistered) of
+                (False, True)  -> (Tx.Join poolId, Nothing)
+                (False, False) ->  (Tx.JoinRegisteringKey poolId, Nothing)
+                (True, True)  -> (Tx.Join poolId, Just $ Tx.Vote Abstain)
+                (True, False) ->  (Tx.JoinRegisteringKey poolId, Just $ Tx.Vote Abstain)
   where
     stakeKeyIsRegistered =
         Dlgs.isStakeKeyRegistered
@@ -136,9 +142,10 @@ quitStakePoolDelegationAction
     -- ^ Reward balance of the wallet
     -> CurrentEpochSlotting
     -> Withdrawal
+    -> Bool
     -> Either ErrStakePoolDelegation Tx.DelegationAction
-quitStakePoolDelegationAction wallet rewards currentEpochSlotting withdrawal =
-    case guardQuit delegation withdrawal rewards of
+quitStakePoolDelegationAction wallet rewards currentEpochSlotting withdrawal voting =
+    case guardQuit delegation withdrawal rewards voting of
         Left e -> Left $ ErrStakePoolQuit e
         Right () -> Right Tx.Quit
   where

diff --git a/lib/wallet/src/Cardano/Wallet/IO/Delegation.hs b/lib/wallet/src/Cardano/Wallet/IO/Delegation.hs
@@ -144,7 +144,7 @@ handleDelegationRequest
     WD.Join poolId -> do
         poolStatus <- getPoolStatus poolId
         pools <- getKnownPools
-        joinStakePoolDelegationAction
+        fst <$> joinStakePoolDelegationAction
             ctx
             currentEpochSlotting
             pools
@@ -199,17 +199,12 @@ selectCoinsForJoin ctx pools poolId poolStatus = do
         <- W.readNodeTipStateForTxWrite netLayer
     currentEpochSlotting <- W.getCurrentEpochSlotting netLayer
 
-    inConway <- case W.votingEnabledInEra era of
-        Left _ -> pure False
-        Right _ -> pure True
-
-    action <- joinStakePoolDelegationAction
+    (action, _) <- joinStakePoolDelegationAction
         ctx
         currentEpochSlotting
         pools
         poolId
         poolStatus
-        inConway
 
     let changeAddrGen = W.defaultChangeAddressGen (delegationAddressS @n)
 
@@ -298,7 +293,7 @@ joinStakePoolDelegationAction
     -> Set PoolId
     -> PoolId
     -> PoolLifeCycleStatus
-    -> IO Tx.DelegationAction
+    -> IO (Tx.DelegationAction, Maybe Tx.VotingAction)
 joinStakePoolDelegationAction
     ctx currentEpochSlotting knownPools poolId poolStatus
   = do
@@ -310,16 +305,25 @@ joinStakePoolDelegationAction
     traceWith tr
         $ W.MsgWallet $ W.MsgIsStakeKeyRegistered stakeKeyIsRegistered
 
+    (Write.PParamsInAnyRecentEra era _, _)
+        <- W.readNodeTipStateForTxWrite netLayer
+
+    inConway <- case W.votingEnabledInEra era of
+        Left _ -> pure False
+        Right _ -> pure True
+
     either (throwIO . ExceptionStakePoolDelegation) pure
         $ WD.joinStakePoolDelegationAction
             wallet
             currentEpochSlotting
             knownPools
             poolId
             poolStatus
+            inConway
   where
     db = ctx ^. dbLayer
     tr = ctx ^. logger
+    netLayer = ctx ^. networkLayer
 
 -- | Send a transaction to the network where we join a stake pool.
 joinStakePool
@@ -343,18 +347,15 @@ joinStakePool
     -> IO (W.BuiltTx, UTCTime)
 joinStakePool ctx wid pools poolId poolStatus passphrase = do
     pp <- currentProtocolParameters netLayer
-    (Write.PParamsInAnyRecentEra era _, _)
-        <- W.readNodeTipStateForTxWrite netLayer
     currentEpochSlotting <- W.getCurrentEpochSlotting netLayer
 
-    action <-
+    (action, _) <-
         joinStakePoolDelegationAction
             ctx
             currentEpochSlotting
             pools
             poolId
             poolStatus
-            inConway
 
     ttl <- W.transactionExpirySlot ti Nothing
     let transactionCtx =
@@ -393,12 +394,14 @@ quitStakePoolDelegationAction ctx currentEpochSlotting withdrawal = do
     wallet <- db & \DBLayer{atomically,walletState} ->
         atomically $ readDBVar walletState
     rewards <- W.fetchRewardBalance db
+    voting <- W.haveWeVoted db
     either (throwIO . ExceptionStakePoolDelegation) pure
         $ WD.quitStakePoolDelegationAction
             wallet
             rewards
             currentEpochSlotting
             withdrawal
+            voting
   where
     db = ctx ^. dbLayer