Merge pull request #52 from Zondax/main

fix swap signing
LedgerHQ · Jul 5, 2023 · 6d2c2d8 · 6d2c2d8
2 parents a783ef7 + cfd056f
commit 6d2c2d8
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 4 deletions.
diff --git a/app/Makefile.version b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=24
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=9430
 # This is the patch version of this release
-APPVERSION_P=0
+APPVERSION_P=1
diff --git a/app/src/apdu_handler.c b/app/src/apdu_handler.c
@@ -174,9 +174,14 @@ __Z_INLINE void handleSign(volatile uint32_t *flags, volatile uint32_t *tx, uint
  }
  switch (key_type) {
  case key_ed25519: {
- view_review_init(tx_getItem, tx_getNumItems, app_sign_ed25519);
- view_review_show(REVIEW_TXN);
- *flags |= IO_ASYNCH_REPLY;
+ if (G_swap_state.called_from_swap) {
+ G_swap_state.should_exit = 1;
+ app_sign_ed25519();
+ } else {
+ view_review_init(tx_getItem, tx_getNumItems, app_sign_ed25519);
+ view_review_show(REVIEW_TXN);
+ *flags |= IO_ASYNCH_REPLY;
+ }
  break;
  }
 #ifdef SUPPORT_SR25519

diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png
diff --git a/tests_zemu/snapshots/st-mainmenu/00001.png b/tests_zemu/snapshots/st-mainmenu/00001.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png