Merge branch 'feature/evm' of github.com:DeFiCh/wallet into pierregee…

…/test-e2e-runner
BirthdayResearch · Oct 23, 2023 · 517e296 · 517e296
2 parents 53a350a + 0790c65
commit 517e296
Show file tree

Hide file tree

Showing 12 changed files with 93 additions and 37 deletions.
diff --git a/mobile-app/App.tsx b/mobile-app/App.tsx
@@ -128,7 +128,7 @@ export default function App(): JSX.Element | null {
                                             renderType={customToast}
                                           >
                                             <FavouritePoolpairProvider>
-                                              <EVMProvider>
+                                              <EVMProvider logger={Logging}>
                                                 <Main />
                                               </EVMProvider>
                                             </FavouritePoolpairProvider>

diff --git a/mobile-app/app/api/transaction/transfer_domain.ts b/mobile-app/app/api/transaction/transfer_domain.ts
@@ -13,10 +13,8 @@ import { fromAddress, Eth } from "@defichain/jellyfish-address";
 import { NetworkName } from "@defichain/jellyfish-network";
 import { ConvertDirection } from "@screens/enum";
 import TransferDomainV1 from "@shared-contracts/TransferDomainV1.json";
-import { getEthRpcUrl } from "@contexts/CustomServiceProvider";
-import { SecuredStoreAPI } from "@api/secured";
 
-const TD_CONTRACT_ADDR = "0xdf00000000000000000000000000000000000001";
+export const TD_CONTRACT_ADDR = "0xdf00000000000000000000000000000000000001";
 
 const TRANSFER_DOMAIN_TYPE = {
   DVM: 2,
@@ -38,7 +36,9 @@ interface TransferDomainSigner {
   convertDirection: ConvertDirection;
   dvmAddress: string;
   evmAddress: string;
+  chainId?: number;
   networkName: NetworkName;
+  nonce: number;
 }
 
 export async function transferDomainSigner({
@@ -49,7 +49,9 @@ export async function transferDomainSigner({
   convertDirection,
   dvmAddress,
   evmAddress,
+  chainId,
   networkName,
+  nonce,
 }: TransferDomainSigner): Promise<CTransactionSegWit> {
   const dvmScript = fromAddress(dvmAddress, networkName)?.script as Script;
   const evmScript = Eth.fromAddress(evmAddress) as Script;
@@ -65,24 +67,15 @@ export async function transferDomainSigner({
     ? [TRANSFER_DOMAIN_TYPE.EVM, TRANSFER_DOMAIN_TYPE.DVM]
     : [TRANSFER_DOMAIN_TYPE.DVM, TRANSFER_DOMAIN_TYPE.EVM];
 
-  const privateKey = await account.privateKey();
-  const accountEvmAddress = await account.getEvmAddress();
-
-  // TODO (lyka): Check android issue with null eth provider
-  const network = await SecuredStoreAPI.getNetwork();
-  const ethRpc = new providers.JsonRpcProvider(getEthRpcUrl(network));
-  const nonce = await ethRpc.getTransactionCount(accountEvmAddress);
-  const chainId = (await ethRpc.getNetwork()).chainId;
-
   const signedEvmTxData = await createSignedEvmTx({
     isEvmToDvm,
     sourceTokenId: stripEvmSuffixFromTokenId(sourceTokenId).toString(),
     targetTokenId: stripEvmSuffixFromTokenId(targetTokenId).toString(),
     amount,
     dvmAddress,
     evmAddress,
-    accountEvmAddress,
-    privateKey,
+    accountEvmAddress: await account.getEvmAddress(),
+    privateKey: await account.privateKey(),
     chainId,
     nonce,
   });
@@ -159,9 +152,11 @@ export function transferDomainCrafter({
   networkName,
   onBroadcast,
   onConfirmation,
+  chainId,
   submitButtonLabel,
   dvmAddress,
   evmAddress,
+  nonce,
 }: {
   amount: BigNumber;
   convertDirection: ConvertDirection;
@@ -170,9 +165,11 @@ export function transferDomainCrafter({
   networkName: NetworkName;
   onBroadcast: () => any;
   onConfirmation: () => void;
+  chainId?: number;
   submitButtonLabel?: string;
   dvmAddress: string;
   evmAddress: string;
+  nonce: number;
 }): DfTxSigner {
   if (
     ![ConvertDirection.evmToDvm, ConvertDirection.dvmToEvm].includes(
@@ -204,6 +201,8 @@ export function transferDomainCrafter({
         targetTokenId: targetToken.tokenId,
         dvmAddress,
         evmAddress,
+        chainId,
+        nonce,
       }),
     title: translate(
       "screens/ConvertConfirmScreen",
@@ -305,7 +304,7 @@ async function createSignedEvmTx({
   return new Uint8Array(Buffer.from(evmtxSigned, "hex") || []);
 }
 
-function stripEvmSuffixFromTokenId(tokenId: string) {
+export function stripEvmSuffixFromTokenId(tokenId: string) {
   if (tokenId.includes("_evm")) {
     return Number(tokenId.replace("_evm", ""));
   }

diff --git a/mobile-app/app/contexts/CustomServiceProvider.tsx b/mobile-app/app/contexts/CustomServiceProvider.tsx
@@ -102,7 +102,7 @@ function getBlockscoutUrl(network: EnvironmentNetwork) {
   }
 }
 
-export function getEthRpcUrl(network: EnvironmentNetwork) {
+function getEthRpcUrl(network: EnvironmentNetwork) {
   // TODO: Add proper ethereum RPC URLs for each network
   switch (network) {
     case EnvironmentNetwork.LocalPlayground:
@@ -111,11 +111,11 @@ export function getEthRpcUrl(network: EnvironmentNetwork) {
     case EnvironmentNetwork.DevNet:
     case EnvironmentNetwork.Changi:
       return "http://34.34.156.49:20551"; // TODO: add final eth rpc url for changi, devnet and remote playground
-    case EnvironmentNetwork.TestNet:
-      return "http://34.38.30.102:18551"; // TODO: add final eth rpc url for testnet, with proper domain name
     case EnvironmentNetwork.MainNet:
-    default:
       return "https://changi.dfi.team"; // TODO: add final eth rpc url for mainnet, with proper domain name
+    case EnvironmentNetwork.TestNet:
+    default:
+      return "http://34.38.30.102:18551"; // TODO: add final eth rpc url for testnet, with proper domain name
   }
 }
 

diff --git a/mobile-app/app/contexts/EVMProvider.tsx b/mobile-app/app/contexts/EVMProvider.tsx
@@ -7,6 +7,7 @@ import React, {
 } from "react";
 import { providers } from "ethers";
 import { useNetworkContext } from "@waveshq/walletkit-ui";
+import { BaseLogger } from "@waveshq/walletkit-ui/dist/contexts/logger";
 import { useCustomServiceProviderContext } from "./CustomServiceProvider";
 
 interface EVMProviderContextI {
@@ -21,7 +22,8 @@ export function useEVMProvider(): EVMProviderContextI {
 
 export function EVMProvider({
   children,
-}: React.PropsWithChildren<any>): JSX.Element | null {
+  logger,
+}: React.PropsWithChildren<{ logger: BaseLogger }>): JSX.Element | null {
   const { ethRpcUrl } = useCustomServiceProviderContext();
   const { network } = useNetworkContext();
   const [chainId, setChainId] = useState<number>();
@@ -35,7 +37,10 @@ export function EVMProvider({
       const { chainId } = await provider.getNetwork();
       setChainId(chainId);
       setProvider(provider);
+      logger.info(`ChainID: ${chainId}`);
     } catch (e) {
+      logger.info(`Eth rpc url: ${ethRpcUrl}`);
+      logger.error(e);
       // Note: Added this for cases wherein eth rpc url is invalid or unreachable
       setChainId(0);
       setProvider(null);

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/PortfolioCard.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/PortfolioCard.tsx
@@ -122,7 +122,6 @@ function PortfolioItemRow({
             displaySymbol={token.displaySymbol}
             name={token.name}
             testID={testID}
-            isEvmDomain={isEvmDomain}
           />
         </View>
         <View

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TokenNameText.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TokenNameText.tsx
@@ -7,15 +7,11 @@ export function TokenNameText({
   testID,
   displaySymbol,
   name,
-  isEvmDomain,
 }: {
   testID: string;
   displaySymbol: string;
   name: string;
-  isEvmDomain?: boolean;
 }): JSX.Element {
-  const domainTypeText = isEvmDomain ? "for EVM" : "";
-  const tokenName = `${name} ${domainTypeText}`;
   return (
     <View style={tailwind("ml-2 flex-auto")}>
       <ThemedTextV2
@@ -35,7 +31,7 @@ export function TokenNameText({
           testID={`${testID}_name`}
           ellipsizeMode="tail"
         >
-          {tokenName}
+          {name}
         </ThemedTextV2>
       )}
     </View>

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/hooks/EvmTokenBalances.ts b/mobile-app/app/screens/AppNavigator/screens/Portfolio/hooks/EvmTokenBalances.ts
@@ -75,7 +75,7 @@ export function useEvmTokenBalances(): { evmTokens: WalletToken[] } {
                   isDAT: tokenDetails.isDAT,
                   isLPS: tokenDetails.isLPS,
                   isLoanToken: tokenDetails.isLoanToken,
-                  name: `${tokenDetails.name} for EVM`,
+                  name: `${tokenDetails.name || tokenDetails.symbol} for EVM`,
                   displaySymbol: tokenDetails.displaySymbol,
                   avatarSymbol: tokenDetails.symbol,
                   amount: utils.formatUnits(each.value, each?.token?.decimals),

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/ConvertConfirmationScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/ConvertConfirmationScreen.tsx
@@ -33,6 +33,7 @@ import {
 } from "@api/transaction/transfer_domain";
 import { useNetworkContext } from "@waveshq/walletkit-ui";
 import { NetworkName } from "@defichain/jellyfish-network";
+import { useEVMProvider } from "@contexts/EVMProvider";
 import { PortfolioParamList } from "../PortfolioNavigator";
 
 type Props = StackScreenProps<PortfolioParamList, "ConvertConfirmationScreen">;
@@ -48,6 +49,7 @@ export function ConvertConfirmationScreen({ route }: Props): JSX.Element {
   } = route.params;
   const { networkName } = useNetworkContext();
   const { address, evmAddress } = useWalletContext();
+  const { provider, chainId } = useEVMProvider();
   const addressLabel = useAddressLabel(address);
   const hasPendingJob = useSelector((state: RootState) =>
     hasTxQueued(state.transactionQueue),
@@ -120,13 +122,18 @@ export function ConvertConfirmationScreen({ route }: Props): JSX.Element {
         logger,
       );
     } else {
+      const nonce = provider
+        ? await provider.getTransactionCount(evmAddress)
+        : 0;
       await constructSignedTransferDomain(
         {
           amount,
           convertDirection,
           sourceToken,
           targetToken,
           networkName,
+          chainId,
+          nonce,
           evmAddress,
           dvmAddress: address,
         },
@@ -193,7 +200,11 @@ export function ConvertConfirmationScreen({ route }: Props): JSX.Element {
               ? "DFI (EVM)"
               : targetToken.displaySymbol
           }
-          fromAddress={address}
+          fromAddress={
+            convertDirection === ConvertDirection.evmToDvm
+              ? evmAddress
+              : address
+          }
           fromAddressLabel={addressLabel}
           isEvmToken={convertDirection === ConvertDirection.dvmToEvm}
         />
@@ -348,16 +359,20 @@ async function constructSignedTransferDomain(
     sourceToken,
     targetToken,
     networkName,
+    chainId,
     dvmAddress,
     evmAddress,
+    nonce,
   }: {
     convertDirection: ConvertDirection;
     sourceToken: TransferDomainToken;
     targetToken: TransferDomainToken;
     amount: BigNumber;
     networkName: NetworkName;
+    chainId?: number;
     dvmAddress: string;
     evmAddress: string;
+    nonce: number;
   },
   dispatch: Dispatch<any>,
   onBroadcast: () => void,
@@ -374,8 +389,10 @@ async function constructSignedTransferDomain(
           networkName,
           onBroadcast,
           onConfirmation: () => {},
+          chainId,
           dvmAddress,
           evmAddress,
+          nonce,
         }),
       ),
     );

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/SendConfirmationScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/SendConfirmationScreen.tsx
@@ -50,6 +50,7 @@ import {
   AddressType as JellyfishAddressType,
 } from "@waveshq/walletkit-core";
 import { DomainType, useDomainContext } from "@contexts/DomainContext";
+import { useEVMProvider } from "@contexts/EVMProvider";
 import { PortfolioParamList } from "../PortfolioNavigator";
 
 type Props = StackScreenProps<PortfolioParamList, "SendConfirmationScreen">;
@@ -80,6 +81,7 @@ export function SendConfirmationScreen({ route }: Props): JSX.Element {
     hasOceanTXQueued(state.ocean),
   );
   const dispatch = useAppDispatch();
+  const { provider, chainId } = useEVMProvider();
   const [isSubmitting, setIsSubmitting] = useState(false);
   const navigation = useNavigation<NavigationProp<PortfolioParamList>>();
   const [isOnPage, setIsOnPage] = useState<boolean>(true);
@@ -99,12 +101,15 @@ export function SendConfirmationScreen({ route }: Props): JSX.Element {
       return;
     }
     setIsSubmitting(true);
+    const nonce = provider ? await provider.getTransactionCount(evmAddress) : 0;
     await send(
       {
         address: destination,
         token,
         amount,
         domain,
+        chainId,
+        nonce,
         networkName: network.networkName,
       },
       dispatch,
@@ -359,11 +364,13 @@ interface SendForm {
   address: string;
   token: WalletToken;
   domain: DomainType;
+  nonce: number;
+  chainId?: number;
   networkName: NetworkName;
 }
 
 async function send(
-  { address, token, amount, domain, networkName }: SendForm,
+  { address, token, amount, domain, networkName, nonce, chainId }: SendForm,
   dispatch: Dispatch<any>,
   onBroadcast: () => void,
   logger: NativeLoggingProps,
@@ -417,6 +424,8 @@ async function send(
               dvmAddress,
               evmAddress,
               networkName,
+              nonce,
+              chainId,
               convertDirection: sendDirection,
             });
           }

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/TokenDetailScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/TokenDetailScreen.tsx
@@ -13,7 +13,10 @@ import {
   unifiedDFISelector,
   WalletToken,
 } from "@waveshq/walletkit-ui/dist/store";
-import { useDeFiScanContext } from "@shared-contexts/DeFiScanContext";
+import {
+  getMetaScanTokenUrl,
+  useDeFiScanContext,
+} from "@shared-contexts/DeFiScanContext";
 import { PoolPairData } from "@defichain/whale-api-client/dist/api/poolpairs";
 import { View } from "@components";
 import {
@@ -31,6 +34,7 @@ import { InfoTextLinkV2 } from "@components/InfoTextLink";
 import { ThemedTouchableListItem } from "@components/themed/ThemedTouchableListItem";
 import { ConvertDirection } from "@screens/enum";
 import { DomainType, useDomainContext } from "@contexts/DomainContext";
+import { useNetworkContext } from "@waveshq/walletkit-ui";
 import { PortfolioParamList } from "../PortfolioNavigator";
 import { useTokenPrice } from "../hooks/TokenPrice";
 import { useDenominationCurrency } from "../hooks/PortfolioCurrency";
@@ -447,14 +451,17 @@ function TokenSummary(props: {
 }): JSX.Element {
   const { denominationCurrency } = useDenominationCurrency();
   const { getTokenUrl } = useDeFiScanContext();
+  const { network } = useNetworkContext();
   const onTokenUrlPressed = async (): Promise<void> => {
     const id =
       props.token.id === "0_utxo" ||
       props.token.id === "0_unified" ||
       props.token.id === "0_evm"
         ? 0
         : props.token.id;
-    const url = getTokenUrl(id);
+    const url = props.token.id.includes("_evm")
+      ? getMetaScanTokenUrl(network, props.token.id)
+      : getTokenUrl(id);
     await Linking.openURL(url);
   };
 
@@ -488,7 +495,7 @@ function TokenSummary(props: {
                 dark={tailwind("text-mono-dark-v2-700")}
                 style={tailwind("text-sm font-normal-v2")}
               >
-                {props.token.name}
+                {props.token.name || props.token.symbol}
               </ThemedTextV2>
               <View style={tailwind("ml-1 flex-grow-0 justify-center")}>
                 <ThemedIcon

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/TokenSelectionScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/TokenSelectionScreen.tsx
@@ -230,7 +230,6 @@ function TokenSelectionRow({
           displaySymbol={item.token.displaySymbol}
           name={item.token.name}
           testID={item.token.displaySymbol}
-          isEvmDomain={isEvmDomain}
         />
       </View>
       <View style={tailwind("flex flex-col items-end")}>