fix(core): skip eth provider for transfer domain (#4095)

* fix(core): skip eth provider for transfer domain * fix lint error
BirthdayResearch · Oct 23, 2023 · df92ccc · df92ccc
1 parent 5a5fb80
commit df92ccc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 36 deletions.
diff --git a/mobile-app/app/api/transaction/transfer_domain.ts b/mobile-app/app/api/transaction/transfer_domain.ts
@@ -13,6 +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";
 
@@ -36,9 +38,7 @@ interface TransferDomainSigner {
   convertDirection: ConvertDirection;
   dvmAddress: string;
   evmAddress: string;
-  chainId?: number;
   networkName: NetworkName;
-  nonce: number;
 }
 
 export async function transferDomainSigner({
@@ -49,9 +49,7 @@ 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;
@@ -67,15 +65,24 @@ 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: await account.getEvmAddress(),
-    privateKey: await account.privateKey(),
+    accountEvmAddress,
+    privateKey,
     chainId,
     nonce,
   });
@@ -152,11 +159,9 @@ export function transferDomainCrafter({
   networkName,
   onBroadcast,
   onConfirmation,
-  chainId,
   submitButtonLabel,
   dvmAddress,
   evmAddress,
-  nonce,
 }: {
   amount: BigNumber;
   convertDirection: ConvertDirection;
@@ -165,11 +170,9 @@ 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(
@@ -201,8 +204,6 @@ export function transferDomainCrafter({
         targetTokenId: targetToken.tokenId,
         dvmAddress,
         evmAddress,
-        chainId,
-        nonce,
       }),
     title: translate(
       "screens/ConvertConfirmScreen",

diff --git a/mobile-app/app/contexts/CustomServiceProvider.tsx b/mobile-app/app/contexts/CustomServiceProvider.tsx
@@ -102,7 +102,7 @@ function getBlockscoutUrl(network: EnvironmentNetwork) {
   }
 }
 
-function getEthRpcUrl(network: EnvironmentNetwork) {
+export function getEthRpcUrl(network: EnvironmentNetwork) {
   // TODO: Add proper ethereum RPC URLs for each network
   switch (network) {
     case EnvironmentNetwork.LocalPlayground:

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,7 +33,6 @@ 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">;
@@ -49,7 +48,6 @@ 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),
@@ -122,18 +120,13 @@ 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,
         },
@@ -355,20 +348,16 @@ 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,
@@ -385,10 +374,8 @@ 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,7 +50,6 @@ 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">;
@@ -81,7 +80,6 @@ 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);
@@ -101,15 +99,12 @@ 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,
@@ -364,13 +359,11 @@ interface SendForm {
   address: string;
   token: WalletToken;
   domain: DomainType;
-  nonce: number;
-  chainId?: number;
   networkName: NetworkName;
 }
 
 async function send(
-  { address, token, amount, domain, networkName, nonce, chainId }: SendForm,
+  { address, token, amount, domain, networkName }: SendForm,
   dispatch: Dispatch<any>,
   onBroadcast: () => void,
   logger: NativeLoggingProps,
@@ -424,8 +417,6 @@ async function send(
               dvmAddress,
               evmAddress,
               networkName,
-              nonce,
-              chainId,
               convertDirection: sendDirection,
             });
           }