Merge branch 'main' of https://github.com/cake-tech/cake_wallet into mweb

analysis_options.yaml

@@ -10,7 +10,18 @@ analyzer:
     lib/generated/*.dart,
     cw_monero/ios/External/**,
     cw_shared_external/**,
-    shared_external/**]
+    shared_external/**,
+    lib/bitcoin/cw_bitcoin.dart,
+    lib/bitcoin_cash/cw_bitcoin_cash.dart,
+    lib/ethereum/cw_ethereum.dart,
+    lib/haven/cw_haven.dart,
+    lib/monero/cw_monero.dart,
+    lib/nano/cw_nano.dart,
+    lib/polygon/cw_polygon.dart,
+    lib/solana/cw_solana.dart,
+    lib/tron/cw_tron.dart,
+    lib/wownero/cw_wownero.dart,
+    ]
   language:
     strict-casts: true
     strict-raw-types: true

cw_bitcoin/lib/electrum_transaction_info.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:cw_bitcoin/address_from_output.dart';
 import 'package:cw_bitcoin/bitcoin_address_record.dart';
@@ -7,10 +9,12 @@ import 'package:cw_core/transaction_direction.dart';
 import 'package:cw_core/transaction_info.dart';
 import 'package:cw_core/format_amount.dart';
 import 'package:cw_core/wallet_type.dart';
+import 'package:hex/hex.dart';
 
 class ElectrumTransactionBundle {
   ElectrumTransactionBundle(this.originalTransaction,
       {required this.ins, required this.confirmations, this.time});
+
   final BtcTransaction originalTransaction;
   final List<BtcTransaction> ins;
   final int? time;
@@ -125,7 +129,24 @@ class ElectrumTransactionInfo extends TransactionInfo {
     for (final out in bundle.originalTransaction.outputs) {
       totalOutAmount += out.amount.toInt();
       final addressExists = addresses.contains(addressFromOutputScript(out.scriptPubKey, network));
-      outputAddresses.add(addressFromOutputScript(out.scriptPubKey, network));
+      final address = addressFromOutputScript(out.scriptPubKey, network);
+
+      if (address.isNotEmpty) outputAddresses.add(address);
+
+      // Check if the script contains OP_RETURN
+      final script = out.scriptPubKey.script;
+      if (script.contains('OP_RETURN')) {
+        final index = script.indexOf('OP_RETURN');
+        if (index + 1 <= script.length) {
+          try {
+            final opReturnData = script[index + 1].toString();
+            final decodedString = utf8.decode(HEX.decode(opReturnData));
+            outputAddresses.add('OP_RETURN:$decodedString');
+          } catch (_) {
+            outputAddresses.add('OP_RETURN:');
+          }
+        }
+      }
 
       if (addressExists) {
         receivedAmounts.add(out.amount.toInt());

cw_bitcoin/lib/electrum_wallet.dart

@@ -43,6 +43,7 @@ import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:rxdart/subjects.dart';
 import 'package:sp_scanner/sp_scanner.dart';
+import 'package:hex/hex.dart';
 
 part 'electrum_wallet.g.dart';
 
@@ -1427,6 +1428,7 @@ abstract class ElectrumWalletBase
       List<ECPrivate> privateKeys = [];
 
       var allInputsAmount = 0;
+      String? memo;
 
       // Add inputs
       for (var i = 0; i < bundle.originalTransaction.inputs.length; i++) {
@@ -1465,6 +1467,22 @@ abstract class ElectrumWalletBase
       // Create a list of available outputs
       final outputs = <BitcoinOutput>[];
       for (final out in bundle.originalTransaction.outputs) {
+
+        // Check if the script contains OP_RETURN
+        final script = out.scriptPubKey.script;
+        if (script.contains('OP_RETURN') && memo == null) {
+          final index = script.indexOf('OP_RETURN');
+          if (index + 1 <= script.length) {
+            try {
+              final opReturnData = script[index + 1].toString();
+              memo = utf8.decode(HEX.decode(opReturnData));
+              continue;
+            } catch (_) {
+              throw Exception('Cannot decode OP_RETURN data');
+            }
+          }
+        }
+
         final address = addressFromOutputScript(out.scriptPubKey, network);
         final btcAddress = addressTypeFromStr(address, network);
         outputs.add(BitcoinOutput(address: btcAddress, value: BigInt.from(out.amount.toInt())));
@@ -1521,6 +1539,8 @@ abstract class ElectrumWalletBase
         outputs: outputs,
         fee: BigInt.from(newFee),
         network: network,
+        memo: memo,
+        outputOrdering: BitcoinOrdering.none,
         enableRBF: true,
       );
 
@@ -2041,27 +2061,13 @@ abstract class ElectrumWalletBase
         tx.inputAddresses!.isEmpty ||
         tx.outputAddresses == null ||
         tx.outputAddresses!.isEmpty) {
-      List<String> inputAddresses = [];
-      List<String> outputAddresses = [];
-
-      for (int i = 0; i < bundle.originalTransaction.inputs.length; i++) {
-        final input = bundle.originalTransaction.inputs[i];
-        final inputTransaction = bundle.ins[i];
-        final vout = input.txIndex;
-        final outTransaction = inputTransaction.outputs[vout];
-        final address = addressFromOutputScript(outTransaction.scriptPubKey, network);
-
-        if (address.isNotEmpty) inputAddresses.add(address);
-      }
-
-      for (int i = 0; i < bundle.originalTransaction.outputs.length; i++) {
-        final out = bundle.originalTransaction.outputs[i];
-        final address = addressFromOutputScript(out.scriptPubKey, network);
-
-        if (address.isNotEmpty) outputAddresses.add(address);
-      }
-      tx.inputAddresses = inputAddresses;
-      tx.outputAddresses = outputAddresses;
+      tx = ElectrumTransactionInfo.fromElectrumBundle(
+        bundle,
+        walletInfo.type,
+        network,
+        addresses: addressesSet,
+        height: tx.height,
+      );
 
       transactionHistory.addOne(tx);
     }

lib/view_model/exchange/exchange_view_model.dart

@@ -845,6 +845,13 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
         );
       }
 
+      if ((trade.memo == null || trade.memo!.isEmpty)) {
+        return CreateTradeResult(
+          result: false,
+          errorMessage: 'Memo is required for Thorchain trade',
+        );
+      }
+
       final currenciesToCheckPattern = RegExp('0x[0-9a-zA-Z]');
 
       // Perform checks for payOutAddress

lib/view_model/transaction_details_view_model.dart

@@ -392,8 +392,15 @@ abstract class TransactionDetailsViewModelBase with Store {
     }
 
     if (transactionInfo.outputAddresses != null && transactionInfo.outputAddresses!.isNotEmpty) {
-      RBFListItems.add(StandardExpandableListItem(
-          title: S.current.outputs, expandableItems: transactionInfo.outputAddresses!));
+      final outputAddresses = transactionInfo.outputAddresses!.map((element) {
+        if (element.contains('OP_RETURN:') && element.length > 40) {
+            return element.substring(0, 40) + '...';
+        }
+        return element;
+      }).toList();
+
+      RBFListItems.add(
+          StandardExpandableListItem(title: S.current.outputs, expandableItems: outputAddresses));
     }
   }
 

tool/download_moneroc_prebuilds.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:dio/dio.dart';
 import 'package:archive/archive_io.dart';
 
@@ -47,4 +49,12 @@ Future<void> main() async {
       outputStream.writeBytes(archive);
     }
   }
+  if (Platform.isMacOS) {
+    print("Generating ios framework");
+    final result = Process.runSync("bash", [
+      "-c",
+      "cd scripts/ios && ./gen_framework.sh && cd ../.."
+    ]);
+    print((result.stdout+result.stderr).toString().trim());
+  }
 }