436 feature complete type checks on token transactions

e2e/sendTransaction.test.ts

@@ -129,7 +129,7 @@ test('send BETA token COA to EOA', async ({ page }) => {
     successtext: 'success',
   });
 });
-//Move FTs from COA to FLOW
+/* //Move FTs from COA to FLOW
 test('move Flow COA to FLOW', async ({ page }) => {
   // Move FLOW token from COA to FLOW
   await moveTokenCOA({
@@ -164,7 +164,7 @@ test('move USDC token COA to FLOW homepage', async ({ page }) => {
     tokenname: 'Bridged USDC (Celer)',
     amount: '0.000123',
   });
-});
+}); */
 //Send NFT from COA to COA
 //Send NFT from COA to FLOW
 //Send NFT from COA to EOA

e2e/sendTransactionFromFlow.test.ts

@@ -124,7 +124,7 @@ test('send BETA flow to EOA', async ({ page }) => {
     ingoreFlowCharge: true,
   });
 });
-//Move FTs from  Flow to COA
+/* //Move FTs from  Flow to COA
 test('move Flow Flow to COA', async ({ page }) => {
   // Move FLOW token from FLOW to COA
   await moveTokenFlow({
@@ -160,3 +160,4 @@ test('move USDC token Flow to COA homepage', async ({ page }) => {
     ingoreFlowCharge: true,
   });
 });
+ */

src/background/controller/wallet.ts

@@ -9,8 +9,9 @@ import { ethErrors } from 'eth-rpc-errors';
 import * as ethUtil from 'ethereumjs-util';
 import { getApp } from 'firebase/app';
 import { getAuth } from 'firebase/auth/web-extension';
+import type { TokenInfo } from 'flow-native-token-registry';
 import { encode } from 'rlp';
-import web3, { TransactionError } from 'web3';
+import web3, { TransactionError, Web3 } from 'web3';
 
 import {
   findAddressWithNetwork,
@@ -26,10 +27,10 @@ import {
 import eventBus from '@/eventBus';
 import { type FeatureFlagKey, type FeatureFlags } from '@/shared/types/feature-types';
 import { type TrackingEvents } from '@/shared/types/tracking-types';
-import { type ActiveChildType, type LoggedInAccount } from '@/shared/types/wallet-types';
+import { type TransactionState } from '@/shared/types/transaction-types';
+import { type LoggedInAccount } from '@/shared/types/wallet-types';
 import { ensureEvmAddressPrefix, isValidEthereumAddress, withPrefix } from '@/shared/utils/address';
-import { getHashAlgo, getSignAlgo } from '@/shared/utils/algo';
-import { retryOperation } from '@/shared/utils/retryOperation';
+import { getSignAlgo } from '@/shared/utils/algo';
 import {
   keyringService,
   preferenceService,
@@ -59,7 +60,7 @@ import emoji from 'background/utils/emoji.json';
 import fetchConfig from 'background/utils/remoteConfig';
 import { notification, storage } from 'background/webapi';
 import { openIndexPage } from 'background/webapi/tab';
-import { INTERNAL_REQUEST_ORIGIN, EVENTS, KEYRING_TYPE } from 'consts';
+import { INTERNAL_REQUEST_ORIGIN, EVENTS, KEYRING_TYPE, EVM_ENDPOINT } from 'consts';
 
 import type {
   BlockchainResponse,
@@ -75,6 +76,7 @@ import type { PreferenceAccount } from '../service/preference';
 import { type EvaluateStorageResult, StorageEvaluator } from '../service/storage-evaluator';
 import type { UserInfoStore } from '../service/user';
 import defaultConfig from '../utils/defaultConfig.json';
+import erc20ABI from '../utils/erc20.abi.json';
 import { getLoggedInAccount } from '../utils/getLoggedInAccount';
 
 import BaseController from './base';
@@ -787,27 +789,6 @@ export class WalletController extends BaseController {
     const keyring = await keyringService.getKeyringForAccount(from, type);
     const res = await keyringService.signTransaction(keyring, data, options);
 
-    /*
-    cadence_transaction_signed: {
-      cadence: string; // SHA256 Hashed Cadence that was signed.
-      tx_id: string; // String of the transaction ID.
-      authorizers: string[]; // Comma separated list of authorizer account address in the transaction
-      proposer: string; // Address of the transactions proposer.
-      payer: string; // Payer of the transaction.
-      success: boolean; // Boolean of if the transaction was sent successful or not. true/false
-    };
-    evm_transaction_signed: {
-      success: boolean; // Boolean of if the transaction was sent successful or not. true/false
-      flow_address: string; // Address of the account that signed the transaction
-      evm_address: string; // EVM Address of the account that signed the transaction
-      tx_id: string; // transaction id
-    };
-    mixpanelTrack.track('transaction_signed', {
-      address: from,
-      type,
-      ...res,
-    });
-    */
     return res;
   };
 
@@ -892,16 +873,7 @@ export class WalletController extends BaseController {
   updateAlianName = (address: string, name: string) =>
     preferenceService.updateAlianName(address, name);
   getAllAlianName = () => preferenceService.getAllAlianName();
-  // getInitAlianNameStatus = () => preferenceService.getInitAlianNameStatus();
-  // updateInitAlianNameStatus = () =>
-  //   preferenceService.changeInitAlianNameStatus();
-  // getLastTimeGasSelection = (chainId) => {
-  //   return preferenceService.getLastTimeGasSelection(chainId);
-  // };
 
-  // updateLastTimeGasSelection = (chainId: string, gas: ChainGas) => {
-  //   return preferenceService.updateLastTimeGasSelection(chainId, gas);
-  // };
   getIsFirstOpen = () => {
     return preferenceService.getIsFirstOpen();
   };
@@ -911,14 +883,6 @@ export class WalletController extends BaseController {
   listChainAssets = async (address: string) => {
     return await openapiService.getCoinList(address);
   };
-  // getAddedToken = (address: string) => {
-  //   return preferenceService.getAddedToken(address);
-  // };
-  // updateAddedToken = (address: string, tokenList: []) => {
-  //   return preferenceService.updateAddedToken(address, tokenList);
-  // };
-
-  // lilico new service
 
   // userinfo
   getUserInfo = async (forceRefresh: boolean) => {
@@ -1014,17 +978,7 @@ export class WalletController extends BaseController {
 
   checkAccessibleNft = async (childAccount) => {
     try {
-      // const res = await openapiService.checkChildAccount(address);
-      // const nfts = await openapiService.queryAccessible(
-      //   '0x84221fe0294044d7',
-      //   '0x16c41a2b76dee69b'
-      // );
       const nfts = await openapiService.checkChildAccountNFT(childAccount);
-      // openapiService.checkChildAccountNFT(address).then((res) => {
-      //   console.log(res)
-      // }).catch((err) => {
-      //   console.log(err)
-      // })
 
       return nfts;
     } catch (error) {
@@ -1037,13 +991,7 @@ export class WalletController extends BaseController {
     const network = await this.getNetwork();
 
     const address = await userWalletService.getMainWallet(network);
-    // const res = await openapiService.checkChildAccount(address);
     const result = await openapiService.queryAccessibleFt(address, childAccount);
-    // openapiService.checkChildAccountNFT(address).then((res) => {
-    //   console.log(res)
-    // }).catch((err) => {
-    //   console.log(err)
-    // })
 
     return result;
   };
@@ -1806,6 +1754,132 @@ export class WalletController extends BaseController {
     });
   };
 
+  // Master send token function that takes a transaction state from the front end and returns the transaction ID
+  transferTokens = async (transactionState: TransactionState): Promise<string> => {
+    const transferTokensOnCadence = async () => {
+      return this.transferCadenceTokens(
+        transactionState.selectedToken.symbol,
+        transactionState.toAddress,
+        transactionState.amount
+      );
+    };
+
+    const transferTokensFromChildToCadence = async () => {
+      return this.sendFTfromChild(
+        transactionState.fromAddress,
+        transactionState.toAddress,
+        'flowTokenProvider',
+        transactionState.amount,
+        transactionState.selectedToken.symbol
+      );
+    };
+
+    const transferFlowFromEvmToCadence = async () => {
+      console.log('transferFlowFromEvmToCadence');
+      return this.withdrawFlowEvm(transactionState.amount, transactionState.toAddress);
+    };
+
+    const transferFTFromEvmToCadence = async () => {
+      return this.transferFTFromEvm(
+        transactionState.selectedToken['flowIdentifier'],
+        transactionState.amount,
+        transactionState.toAddress,
+        transactionState.selectedToken
+      );
+    };
+
+    // Returns the transaction ID
+    const transferTokensOnEvm = async () => {
+      // the amount is always stored as a string in the transaction state
+      const amountStr: string = transactionState.amount;
+      // TODO: check if the amount is a valid number
+      // Create an integer string based on the required token decimals
+      const amountBN = new BN(amountStr.replace('.', ''));
+
+      const decimalsCount = amountStr.split('.')[1]?.length || 0;
+      const decimalDifference = transactionState.selectedToken.decimals - decimalsCount;
+      if (decimalDifference < 0) {
+        throw new Error('Too many decimal places have been provided');
+      }
+      const scaleFactor = new BN(10).pow(decimalDifference);
+      const integerAmount = amountBN.multipliedBy(scaleFactor);
+      const integerAmountStr = integerAmount.integerValue(BN.ROUND_DOWN).toFixed();
+
+      let address, gas, value, data;
+
+      if (transactionState.selectedToken.symbol.toLowerCase() === 'flow') {
+        address = transactionState.toAddress;
+        gas = '1';
+        // const amountBN = new BN(transactionState.amount).multipliedBy(new BN(10).pow(18));
+        // the amount is always stored as a string in the transaction state
+        value = integerAmount.toString(16);
+        data = '0x';
+      } else {
+        // Get the current network
+        const network = await this.getNetwork();
+        // Get the Web3 provider
+        const provider = new Web3.providers.HttpProvider(EVM_ENDPOINT[network]);
+        // Get the web3 instance
+        const web3Instance = new Web3(provider);
+        // Get the erc20 contract
+        const erc20Contract = new web3Instance.eth.Contract(
+          erc20ABI,
+          transactionState.selectedToken.address
+        );
+        // Encode the data
+        const encodedData = erc20Contract.methods
+          .transfer(ensureEvmAddressPrefix(transactionState.toAddress), integerAmountStr)
+          .encodeABI();
+        gas = '1312d00';
+        address = ensureEvmAddressPrefix(transactionState.selectedToken.address);
+        value = '0x0'; // Zero value as hex
+        data = encodedData.startsWith('0x') ? encodedData : `0x${encodedData}`;
+      }
+
+      // Send the transaction
+      return this.sendEvmTransaction(address, gas, value, data);
+    };
+
+    const transferFlowFromCadenceToEvm = async () => {
+      return this.transferFlowEvm(transactionState.toAddress, transactionState.amount);
+    };
+
+    const transferFTFromCadenceToEvm = async () => {
+      const address = transactionState.selectedToken!.address.startsWith('0x')
+        ? transactionState.selectedToken!.address.slice(2)
+        : transactionState.selectedToken!.address;
+
+      return this.transferFTToEvmV2(
+        `A.${address}.${transactionState.selectedToken!.contractName}.Vault`,
+        transactionState.amount,
+        transactionState.toAddress
+      );
+    };
+
+    // Switch on the current transaction state
+    switch (transactionState.currentTxState) {
+      case 'FTFromEvmToCadence':
+        return await transferFTFromEvmToCadence();
+      case 'FlowFromEvmToCadence':
+        return await transferFlowFromEvmToCadence();
+      case 'FTFromChildToCadence':
+      case 'FlowFromChildToCadence':
+        return await transferTokensFromChildToCadence();
+      case 'FTFromCadenceToCadence':
+      case 'FlowFromCadenceToCadence':
+        return await transferTokensOnCadence();
+      case 'FlowFromEvmToEvm':
+      case 'FTFromEvmToEvm':
+        return await transferTokensOnEvm();
+      case 'FlowFromCadenceToEvm':
+        return await transferFlowFromCadenceToEvm();
+      case 'FTFromCadenceToEvm':
+        return await transferFTFromCadenceToEvm();
+      default:
+        throw new Error(`Unsupported transaction state: ${transactionState.currentTxState}`);
+    }
+  };
+
   transferFlowEvm = async (
     recipientEVMAddressHex: string,
     amount = '1.0',
@@ -1875,11 +1949,11 @@ export class WalletController extends BaseController {
 
   transferFTToEvmV2 = async (
     vaultIdentifier: string,
-    amount = '1.0',
-    recipient
+    amount = '0.0',
+    recipient: string
   ): Promise<string> => {
     await this.getNetwork();
-    const formattedAmount = parseFloat(amount).toFixed(8);
+    const formattedAmount = new BN(amount).decimalPlaces(8, BN.ROUND_DOWN).toString();
 
     const script = await getScripts('bridge', 'bridgeTokensToEvmAddressV2');
 
@@ -1902,9 +1976,9 @@ export class WalletController extends BaseController {
 
   transferFTFromEvm = async (
     flowidentifier: string,
-    amount = '1.0',
+    amount: string,
     receiver: string,
-    tokenResult
+    tokenResult: TokenInfo
   ): Promise<string> => {
     await this.getNetwork();
     const amountStr = amount.toString();
@@ -1941,9 +2015,8 @@ export class WalletController extends BaseController {
     return txID;
   };
 
-  withdrawFlowEvm = async (amount = '1.0', address: string): Promise<string> => {
-    await this.getNetwork();
-    const formattedAmount = parseFloat(amount).toFixed(8);
+  withdrawFlowEvm = async (amount = '0.0', address: string): Promise<string> => {
+    const formattedAmount = new BN(amount).decimalPlaces(8, BN.ROUND_DOWN).toString();
     const script = await getScripts('evm', 'withdrawCoa');
 
     const txID = await userWalletService.sendTransaction(script, [
@@ -1955,9 +2028,7 @@ export class WalletController extends BaseController {
   };
 
   fundFlowEvm = async (amount = '1.0'): Promise<string> => {
-    await this.getNetwork();
-    const formattedAmount = parseFloat(amount).toFixed(8);
-
+    const formattedAmount = new BN(amount).decimalPlaces(8, BN.ROUND_DOWN).toString();
     const script = await getScripts('evm', 'fundCoa');
 
     return await userWalletService.sendTransaction(script, [fcl.arg(formattedAmount, t.UFix64)]);
@@ -1995,8 +2066,7 @@ export class WalletController extends BaseController {
   };
 
   bridgeToEvm = async (flowIdentifier, amount = '1.0'): Promise<string> => {
-    await this.getNetwork();
-    const formattedAmount = parseFloat(amount).toFixed(8);
+    const formattedAmount = new BN(amount).decimalPlaces(8, BN.ROUND_DOWN).toString();
 
     const script = await getScripts('bridge', 'bridgeTokensToEvmV2');
 
@@ -2325,37 +2395,7 @@ export class WalletController extends BaseController {
   };
 
   // TODO: Replace with generic token
-  transferTokens = async (symbol: string, address: string, amount: string): Promise<string> => {
-    const token = await openapiService.getTokenInfo(symbol);
-    if (!token) {
-      throw new Error(`Invaild token name - ${symbol}`);
-    }
-    await this.getNetwork();
-    const script = await getScripts('ft', 'transferTokensV3');
-
-    const txID = await userWalletService.sendTransaction(
-      script
-        .replaceAll('<Token>', token.contractName)
-        .replaceAll('<TokenBalancePath>', token.path.balance)
-        .replaceAll('<TokenReceiverPath>', token.path.receiver)
-        .replaceAll('<TokenStoragePath>', token.path.vault)
-        .replaceAll('<TokenAddress>', token.address),
-      [fcl.arg(amount, t.UFix64), fcl.arg(address, t.Address)]
-    );
-
-    mixpanelTrack.track('ft_transfer', {
-      from_address: (await this.getCurrentAddress()) || '',
-      to_address: address,
-      amount: parseFloat(amount),
-      ft_identifier: token.contractName,
-      type: 'flow',
-    });
-
-    return txID;
-  };
-
-  // TODO: Replace with generic token
-  transferInboxTokens = async (
+  transferCadenceTokens = async (
     symbol: string,
     address: string,
     amount: string