Fix approval for stax target

Zondax · Jul 26, 2024 · 5d44ae5 · 5d44ae5
1 parent 25c3b9e
commit 5d44ae5
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 129 deletions.
diff --git a/tests_zemu/tests/_config.ts b/tests_zemu/tests/_config.ts
@@ -1,4 +1,4 @@
-import { IDeviceModel, DEFAULT_START_OPTIONS } from '@zondax/zemu'
+import { IDeviceModel, DEFAULT_START_OPTIONS, ButtonKind } from '@zondax/zemu'
 
 import { resolve } from 'path'
 
@@ -16,10 +16,21 @@ export const models: IDeviceModel[] = [
   { name: 'stax', prefix: 'ST', path: APP_PATH_ST },
 ]
 
-export const defaultOptions = {
-  ...DEFAULT_START_OPTIONS,
-  // startText: "DO NOT USE",
-  logging: true,
-  custom: `-s "${APP_SEED}"`,
-  X11: false,
+export const defaultOptions = (m: IDeviceModel, is_address = false) => {
+  let approveAction = ButtonKind.ApproveHoldButton
+  let approveKeyword = ''
+
+  if (m.name == 'stax' && is_address) {
+    approveKeyword = 'Show as QR'
+    approveAction = ButtonKind.ApproveTapButton
+  }
+
+  return {
+    ...DEFAULT_START_OPTIONS,
+    logging: true,
+    custom: `-s "${APP_SEED}"`,
+    approveAction,
+    approveKeyword,
+    model: m.name,
+  }
 }
diff --git a/tests_zemu/tests/addresses.test.ts b/tests_zemu/tests/addresses.test.ts
@@ -15,16 +15,20 @@
  ******************************************************************************* */
 
 import Zemu, { ButtonKind } from '@zondax/zemu'
-import { defaultOptions, models } from './_config'
+import { defaultOptions as commonOpts, models } from './_config'
 import ZCashApp from '@zondax/ledger-zcash'
 
 jest.setTimeout(60000)
+const defaultOptions = (model: any, is_address = false) => {
+  let opts = commonOpts(model, is_address)
+  return opts
+}
 
 describe('Addresses', function () {
-  test.each(models)('get unshielded address', async function (m) {
+  test.each(models)('get_unshielded_address', async function (m) {
     const sim = new Zemu(m.path)
     try {
-      await sim.start({ ...defaultOptions, model: m.name })
+      await sim.start(defaultOptions(m))
       const app = new ZCashApp(sim.getTransport())
       const expectedAddrRaw = '031f6d238009787c20d5d7becb6b6ad54529fc0a3fd35088e85c2c3966bfec050e'
       const expectedAddr = 't1KHG39uhsssPkYcAXkzZ5Bk2w1rnFukZvx'
@@ -39,15 +43,10 @@ describe('Addresses', function () {
     }
   })
 
-  test.each(models)('show unshielded address', async function (m) {
+  test.each(models)('show_unshielded_address', async function (m) {
     const sim = new Zemu(m.path)
     try {
-      await sim.start({
-        ...defaultOptions,
-        model: m.name,
-        approveKeyword: m.name === 'stax' ? 'QR' : '',
-        approveAction: ButtonKind.ApproveTapButton,
-      })
+      await sim.start(defaultOptions(m, true))
       const app = new ZCashApp(sim.getTransport())
 
       const expectedAddrRaw = '026f27818e7426a10773226b3553d0afe50a3697bd02652f1b57d67bf648577d11'
@@ -65,10 +64,10 @@ describe('Addresses', function () {
     }
   })
 
-  test.each(models)('get shielded address', async function (m) {
+  test.each(models)('get_shielded_address', async function (m) {
     const sim = new Zemu(m.path)
     try {
-      await sim.start({ ...defaultOptions, model: m.name })
+      await sim.start(defaultOptions(m, true))
       const app = new ZCashApp(sim.getTransport())
 
       const zip32Account = 1000 + 0x80000000
@@ -87,7 +86,7 @@ describe('Addresses', function () {
   test.each(models)('get invalid shielded address', async function (m) {
     const sim = new Zemu(m.path)
     try {
-      await sim.start({ ...defaultOptions, model: m.name })
+      await sim.start(defaultOptions(m))
       const app = new ZCashApp(sim.getTransport())
 
       const zip32Account = 1000
@@ -100,12 +99,7 @@ describe('Addresses', function () {
   test.each(models)('show shielded address', async function (m) {
     const sim = new Zemu(m.path)
     try {
-      await sim.start({
-        ...defaultOptions,
-        model: m.name,
-        approveKeyword: m.name === 'stax' ? 'QR' : '',
-        approveAction: ButtonKind.ApproveTapButton,
-      })
+      await sim.start(defaultOptions(m, true))
       const app = new ZCashApp(sim.getTransport())
 
       const zip32Account = 1000 + 0x80000000
@@ -126,15 +120,10 @@ describe('Addresses', function () {
     }
   })
 
-  test.each(models)('get shielded address with div', async function (m) {
+  test.each(models)('show_shielded_address_with_div', async function (m) {
     const sim = new Zemu(m.path)
     try {
-      await sim.start({
-        ...defaultOptions,
-        model: m.name,
-        approveKeyword: m.name === 'stax' ? 'QR' : '',
-        approveAction: ButtonKind.ApproveTapButton,
-      })
+      await sim.start(defaultOptions(m, true))
       const app = new ZCashApp(sim.getTransport())
 
       const zip32Account = 1000 + 0x80000000

diff --git a/tests_zemu/tests/basic.test.ts b/tests_zemu/tests/basic.test.ts
@@ -15,21 +15,20 @@
  ******************************************************************************* */
 
 import Zemu, { ButtonKind, zondaxMainmenuNavigation } from '@zondax/zemu'
-import { defaultOptions, models } from './_config'
+import { defaultOptions as commonOpts, models } from './_config'
 import ZCashApp from '@zondax/ledger-zcash'
 
 jest.setTimeout(60000)
+const defaultOptions = (model: any) => {
+  let opts = commonOpts(model, false)
+  return opts
+}
 
 describe('Basic', function () {
   test.each(models)('can start and stop container', async function (m) {
     const sim = new Zemu(m.path)
     try {
-      await sim.start({
-        ...defaultOptions,
-        model: m.name,
-        approveKeyword: m.name === 'stax' ? 'QR' : '',
-        approveAction: ButtonKind.ApproveTapButton,
-      })
+      await sim.start(defaultOptions(m))
     } finally {
       await sim.close()
     }
@@ -38,12 +37,7 @@ describe('Basic', function () {
   test.each(models)('main menu', async function (m) {
     const sim = new Zemu(m.path)
     try {
-      await sim.start({
-        ...defaultOptions,
-        model: m.name,
-        approveKeyword: m.name === 'stax' ? 'QR' : '',
-        approveAction: ButtonKind.ApproveTapButton,
-      })
+      await sim.start(defaultOptions(m))
       const nav = zondaxMainmenuNavigation(m.name, [1, 0, 0, 4, -5])
       await sim.navigateAndCompareSnapshots('.', `${m.prefix.toLowerCase()}-mainmenu`, nav.schedule)
     } finally {
@@ -54,12 +48,7 @@ describe('Basic', function () {
   test.each(models)('get app version', async function (m) {
     const sim = new Zemu(m.path)
     try {
-      await sim.start({
-        ...defaultOptions,
-        model: m.name,
-        approveKeyword: m.name === 'stax' ? 'QR' : '',
-        approveAction: ButtonKind.ApproveTapButton,
-      })
+      await sim.start(defaultOptions(m))
       const app = new ZCashApp(sim.getTransport())
 
       const resp = await app.getVersion()

diff --git a/tests_zemu/tests/keys.test.ts b/tests_zemu/tests/keys.test.ts
@@ -16,26 +16,19 @@
 
 import Zemu, { ButtonKind, DEFAULT_START_OPTIONS } from '@zondax/zemu'
 import ZCashApp from '@zondax/ledger-zcash'
-import { APP_SEED, models } from './_config'
-
-const defaultOptions = {
-  ...DEFAULT_START_OPTIONS,
-  logging: true,
-  custom: `-s "${APP_SEED}"`,
-}
+import { APP_SEED, defaultOptions as commonOpts, models } from './_config'
 
 jest.setTimeout(600000)
+const defaultOptions = (model: any, is_address = false) => {
+  let opts = commonOpts(model, is_address)
+  return opts
+}
 
 describe('Nullifier', function () {
   test.each(models)('get nullifier account 0x01', async function (m) {
     const sim = new Zemu(m.path)
     try {
-      await sim.start({
-        ...defaultOptions,
-        model: m.name,
-        approveKeyword: m.name === 'stax' ? 'QR' : '',
-        approveAction: ButtonKind.ApproveTapButton,
-      })
+      await sim.start(defaultOptions(m, true))
       const app = new ZCashApp(sim.getTransport())
 
       const zip32Account = 0x01 + 0x80000000
@@ -57,15 +50,10 @@ describe('Nullifier', function () {
     }
   })
 
-  test.each(models)('get nullifier account 0xFF', async function (m) {
+  test.each(models)('get_nullifier_account_0xFF', async function (m) {
     const sim = new Zemu(m.path)
     try {
-      await sim.start({
-        ...defaultOptions,
-        model: m.name,
-        approveKeyword: m.name === 'stax' ? 'QR' : '',
-        approveAction: ButtonKind.ApproveTapButton,
-      })
+      await sim.start(defaultOptions(m, true))
       const app = new ZCashApp(sim.getTransport())
 
       const path = 0xff + 0x80000000
@@ -88,16 +76,11 @@ describe('Nullifier', function () {
   })
 })
 
-describe('Get keys', function () {
+describe('Get_keys', function () {
   test.each(models)('get ivk', async function (m) {
     const sim = new Zemu(m.path)
     try {
-      await sim.start({
-        ...defaultOptions,
-        model: m.name,
-        approveKeyword: m.name === 'stax' ? 'QR' : '',
-        approveAction: ButtonKind.ApproveTapButton,
-      })
+      await sim.start(defaultOptions(m, true))
       const app = new ZCashApp(sim.getTransport())
 
       const zip32Account = 1000 + 0x80000000
@@ -125,12 +108,7 @@ describe('Get keys', function () {
   test.each(models)('get ovk', async function (m) {
     const sim = new Zemu(m.path)
     try {
-      await sim.start({
-        ...defaultOptions,
-        model: m.name,
-        approveKeyword: m.name === 'stax' ? 'QR' : '',
-        approveAction: ButtonKind.ApproveTapButton,
-      })
+      await sim.start(defaultOptions(m, true))
       const app = new ZCashApp(sim.getTransport())
 
       const zip32Account = 1000 + 0x80000000
@@ -153,12 +131,7 @@ describe('Get keys', function () {
   test.each(models)('Get fvk', async function (m) {
     const sim = new Zemu(m.path)
     try {
-      await sim.start({
-        ...defaultOptions,
-        model: m.name,
-        approveKeyword: m.name === 'stax' ? 'QR' : '',
-        approveAction: ButtonKind.ApproveTapButton,
-      })
+      await sim.start(defaultOptions(m, true))
       const app = new ZCashApp(sim.getTransport())
 
       const zip32Account = 1000 + 0x80000000
@@ -192,7 +165,7 @@ describe('Diversifiers', function () {
   test.each(models)('Div list with startindex', async function (m) {
     const sim = new Zemu(m.path)
     try {
-      await sim.start({ ...defaultOptions, model: m.name })
+      await sim.start(defaultOptions(m))
       const app = new ZCashApp(sim.getTransport())
 
       const zip32Account = 1000 + 0x80000000