Merge branch 'fix/solana-tokens' into vacay

Author: sneurlax

.github/workflows/test.yaml

@@ -7,6 +7,8 @@ jobs:
     steps:
       - name: Prepare repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Install Flutter 
         uses: subosito/flutter-action@v2 
         with:
@@ -94,9 +96,21 @@ jobs:
           NAMECOIN_TEST: ${{ secrets.NAMECOIN_TEST }}
           PARTICL_TEST: ${{ secrets.PARTICL_TEST }}
 
-      - name: Verify Dart formatting
-        run: dart format --output=none --set-exit-if-changed .
-
+      - name: Check formatting of changed files
+        run: |
+          if [ "${{ github.event_name }}" = "pull_request" ]; then
+            BASE=$(git merge-base ${{ github.event.pull_request.base.sha }} HEAD)
+          else
+            BASE=${{ github.event.before }}
+          fi
+          FILES=$(git diff --name-only --diff-filter=ACM "$BASE"..HEAD -- '*.dart')
+          if [ -z "$FILES" ]; then
+            echo "No Dart files changed."
+            exit 0
+          fi
+          echo "Checking formatting of $(echo "$FILES" | wc -l) file(s):"
+          echo "$FILES"
+          dart format --output=none --set-exit-if-changed $FILES
 #      - name: Analyze
 #        run: flutter analyze
       - name: Test

lib/utilities/default_sol_tokens.dart

@@ -20,12 +20,12 @@ abstract class DefaultSolTokens {
           "https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v/logo.png",
     ),
     SolContract(
-      address: "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenEst",
+      address: "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB",
       name: "Tether",
       symbol: "USDT",
       decimals: 6,
       logoUri:
-          "https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenEst/logo.svg",
+          "https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB/logo.svg",
     ),
     SolContract(
       address: "MangoCzJ36AjZyKwVj3VnYU4GTonjfVEnJmvvWaxLac",
@@ -36,20 +36,20 @@ abstract class DefaultSolTokens {
           "https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/MangoCzJ36AjZyKwVj3VnYU4GTonjfVEnJmvvWaxLac/logo.png",
     ),
     SolContract(
-      address: "SRMuApVgqbCmmp3uVrwpad5p4stLBUq3nSoSnqQQXmk",
+      address: "SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt",
       name: "Serum",
       symbol: "SRM",
       decimals: 6,
       logoUri:
-          "https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/SRMuApVgqbCmmp3uVrwpad5p4stLBUq3nSoSnqQQXmk/logo.png",
+          "https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt/logo.png",
     ),
     SolContract(
-      address: "orca8TvxvggsCKvVPXSHXDvKgJ3bNroWusDawg461mpD",
+      address: "orcaEKTdK7LKz57vaAYr9QeNsVEPfiu6QeMU1kektZE",
       name: "Orca",
       symbol: "ORCA",
       decimals: 6,
       logoUri:
-          "https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/orcaEKTdK7LKz57chYcSKdBI6qrE5dS1zG4FqHWGcKc/logo.svg",
+          "https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/orcaEKTdK7LKz57vaAYr9QeNsVEPfiu6QeMU1kektZE/logo.png",
     ),
   ];
 }

lib/wallets/wallet/impl/sub_wallets/solana_token_wallet.dart

@@ -510,7 +510,8 @@ class SolanaTokenWallet extends Wallet {
                 (e) =>
                     e.containsKey("parsed") &&
                     e["program"] == "spl-token" &&
-                    e["parsed"]["type"] == "transferChecked",
+                    (e["parsed"]["type"] == "transferChecked" ||
+                        e["parsed"]["type"] == "transfer"),
               );
 
           if (splTransfers.length != 1) {
@@ -522,9 +523,17 @@ class SolanaTokenWallet extends Wallet {
             continue;
           }
           final transfer = splTransfers.first;
-          final lamports = BigInt.parse(
-            transfer["parsed"]["info"]["tokenAmount"]["amount"].toString(),
-          );
+          final transferType = transfer["parsed"]["type"] as String;
+          final BigInt lamports;
+          if (transferType == "transferChecked") {
+            lamports = BigInt.parse(
+              transfer["parsed"]["info"]["tokenAmount"]["amount"].toString(),
+            );
+          } else {
+            lamports = BigInt.parse(
+              transfer["parsed"]["info"]["amount"].toString(),
+            );
+          }
           final senderAddress = transfer["parsed"]["info"]["source"] as String;
           final receiverAddress =
               transfer["parsed"]["info"]["destination"] as String;