Merge pull request #208 from Zondax/dev

Author: carlosala

package.json

@@ -31,39 +31,39 @@
     "url": "https://github.com/zondax/zemu/issues"
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.8.8",
+    "@grpc/grpc-js": "^1.8.12",
     "@grpc/proto-loader": "^0.7.5",
-    "@ledgerhq/hw-transport": "^6.28.0",
-    "@ledgerhq/hw-transport-http": "^6.27.11",
-    "axios": "^1.3.3",
+    "@ledgerhq/hw-transport": "^6.28.1",
+    "@ledgerhq/hw-transport-http": "^6.27.12",
+    "axios": "^1.3.4",
     "axios-retry": "^3.4.0",
     "dockerode": "^3.3.1",
     "elfy": "^1.0.0",
     "fs-extra": "^11.0.0",
     "get-port": "^5.1.1",
-    "pngjs": "^6.0.0",
+    "pngjs": "^7.0.0",
     "randomstring": "^1.2.3"
   },
   "devDependencies": {
     "@types/dockerode": "^3.3.11",
     "@types/fs-extra": "^11.0.1",
     "@types/jest": "^29.4.0",
-    "@types/node": "^18.13.0",
+    "@types/node": "^18.14.6",
     "@types/pngjs": "^6.0.1",
     "@types/randomstring": "^1.1.8",
-    "@typescript-eslint/eslint-plugin": "^5.52.0",
-    "@typescript-eslint/parser": "^5.52.0",
-    "@zondax/ledger-substrate": "^0.40.4",
+    "@typescript-eslint/eslint-plugin": "^5.54.1",
+    "@typescript-eslint/parser": "^5.54.1",
+    "@zondax/ledger-substrate": "^0.40.5",
     "copyfiles": "^2.4.1",
-    "eslint": "^8.34.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint": "^8.35.0",
+    "eslint-config-prettier": "^8.7.0",
     "eslint-config-standard-with-typescript": "^34.0.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-n": "^15.6.1",
     "eslint-plugin-promise": "^6.0.0",
-    "jest": "^29.4.2",
+    "jest": "^29.5.0",
     "prettier": "^2.8.4",
-    "rimraf": "^4.1.2",
+    "rimraf": "^4.3.1",
     "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5"

src/Zemu.ts

@@ -131,8 +131,8 @@ export default class Zemu {
     clearTimeout(timer);
   }
 
-  static checkAndPullImage(): void {
-    EmuContainer.checkAndPullImage(DEFAULT_EMU_IMG);
+  static async checkAndPullImage(): Promise<void> {
+    await EmuContainer.checkAndPullImage(DEFAULT_EMU_IMG);
   }
 
   static checkElf(model: TModel, elfPath: string): void {

src/buttons.ts

@@ -24,97 +24,97 @@ export const dummyButton: IButton = {
 const infoButton: IButton = {
   x: 375,
   y: 30,
-  delay: 0.5,
+  delay: 0.1,
 };
 
 const quitAppButton: IButton = {
   x: 0,
   y: 0,
-  delay: 0.5,
+  delay: 0.1,
 };
 
 export const tapContinueButton: IButton = {
   x: 200,
   y: 250,
-  delay: 0.5,
+  delay: 0.1,
 };
 
 const prevPageButton: IButton = {
   x: 35,
   y: 35,
-  delay: 0.5,
+  delay: 0.1,
 };
 
 const toggleOption1: IButton = {
   x: 350,
   y: 125,
-  delay: 0.5,
+  delay: 0.1,
 };
 
 const toggleOption2: IButton = {
   x: 350,
   y: 200,
-  delay: 0.5,
+  delay: 0.1,
 };
 
 const toggleOption3: IButton = {
   x: 350,
   y: 250,
-  delay: 0.5,
+  delay: 0.1,
 };
 
 const navRightButton: IButton = {
   x: 300,
   y: 625,
-  delay: 0.5,
+  delay: 0.1,
 };
 
 const navLeftButton: IButton = {
   x: 100,
   y: 625,
-  delay: 0.5,
+  delay: 0.1,
 };
 
 const approveTapButton: IButton = {
   x: 200,
   y: 550,
-  delay: 0.5,
+  delay: 0.1,
 };
 
 const approveHoldButton: IButton = {
   x: 335,
   y: 525,
-  delay: 6,
+  delay: 3,
 };
 
 const rejectButton: IButton = {
   x: 200,
   y: 650,
-  delay: 0.5,
+  delay: 0.1,
 };
 
 const confirmYesButton: IButton = {
   x: 200,
   y: 550,
-  delay: 0.5,
+  delay: 0.1,
 };
 
 const confirmNoButton: IButton = {
   x: 200,
   y: 650,
-  delay: 0.5,
+  delay: 0.1,
 };
 
 const showQRButton: IButton = {
   x: 200,
   y: 300,
-  delay: 0.5,
+  delay: 0.1,
 };
 
 const closeQRButton: IButton = {
   x: 200,
   y: 650,
-  delay: 0.5,
+  delay: 0.1,
 };
 
 export const TouchElements = new Map<ButtonKind, IButton>([

src/constants.ts

@@ -15,8 +15,7 @@
  ******************************************************************************* */
 import { ButtonKind, type IDeviceWindow, type IStartOptions } from "./types";
 
-export const DEFAULT_EMU_IMG =
-  "zondax/builder-zemu@sha256:8d7b06cedf2d018b9464f4af4b7a8357c3fbb180f3ab153f8cb8f138defb22a4";
+export const DEFAULT_EMU_IMG = "zondax/builder-zemu:f9192ca";
 
 export const DEFAULT_MODEL = "nanos";
 export const DEFAULT_START_TEXT = "Ready";

src/emulator.ts

@@ -52,28 +52,32 @@ export default class EmuContainer {
     });
   }
 
-  static checkAndPullImage(imageName: string): void {
+  static async checkAndPullImage(imageName: string): Promise<void> {
     const docker = new Docker();
-    docker.pull(imageName, {}, (err: any, stream: any) => {
-      function onProgress(event: any): void {
-        const progress = event?.progress ?? "";
-        const status = event?.status ?? "";
-        process.stdout.write(`[DOCKER] ${status}: ${progress}\n`);
-      }
+    await new Promise<void>(resolve => {
+      docker.pull(imageName, {}, (err: any, stream: any) => {
+        function onProgress(event: any): void {
+          const progress = event?.progress ?? "";
+          const status = event?.status ?? "";
+          process.stdout.write(`[DOCKER] ${status}: ${progress}\n`);
+        }
+
+        function onFinished(err: any, _output: any): void {
+          if (err != null) {
+            process.stdout.write(`[DOCKER] ${err}\n`);
+            throw err;
+          } else {
+            resolve()
+          }
+        }
 
-      function onFinished(err: any, _output: any): void {
         if (err != null) {
           process.stdout.write(`[DOCKER] ${err}\n`);
           throw err;
         }
-      }
-
-      if (err != null) {
-        process.stdout.write(`[DOCKER] ${err}\n`);
-        throw new Error(err);
-      }
 
-      docker.modem.followProgress(stream, onFinished, onProgress);
+        docker.modem.followProgress(stream, onFinished, onProgress);
+      });
     });
   }