Merge pull request #36 from Manta-Network/incremental_recovery

stechu · web-flow · commit 0879a4386ff3 · 2021-12-27T09:56:52.000-08:00
Incremental recovery changes
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "manta-signer"
 edition = "2018"
-version = "0.4.1"
+version = "0.5.0"
 authors = ["Manta Network <contact@manta.network>"]
 readme = "README.md"
 license-file = "LICENSE"
diff --git a/release.sh b/release.sh
@@ -28,7 +28,8 @@ The version numbers in the following files must be updated:
   2. ui/src-tauri/Cargo.toml
   3. ui/src-tauri/tauri.conf.json
   4. ui/public/about.html
- 
+  5. ui/package.json
+
 EOF
 prompt "Did you update the version numbers?"
 
diff --git a/src/service.rs b/src/service.rs
@@ -318,7 +318,7 @@ where
             .allow_credentials(false);
         let mut server = Server::with_state(State::new(config, authorizer));
         server.with(cors);
-        server.at("/heartbeat").get(Self::heartbeat);
+        server.at("/version").get(Self::version);
         server.at("/recoverAccount").post(Self::recover_account);
         server
             .at("/deriveShieldedAddress")
@@ -366,12 +366,13 @@ where
         self.0.state()
     }
 
-    /// Sends a heartbeat to the client.
+    /// Sends version to the client.
     #[inline]
-    async fn heartbeat(request: Request<A>) -> ServerResult<String> {
-        Self::log(String::from("HEARTBEAT")).await?;
+    async fn version(request: Request<A>) -> ServerResult {
+        Self::log(String::from("REQUEST: version")).await?;
         let _ = request;
-        Ok(String::from("heartbeat"))
+        Self::log(format!("RESPONSE: {:?}", VERSION)).await?;
+        Ok(Body::from_json(&VersionMessage::default())?.into())
     }
 
     /// Runs an account recovery for the given `request`.
@@ -499,14 +500,28 @@ where
     }
 }
 
+/// Version Message
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct VersionMessage {
+    /// Version
+    pub version: &'static str,
+}
+
+impl Default for VersionMessage {
+    /// Builds a default [`VersionMessage`].
+    fn default() -> Self {
+        Self { version: VERSION }
+    }
+}
+
 /// Shielded Address Message
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct ShieldedAddressMessage {
     /// Address
     pub address: Vec<u8>,
 
     /// Version
-    pub version: String,
+    pub version: &'static str,
 }
 
 impl ShieldedAddressMessage {
@@ -515,11 +530,10 @@ impl ShieldedAddressMessage {
     pub fn new(address: Vec<u8>) -> Self {
         Self {
             address,
-            version: "0.0.0".into(),
+            version: VERSION,
         }
     }
 }
-
 /// Recover Account Message
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct RecoverAccountMessage {
diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "manta-signer-ui",
-    "version": "0.4.0",
+    "version": "0.5.0",
     "private": true,
     "dependencies": {
         "@tauri-apps/api": "^1.0.0-beta.8",
@@ -43,4 +43,4 @@
     "devDependencies": {
         "@tauri-apps/cli": "^1.0.0-beta.10"
     }
-}
+}
diff --git a/ui/public/about.html b/ui/public/about.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
@@ -15,29 +16,36 @@
             color: black;
             font-family: monospace;
         }
+        
         main {
             text-align: center;
             margin-top: 3em;
         }
+        
         p {
             margin: 0.25em;
             font-size: 0.85em;
         }
+        
         button {
             margin: 1em;
             width: 6em;
         }
     </style>
 </head>
+
 <body>
     <main>
         <img src="Square89x89Logo.png" />
         <h3>Manta Signer</h3>
-        <p>Version 0.4.1</p>
+        <p>Version 0.5.0</p>
         <p>Copyright © 2019-2021 Manta Network</p>
-        <p><a href="https://github.com/manta-network/manta-signer">manta-network/manta-signer</a></p>
-        <br>
+        <p>
+            <a href="https://github.com/manta-network/manta-signer">manta-network/manta-signer</a>
+        </p>
+        <br />
         <p style="font-size: 0.75em; color: red">DOLPHIN TESTNET</p>
     </main>
 </body>
-</html>
+
+</html>
diff --git a/ui/src-tauri/Cargo.lock b/ui/src-tauri/Cargo.lock
diff --git a/ui/src-tauri/Cargo.toml b/ui/src-tauri/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "manta-signer-ui"
 edition = "2018"
-version = "0.4.1"
+version = "0.5.0"
 authors = ["Manta Network <contact@manta.network>"]
 readme = "README.md"
 license-file = "LICENSE"
diff --git a/ui/src-tauri/tauri.conf.json b/ui/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
     "package": {
         "productName": "Manta Signer",
-        "version": "0.4.1"
+        "version": "0.5.0"
     },
     "build": {
         "distDir": "../build",
@@ -87,4 +87,4 @@
             "iconAsTemplate": true
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "manta-signer-ui",`
`3`		`- "version": "0.4.0",`
	`3`	`+ "version": "0.5.0",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@tauri-apps/api": "^1.0.0-beta.8",`
`@@ -43,4 +43,4 @@`
`43`	`43`	`"devDependencies": {`
`44`	`44`	`"@tauri-apps/cli": "^1.0.0-beta.10"`
`45`	`45`	`}`
`46`		`-}`
	`46`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"package": {`
`3`	`3`	`"productName": "Manta Signer",`
`4`		`- "version": "0.4.1"`
	`4`	`+ "version": "0.5.0"`
`5`	`5`	`},`
`6`	`6`	`"build": {`
`7`	`7`	`"distDir": "../build",`
`@@ -87,4 +87,4 @@`
`87`	`87`	`"iconAsTemplate": true`
`88`	`88`	`}`
`89`	`89`	`}`
`90`		`-}`
	`90`	`+}`