Bridge Solana

app/lib/screens/wallets/bridge.dart

@@ -1,3 +1,4 @@
+import 'package:bs58/bs58.dart';
 import 'package:decimal/decimal.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -32,6 +33,7 @@ class _WalletBridgeScreenState extends ConsumerState<WalletBridgeScreen> {
   String? amountError;
   bool reloadBalance = true;
   List percentages = [25, 50, 75, 100];
+  bool isSolana = false;
 
   @override
   void initState() {
@@ -87,7 +89,9 @@ class _WalletBridgeScreenState extends ConsumerState<WalletBridgeScreen> {
     toController.text = '';
     toAddressError = null;
     amountError = null;
-    fee = isWithdraw ? Decimal.parse('1.01') : Decimal.parse('1.1');
+    fee = isWithdraw
+        ? Decimal.parse('1.01')
+        : (isSolana ? Decimal.parse('100') : Decimal.parse('1.1'));
     setState(() {});
   }
 
@@ -100,6 +104,13 @@ class _WalletBridgeScreenState extends ConsumerState<WalletBridgeScreen> {
     }
 
     if (!isWithdraw) {
+      if (isSolana) {
+        final isValidSolana = isValidSolanaAddress(toAddress);
+        if (!isValidSolana) {
+          toAddressError = 'Invaild Solana address';
+        }
+        return isValidSolana;
+      }
       if (toAddress.length != 48) {
         toAddressError = 'Address length should be 48 characters';
         return false;
@@ -109,26 +120,31 @@ class _WalletBridgeScreenState extends ConsumerState<WalletBridgeScreen> {
         toAddressError = 'Address must have a twin ID';
         return false;
       }
-    }
 
-    if (isWithdraw) {
-      if (!isValidStellarAddress(toAddress)) {
-        toAddressError = 'Invaild Stellar address';
-        return false;
-      }
-      if (toAddress == Globals().bridgeTFTAddress) {
-        toAddressError = "Bridge address can't be the destination";
-        return false;
-      }
-      final toAddrBalance = await Stellar.getBalanceByAccountId(toAddress);
-      if (toAddrBalance == '-1') {
-        toAddressError = 'Address must be active and have TFT trustline';
-        return false;
+      if (isWithdraw) {
+        if (!isValidStellarAddress(toAddress)) {
+          toAddressError = 'Invaild Stellar address';
+          return false;
+        }
+        if (toAddress == Globals().bridgeTFTAddress) {
+          toAddressError = "Bridge address can't be the destination";
+          return false;
+        }
+        final toAddrBalance = await Stellar.getBalanceByAccountId(toAddress);
+        if (toAddrBalance == '-1') {
+          toAddressError = 'Address must be active and have TFT trustline';
+          return false;
+        }
       }
     }
     return true;
   }
 
+  bool isValidSolanaAddress(String address) {
+    final decodeBytes = base58.decode(address);
+    return decodeBytes.length == 32;
+  }
+
   bool _validateAmount() {
     final amount = amountController.text.trim();
     amountError = null;
@@ -167,6 +183,12 @@ class _WalletBridgeScreenState extends ConsumerState<WalletBridgeScreen> {
     setState(() {});
   }
 
+  updateIsSolana(bool value) {
+    setState(() {
+      isSolana = value;
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     List<Wallet> wallets = ref.read(walletsNotifier);
@@ -190,7 +212,8 @@ class _WalletBridgeScreenState extends ConsumerState<WalletBridgeScreen> {
             SwapTransactionWidget(
                 bridgeOperation: transactionType,
                 onTransactionChange: onTransactionChange,
-                disableDeposit: disableDeposit),
+                disableDeposit: disableDeposit,
+                updateIsSolana: updateIsSolana),
             const SizedBox(height: 20),
             ListTile(
               title: TextField(
@@ -211,27 +234,30 @@ class _WalletBridgeScreenState extends ConsumerState<WalletBridgeScreen> {
                       ),
                   controller: toController,
                   decoration: InputDecoration(
-                      labelText: 'To',
+                      labelText: isSolana ? 'Associated Token Address' : 'To',
                       errorText: toAddressError,
-                      suffixIcon: IconButton(
-                          onPressed: () {
-                            Navigator.of(context).push(MaterialPageRoute(
-                              builder: (context) => ContactsScreen(
-                                  chainType: isWithdraw
-                                      ? ChainType.Stellar
-                                      : ChainType.TFChain,
-                                  currentWalletAddress: fromController.text,
-                                  wallets: isWithdraw
-                                      ? wallets
-                                          .where((w) =>
-                                              double.parse(w.stellarBalance) >=
-                                              0)
-                                          .toList()
-                                      : wallets,
-                                  onSelectToAddress: _selectToAddress),
-                            ));
-                          },
-                          icon: const Icon(Icons.person)))),
+                      suffixIcon: !isSolana
+                          ? IconButton(
+                              onPressed: () {
+                                Navigator.of(context).push(MaterialPageRoute(
+                                  builder: (context) => ContactsScreen(
+                                      chainType: isWithdraw
+                                          ? ChainType.Stellar
+                                          : ChainType.TFChain,
+                                      currentWalletAddress: fromController.text,
+                                      wallets: isWithdraw
+                                          ? wallets
+                                              .where((w) =>
+                                                  double.parse(
+                                                      w.stellarBalance) >=
+                                                  0)
+                                              .toList()
+                                          : wallets,
+                                      onSelectToAddress: _selectToAddress),
+                                ));
+                              },
+                              icon: const Icon(Icons.person))
+                          : null)),
             ),
             const SizedBox(height: 10),
             ListTile(
@@ -247,7 +273,7 @@ class _WalletBridgeScreenState extends ConsumerState<WalletBridgeScreen> {
                       hintText: '100',
                       suffixText: 'TFT',
                       errorText: amountError)),
-              subtitle: Text('Max Fee: ${!isWithdraw ? 1.1 : 1.01} TFT'),
+              subtitle: Text('Max Fee: $fee TFT'),
             ),
             const SizedBox(height: 10),
             if (isBiggerThanFee)
@@ -307,8 +333,10 @@ class _WalletBridgeScreenState extends ConsumerState<WalletBridgeScreen> {
   }
 
   _bridge_confirmation() async {
-    final memoText =
-        !isWithdraw ? await TFChain.getMemo(toController.text.trim()) : null;
+    final memoHash = isSolana ? base58.decode(toController.text.trim()) : null;
+    final memoText = !isWithdraw && !isSolana
+        ? await TFChain.getMemo(toController.text.trim())
+        : null;
     showModalBottomSheet(
         isScrollControlled: true,
         useSafeArea: true,
@@ -323,7 +351,9 @@ class _WalletBridgeScreenState extends ConsumerState<WalletBridgeScreen> {
               from: fromController.text.trim(),
               to: toController.text.trim(),
               amount: amountController.text.trim(),
+              isSolana: isSolana,
               memo: memoText,
+              memoHash: memoHash,
               reloadBalance:
                   isWithdraw ? _loadTFChainBalance : _loadStellarBalance,
             ));

app/lib/services/stellar_service.dart

@@ -1,3 +1,5 @@
+import 'dart:typed_data';
+
 import 'package:stellar_client/models/transaction.dart';
 import 'package:stellar_client/models/vesting_account.dart';
 import 'package:stellar_client/stellar_client.dart';
@@ -57,14 +59,15 @@ Future<List<VestingAccount>?> listVestedAccounts(String secret) async {
   return accounts;
 }
 
-Future<void> transfer(
-    String secret, String dest, String amount, String memo) async {
+Future<void> transfer(String secret, String dest, String amount, String memo,
+    [Uint8List? memoHash]) async {
   final client = Client(NetworkType.PUBLIC, secret);
   await client.transferThroughThreefoldService(
     destinationAddress: dest,
     amount: amount,
     currency: 'TFT',
     memoText: memo,
+    memoHash: memoHash,
   );
 }
 

app/lib/widgets/wallets/bridge_confirmation.dart

@@ -1,3 +1,5 @@
+import 'dart:typed_data';
+
 import 'package:flutter/material.dart';
 import 'package:threebotlogin/helpers/globals.dart';
 import 'package:threebotlogin/helpers/transaction_helpers.dart';
@@ -15,6 +17,8 @@ class BridgeConfirmationWidget extends StatefulWidget {
     required this.to,
     required this.amount,
     required this.memo,
+    required this.memoHash,
+    required this.isSolana,
     required this.reloadBalance,
   });
 
@@ -24,6 +28,8 @@ class BridgeConfirmationWidget extends StatefulWidget {
   final String to;
   final String amount;
   final String? memo;
+  final Uint8List? memoHash;
+  final bool isSolana;
   final void Function() reloadBalance;
 
   @override
@@ -43,8 +49,11 @@ class _BridgeConfirmationWidgetState extends State<BridgeConfirmationWidget> {
     fromController.text = widget.from;
     toController.text = widget.to;
     amountController.text = widget.amount;
-    feeController.text =
-        widget.bridgeOperation == BridgeOperation.Deposit ? '1.1' : '1.01';
+    feeController.text = widget.bridgeOperation == BridgeOperation.Deposit
+        ? widget.isSolana
+            ? '100'
+            : '1.1'
+        : '1.01';
     super.initState();
   }
 
@@ -167,8 +176,17 @@ class _BridgeConfirmationWidgetState extends State<BridgeConfirmationWidget> {
     });
     try {
       if (widget.bridgeOperation == BridgeOperation.Deposit) {
-        await Stellar.transfer(widget.secret, Globals().bridgeTFTAddress,
-            widget.amount, widget.memo!);
+        if (widget.isSolana) {
+          await Stellar.transfer(
+              widget.secret,
+              'GDGIQWZDFVWJPAFG7PJ5AXMOK7NVFVFWELZILI5MLHGSZULBTBGIBYHW',
+              widget.amount,
+              '',
+              widget.memoHash);
+        } else {
+          await Stellar.transfer(widget.secret, Globals().bridgeTFTAddress,
+              widget.amount, widget.memo!);
+        }
       } else {
         await TFChain.swapToStellar(
             widget.secret, widget.to, BigInt.from(double.parse(widget.amount)));