swap!

lightsail-network · Apr 21, 2024 · a18e0f1 · a18e0f1
1 parent f59fa1d
commit a18e0f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/handler/sign_tx.c b/src/handler/sign_tx.c
@@ -24,7 +24,6 @@
 #include "buffer.h"
 #include "swap.h"
 
-#include "swap_check.h"
 #include "sign_tx.h"
 #include "stellar/parser.h"
 #include "stellar/formatter.h"
@@ -33,6 +32,7 @@
 #include "../ui/display.h"
 #include "../crypto.h"
 #include "../helper/send_response.h"
+#include "../swap/swap_check.h"
 
 int handler_sign_tx(buffer_t *cdata, bool is_first_chunk, bool more) {
     if (is_first_chunk) {

diff --git a/src/swap/swap_check.c b/src/swap/swap_check.c
@@ -2,8 +2,9 @@
 
 #include "os.h"
 
-#include "../globals.h"
+#include "swap_check.h"
 #include "stellar/printer.h"
+#include "../globals.h"
 
 bool swap_check() {
     PRINTF("swap_check invoked.\n");
@@ -26,7 +27,7 @@ bool swap_check() {
 
     // amount
     if (G_context.tx_info.tx.op_details.payment_op.asset.type != ASSET_TYPE_NATIVE ||
-        G_context.tx_info.tx.op_details.payment_op.amount != (int64_t) G.swap_values.amount) {
+        G_context.tx_info.tx.op_details.payment_op.amount != (int64_t) G.swap.values.amount) {
         return false;
     }
 
@@ -39,7 +40,7 @@ bool swap_check() {
         return false;
     };
 
-    if (strcmp(tmp_buf, G.swap_values.destination) != 0) {
+    if (strcmp(tmp_buf, G.swap.values.destination) != 0) {
         return false;
     }
 
@@ -49,13 +50,13 @@ bool swap_check() {
 
     // memo
     if (G_context.tx_info.tx.memo.type != MEMO_TEXT ||
-        strcmp((char *) G_context.tx_info.tx.memo.text.text, G.swap_values.memo) != 0) {
+        strcmp((char *) G_context.tx_info.tx.memo.text.text, G.swap.values.memo) != 0) {
         return false;
     }
 
     // fees
     if (G_context.tx_info.network != NETWORK_TYPE_PUBLIC ||
-        G_context.tx_info.tx.fee != G.swap_values.fees) {
+        G_context.tx_info.tx.fee != G.swap.values.fees) {
         return false;
     }