Implement

Author: parsonsmatt

lib/src/Pos/Node/API.hs

@@ -613,14 +613,10 @@ type API =
     :<|>
         InfoAPI
     :<|>
-        "update"
-            :> ( "apply"
-                :> Summary "Apply the next available update"
-                :> Post '[ValidJSON] NoContent
-            :<|> "postpone"
-                :> Summary "Discard and postpone the next available update"
-                :> Post '[ValidJSON] NoContent
-            :<|> "next"
-                :> Summary "Version of the next update (404 if none)"
-                :> Get '[ValidJSON] (APIResponse (V1 Core.SoftwareVersion))
-            )
+        Summary "Version of the next update (404 if none)"
+        :> "next-update"
+        :> Get '[ValidJSON] (APIResponse (V1 Core.SoftwareVersion))
+    :<|>
+        Summary "Restart the underlying node software."
+        :> "restart-node"
+        :> Post '[ValidJSON] NoContent

node/src/Cardano/Node/API.hs

@@ -25,7 +25,8 @@ import           Ntp.Client (NtpConfiguration, NtpStatus (..),
 import           Ntp.Packet (NtpOffset)
 import           Pos.Chain.Block (LastKnownHeader, LastKnownHeaderTag)
 import           Pos.Chain.Ssc (SscContext)
-import           Pos.Chain.Update (SoftwareVersion, UpdateConfiguration,
+import           Pos.Chain.Update (ConfirmedProposalState (..), SoftwareVersion,
+                     UpdateConfiguration, UpdateProposal (..),
                      curSoftwareVersion)
 import           Pos.Client.CLI.NodeOptions (NodeApiArgs (..))
 import           Pos.Context (HasPrimaryKey (..), HasSscContext (..),
@@ -39,6 +40,7 @@ import           Pos.DB.GState.Lock (Priority (..), StateLock,
                      withStateLockNoMetrics)
 import qualified Pos.DB.Rocks as DB
 import           Pos.DB.Txp.MemState (GenericTxpLocalData, TxpHolderTag)
+import           Pos.DB.Update (UpdateContext (..))
 import           Pos.Infra.Diffusion.Subscription.Status (ssMap)
 import           Pos.Infra.Diffusion.Types (Diffusion (..))
 import           Pos.Infra.InjectFail (FInject (..), testLogFInject)
@@ -163,6 +165,7 @@ launchNodeServer
                 updateConfiguration
                 compileTimeInfo
                 shutdownCtx
+                (ncUpdateContext nodeCtx)
             :<|> legacyApi
 
     concurrently_
@@ -213,13 +216,13 @@ handlers
     -> UpdateConfiguration
     -> CompileTimeInfo
     -> ShutdownContext
+    -> UpdateContext
     -> ServerT Node.API Handler
-handlers d t s n l ts sv uc ci sc =
+handlers d t s n l ts sv uc ci sc uCtx =
     getNodeSettings ci uc ts sv
     :<|> getNodeInfo d t s n l
-    :<|> applyUpdate sc
-    :<|> postponeUpdate
-    :<|> getNextUpdate
+    :<|> getNextUpdate uCtx
+    :<|> restartNode sc
 
 --------------------------------------------------------------------------------
 -- Node Settings
@@ -263,33 +266,23 @@ instance Core.HasSlottingVar SettingsCtx where
 -- Updates
 --------------------------------------------------------------------------------
 
-applyUpdate :: ShutdownContext -> Handler NoContent
-applyUpdate shutdownCtx = liftIO $ do
+-- | Handler
+restartNode :: ShutdownContext -> Handler NoContent
+restartNode shutdownCtx = liftIO $ do
     doFail <- testLogFInject (_shdnFInjects shutdownCtx) FInjApplyUpdateNoExit
     unless doFail (runReaderT triggerShutdown shutdownCtx)
     pure NoContent
 
--- | In the old implementation, we would delete the new update from the
--- acid-stae database. We no longer persist this information, so postponing an
--- update is simply a noop.
---
--- TODO: verify this is a real thought and not, in fact, bad
-postponeUpdate :: Handler NoContent
-postponeUpdate = do
-    pure NoContent
-
 -- | This endpoint does a 404 unless there is an update available. If an update
 -- is available, it returns the 'SoftwareVersion' for that update.
-getNextUpdate :: Handler (APIResponse (V1 SoftwareVersion))
-getNextUpdate = do
-    mupdate <- readUpdate
-    single <$> case mupdate of
-        Just update ->
-            pure update
+getNextUpdate :: UpdateContext -> Handler (APIResponse (V1 SoftwareVersion))
+getNextUpdate uc = do
+    mproposalState <- tryReadMVar (ucDownloadedUpdate uc)
+    single <$> case mproposalState of
+        Just proposalState ->
+            pure (V1 (upSoftwareVersion (cpsUpdateProposal proposalState)))
         Nothing ->
             throwError err404
-  where
-    readUpdate = undefined
 
 --------------------------------------------------------------------------------
 -- Node Info