Fix sending for monero ledger

cake-tech · Nov 26, 2024 · 3b83b85 · 3b83b85
1 parent 738731d
commit 3b83b85
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 6 deletions.
diff --git a/cw_monero/lib/api/transaction_history.dart b/cw_monero/lib/api/transaction_history.dart
@@ -195,9 +195,16 @@ String? commitTransactionFromPointerAddress({required int address, required bool
     commitTransaction(transactionPointer: monero.PendingTransaction.fromAddress(address), useUR: useUR);
 
 String? commitTransaction({required monero.PendingTransaction transactionPointer, required bool useUR}) {
+  final transactionPointerAddress = transactionPointer.address;
   final txCommit = useUR
-    ? monero.PendingTransaction_commitUR(transactionPointer, 120)
-    : monero.PendingTransaction_commit(transactionPointer, filename: '', overwrite: false);
+      ? monero.PendingTransaction_commitUR(transactionPointer, 120)
+      : Isolate.run(() {
+          monero.PendingTransaction_commit(
+            Pointer.fromAddress(transactionPointerAddress),
+            filename: '',
+            overwrite: false,
+          );
+        });
 
   String? error = (() {
     final status = monero.PendingTransaction_status(transactionPointer.cast());

diff --git a/cw_monero/lib/ledger.dart b/cw_monero/lib/ledger.dart
@@ -6,7 +6,6 @@ import 'package:ffi/ffi.dart';
 import 'package:ledger_flutter_plus/ledger_flutter_plus.dart';
 import 'package:ledger_flutter_plus/ledger_flutter_plus_dart.dart';
 import 'package:monero/monero.dart' as monero;
-// import 'package:polyseed/polyseed.dart';
 
 LedgerConnection? gLedger;
 
@@ -28,9 +27,9 @@ void enableLedgerExchange(monero.wallet ptr, LedgerConnection connection) {
           ptr, emptyPointer.cast<UnsignedChar>(), 0);
       malloc.free(emptyPointer);
 
-      // print("> ${ledgerRequest.toHexString()}");
+      _logLedgerCommand(ledgerRequest, false);
       final response = await exchange(connection, ledgerRequest);
-      // print("< ${response.toHexString()}");
+      _logLedgerCommand(response, true);
 
       final Pointer<Uint8> result = malloc<Uint8>(response.length);
       for (var i = 0; i < response.length; i++) {
@@ -82,3 +81,57 @@ class ExchangeOperation extends LedgerRawOperation<Uint8List> {
   @override
   Future<List<Uint8List>> write(ByteDataWriter writer) async => [inputData];
 }
+
+void _logLedgerCommand(Uint8List command, [bool isResponse = true]) {
+  String toHexString(Uint8List data) =>
+      data.map((e) => e.toRadixString(16).padLeft(2, '0')).join();
+
+  const ledgerMoneroCommands = {
+    0x00: "INS_NONE",
+    0x02: "NS_RESET",
+    0x20: "INS_GET_KEY",
+    0x21: "INS_DISPLAY_ADDRESS",
+    0x22: "INS_PUT_KEY",
+    0x24: "INS_GET_CHACHA8_PREKEY",
+    0x26: "INS_VERIFY_KEY",
+    0x28: "INS_MANAGE_SEEDWORDS",
+    0x30: "INS_SECRET_KEY_TO_PUBLIC_KEY",
+    0x32: "INS_GEN_KEY_DERIVATION",
+    0x34: "INS_DERIVATION_TO_SCALAR",
+    0x36: "INS_DERIVE_PUBLIC_KEY",
+    0x38: "INS_DERIVE_SECRET_KEY",
+    0x3A: "INS_GEN_KEY_IMAGE",
+    0x3B: "INS_DERIVE_VIEW_TAG",
+    0x3C: "INS_SECRET_KEY_ADD",
+    0x3E: "INS_SECRET_KEY_SUB",
+    0x40: "INS_GENERATE_KEYPAIR",
+    0x42: "INS_SECRET_SCAL_MUL_KEY",
+    0x44: "INS_SECRET_SCAL_MUL_BASE",
+    0x46: "INS_DERIVE_SUBADDRESS_PUBLIC_KEY",
+    0x48: "INS_GET_SUBADDRESS",
+    0x4A: "INS_GET_SUBADDRESS_SPEND_PUBLIC_KEY",
+    0x4C: "INS_GET_SUBADDRESS_SECRET_KEY",
+    0x70: "INS_OPEN_TX",
+    0x72: "INS_SET_SIGNATURE_MODE",
+    0x74: "INS_GET_ADDITIONAL_KEY",
+    0x76: "INS_STEALTH",
+    0x77: "INS_GEN_COMMITMENT_MASK",
+    0x78: "INS_BLIND",
+    0x7A: "INS_UNBLIND",
+    0x7B: "INS_GEN_TXOUT_KEYS",
+    0x7D: "INS_PREFIX_HASH",
+    0x7C: "INS_VALIDATE",
+    0x7E: "INS_MLSAG",
+    0x7F: "INS_CLSAG",
+    0x80: "INS_CLOSE_TX",
+    0xA0: "INS_GET_TX_PROOF",
+    0xC0: "INS_GET_RESPONSE"
+  };
+
+  if (isResponse) {
+    print("< ${toHexString(command)}");
+  } else {
+    print(
+        "> ${ledgerMoneroCommands[command[1]]} ${toHexString(command.sublist(2))}");
+  }
+}
diff --git a/lib/src/screens/send/send_page.dart b/lib/src/screens/send/send_page.dart
@@ -611,7 +611,10 @@ class SendPage extends BasePage {
                     alertTitle: S.of(context).proceed_on_device,
                     alertContent: S.of(context).proceed_on_device_description,
                     buttonText: S.of(context).cancel,
-                    buttonAction: () => Navigator.of(context).pop());
+                    buttonAction: () {
+                      sendViewModel.state = InitialExecutionState();
+                      Navigator.of(context).pop();
+                    });
               });
         });
       }