Merge pull request #434 from multiversx/development

Add isGuarded prop (#433)

Author: mgavrila

pnpm-lock.yaml

@@ -0,0 +1 @@
+export const GUARDED_TX_EXTRA_GAS_LIMIT = 50_000;

src/localConstants/gas.ts

@@ -1,10 +1,10 @@
-import { useState } from 'react';
 import {
   faArrowsRotate,
   faPaperPlane,
   IconDefinition
 } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { useState } from 'react';
 import { OutputContainer } from 'components/OutputContainer';
 import { TransactionsOutput } from 'components/OutputContainer/components';
 import { MvxButton, useGetPendingTransactionsSessions } from 'lib';
@@ -35,7 +35,7 @@ interface BatchTransactionsButtonsType {
 }
 
 export const BatchTransactions = () => {
-  const { address, nonce } = useGetAccount();
+  const { address, nonce, isGuarded } = useGetAccount();
   const { network } = useGetNetworkConfig();
   const [currentSessionId, setCurrentSessionId] = useState('');
   const pendingSession = useGetPendingTransactionsSessions();
@@ -47,6 +47,7 @@ export const BatchTransactions = () => {
 
   const executeSignAndAutoSendBatchTransactions = async () => {
     const sessionId = await signAndAutoSendBatchTransactions({
+      isGuarded,
       address,
       nonce,
       chainID: network.chainId,
@@ -63,6 +64,7 @@ export const BatchTransactions = () => {
 
   const executeWrapMultiTransferTransactions = async () => {
     const sessionId = await wrapAndMultiTransferTransactions({
+      isGuarded,
       address,
       nonce,
       chainID: network.chainId,
@@ -79,6 +81,7 @@ export const BatchTransactions = () => {
 
   const executeSwapAndLockTokens = async () => {
     const sessionId = await swapAndLockTokens({
+      isGuarded,
       address,
       nonce,
       chainID: network.chainId,

src/pages/Dashboard/widgets/BatchTransactions/BatchTransactions.tsx

@@ -5,13 +5,15 @@ import {
   TransactionsFactoryConfig,
   TransferTransactionsFactory
 } from 'lib';
+import { GUARDED_TX_EXTRA_GAS_LIMIT } from 'localConstants/gas';
 import { TransactionProps } from 'types';
 
 const NUMBER_OF_TRANSACTIONS = 5;
 
 export const getBatchTransactions = async ({
   address,
-  chainID
+  chainID,
+  isGuarded
 }: TransactionProps): Promise<Transaction[]> => {
   const transactions = Array.from(Array(NUMBER_OF_TRANSACTIONS).keys());
 
@@ -35,6 +37,11 @@ export const getBatchTransactions = async ({
           }
         );
 
+      if (isGuarded) {
+        tokenTransfer.gasLimit =
+          tokenTransfer.gasLimit + BigInt(GUARDED_TX_EXTRA_GAS_LIMIT);
+      }
+
       return tokenTransfer;
     })
   );

src/pages/Dashboard/widgets/BatchTransactions/helpers/getBatchTransactions.ts

@@ -1,13 +1,15 @@
 import { BATCH_TRANSACTIONS_SC } from 'config';
 import { Address, GAS_PRICE, Transaction, VERSION } from 'lib';
+import { GUARDED_TX_EXTRA_GAS_LIMIT } from 'localConstants/gas';
 import { TransactionProps } from 'types';
 
 export const getSwapAndLockTransactions = ({
+  isGuarded,
   address,
   chainID,
   nonce
 }: TransactionProps): Transaction[] => {
-  return [
+  const transactions = [
     new Transaction({
       chainID,
       gasLimit: BigInt(4200000),
@@ -57,4 +59,12 @@ export const getSwapAndLockTransactions = ({
       data: Uint8Array.from(Buffer.from(BATCH_TRANSACTIONS_SC.lock_MEX.data))
     })
   ];
+
+  if (isGuarded) {
+    transactions.forEach((tx) => {
+      tx.gasLimit = tx.gasLimit + BigInt(GUARDED_TX_EXTRA_GAS_LIMIT);
+    });
+  }
+
+  return transactions;
 };

src/pages/Dashboard/widgets/BatchTransactions/helpers/getSwapAndLockTransactions.ts

@@ -10,9 +10,11 @@ import {
 import { BATCH_TRANSACTIONS_SC } from 'config';
 import { contractAddress } from 'config';
 import { Address } from 'lib';
+import { GUARDED_TX_EXTRA_GAS_LIMIT } from 'localConstants/gas';
 import { TransactionProps } from 'types';
 
 export const getWrapAndMultiTransferTransactions = async ({
+  isGuarded,
   address,
   chainID
 }: TransactionProps) => {
@@ -68,5 +70,13 @@ export const getWrapAndMultiTransferTransactions = async ({
       ]
     });
 
+  if (isGuarded) {
+    [wrapOneEgld, swapHalfWEgldToUsdc, multiTransferOneUsdcHalfWEgld].forEach(
+      (tx) => {
+        tx.gasLimit += BigInt(GUARDED_TX_EXTRA_GAS_LIMIT);
+      }
+    );
+  }
+
   return { wrapOneEgld, swapHalfWEgldToUsdc, multiTransferOneUsdcHalfWEgld };
 };

src/pages/Dashboard/widgets/BatchTransactions/helpers/getWrapAndMultiTransferTransactions.ts

@@ -4,6 +4,7 @@ import { getBatchTransactions } from './getBatchTransactions';
 import { sendAndTrackTransactions } from './sendAndTrackTransactions';
 
 export const signAndAutoSendBatchTransactions = async ({
+  isGuarded,
   address,
   nonce,
   chainID,
@@ -18,6 +19,7 @@ export const signAndAutoSendBatchTransactions = async ({
   const provider = getAccountProvider();
 
   const transactions = await getBatchTransactions({
+    isGuarded,
     address,
     nonce,
     chainID

src/pages/Dashboard/widgets/BatchTransactions/helpers/signAndAutoSendBatchTransactions.ts

@@ -10,6 +10,7 @@ import { getSwapAndLockTransactions } from './getSwapAndLockTransactions';
 import { sendAndTrackTransactions } from './sendAndTrackTransactions';
 
 export const swapAndLockTokens = async ({
+  isGuarded,
   address,
   nonce,
   chainID,
@@ -24,6 +25,7 @@ export const swapAndLockTokens = async ({
   const provider = getAccountProvider();
 
   const transactionsToSign = getSwapAndLockTransactions({
+    isGuarded,
     address,
     chainID,
     nonce

src/pages/Dashboard/widgets/BatchTransactions/helpers/swapAndLockTokens.ts

@@ -14,11 +14,12 @@ interface WrapAndMultiTransferTransactionsType extends TransactionProps {
 export const wrapAndMultiTransferTransactions = async (
   props: WrapAndMultiTransferTransactionsType
 ) => {
-  const { address, nonce, chainID, transactionsDisplayInfo } = props;
+  const { address, nonce, chainID, transactionsDisplayInfo, isGuarded } = props;
 
   const provider = getAccountProvider();
 
   const transactionsToSign = await getWrapAndMultiTransferTransactions({
+    isGuarded,
     address,
     chainID,
     nonce

src/pages/Dashboard/widgets/BatchTransactions/helpers/wrapAndMultiTransferTransactions.ts

@@ -1,4 +1,5 @@
 export type TransactionProps = {
+  isGuarded?: boolean;
   address: string;
   nonce: number;
   chainID: string;