fix: fix the jump problem in format_operation_source

LedgerHQ · Aug 26, 2021 · 6522672 · 6522672
1 parent e236c2b
commit 6522672
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 10 deletions.
diff --git a/src/stellar_format.c b/src/stellar_format.c
@@ -92,19 +92,36 @@ static void format_confirm_transaction_details(tx_context_t *txCtx) {
     format_memo(txCtx);
 }
 
+static void format_next_operation(tx_context_t *txCtx) {
+    (void) txCtx;
+    formatter_stack[formatter_index] = NULL;
+    set_state_data(true);
+}
+
 static void format_operation_source(tx_context_t *txCtx) {
-    if (txCtx->opDetails.sourceAccountPresent) {
-        strcpy(detailCaption, "Op Source");
-        print_muxed_account(&txCtx->opDetails.sourceAccount, detailValue, 0, 0);
-        push_to_formatter_stack(&format_confirm_transaction_details);
-    } else {
-        if (txCtx->opIdx == txCtx->opCount) {
-            // last operation: show transaction details
+    if (txCtx->opIdx == txCtx->opCount) {
+        // last operation
+        if (txCtx->opDetails.sourceAccountPresent) {
+            // If there is a source account, wait for the user to
+            // enter the next step after displaying the source account
+            strcpy(detailCaption, "Op Source");
+            print_muxed_account(&txCtx->opDetails.sourceAccount, detailValue, 0, 0);
+            push_to_formatter_stack(&format_confirm_transaction_details);
+        } else {
+            // Otherwise, go to the next step and display the transaction information.
             format_confirm_transaction_details(txCtx);
+        }
+    } else {
+        // more operations
+        if (txCtx->opDetails.sourceAccountPresent) {
+            // If there is a source account, wait for the user to
+            // enter the next step after displaying the source account
+            strcpy(detailCaption, "Op Source");
+            print_muxed_account(&txCtx->opDetails.sourceAccount, detailValue, 0, 0);
+            push_to_formatter_stack(&format_next_operation);
         } else {
-            // more operations: show next operation
-            formatter_stack[formatter_index] = NULL;
-            set_state_data(true);
+            // Otherwise, show the next operation.
+            format_next_operation(txCtx);
         }
     }
 }

diff --git a/tests/src/test_tx.c b/tests/src/test_tx.c
@@ -43,6 +43,7 @@ static const char *testcases[] = {
     "../testcases/txBumpSequence.raw",
     "../testcases/txManageBuyOffer.raw",
     "../testcases/txPathPaymentStrictSend.raw",
+    "../testcases/txMultiOpWithSource.raw",
     "../testcases/txCreateClaimableBalancePredicateAnd.raw",
     "../testcases/txCreateClaimableBalancePredicateBeforeAbs.raw",
     "../testcases/txCreateClaimableBalancePredicateBeforeRel.raw",

diff --git a/tests/testcases/txMultiOpWithSource.raw b/tests/testcases/txMultiOpWithSource.raw
diff --git a/tests/testcases/txMultiOpWithSource.txt b/tests/testcases/txMultiOpWithSource.txt
@@ -0,0 +1,15 @@
+Operation 1 of 2;  
+Operation Type; Account Merge
+Merge Account; GADFVW3UXVKDOU626XUPYDJU2BFCGFJHQ6SREYOZ6IJV4XSHOALEQN2I
+Destination; GBMHY2EIEGFHW6G4OIC6QA7I7IUPUDD33PGCJLVC57THODEUQY62KNHD
+Op Source; GADFVW3UXVKDOU626XUPYDJU2BFCGFJHQ6SREYOZ6IJV4XSHOALEQN2I
+Operation 2 of 2;  
+Operation Type; Allow Trust
+Trustor; GBMHY2EIEGFHW6G4OIC6QA7I7IUPUDD33PGCJLVC57THODEUQY62KNHD
+Asset Code; JPY
+Authorize Flag; AUTHORIZED_FLAG
+Op Source; GADFVW3UXVKDOU626XUPYDJU2BFCGFJHQ6SREYOZ6IJV4XSHOALEQN2I
+Memo Text; multi-op-with-source
+Fee; 0.00002 XLM
+Network; Test
+Tx Source; GADFVW3UXVKDOU626XUPYDJU2BFCGFJHQ6SREYOZ6IJV4XSHOALEQN2I