Nft edge cases fix

src/AarcSDK.ts

@@ -21,6 +21,7 @@ import {
   SingleTransferPermitDto,
   TokenData,
   TokenNftData,
+  TransferTokenDetails,
 } from './utils/AarcTypes';
 import { PERMIT2_BATCH_TRANSFER_ABI } from './utils/abis/Permit2BatchTransfer.abi';
 import { PERMIT2_SINGLE_TRANSFER_ABI } from './utils/abis/Permit2SingleTransfer.abi';
@@ -32,7 +33,7 @@ import {
   getGelatoTransactionStatus,
   relayTransaction,
 } from './helpers/GelatoHelper';
-import { logError } from './helpers';
+import { logError, removeDuplicateTokens } from './helpers';
 import { calculateTotalGasNeeded } from './helpers/EstimatorHelper';
 import { ChainId } from './utils/ChainTypes';
 
@@ -171,10 +172,15 @@ class AarcSDK {
             message: 'Supplied token does not exist',
           });
         }
+        tandA.tokenAddress = tandA.tokenAddress.toLowerCase();
       });
 
       if (transferTokenDetails) {
         const updatedTokens: TokenData[] = [];
+
+        const removeDuplicatesResult = removeDuplicateTokens(transferTokenDetails, response);
+        transferTokenDetails = removeDuplicatesResult.transferTokenDetails;
+
         for (const tokenInfo of balancesList.data) {
           const matchingToken = transferTokenDetails?.find(
             (token) =>
@@ -185,6 +191,7 @@ class AarcSDK {
           if (
             matchingToken &&
             matchingToken.amount !== undefined &&
+            matchingToken.tokenIds == undefined &&
             BigNumber.from(matchingToken.amount).gt(0) &&
             BigNumber.from(matchingToken.amount).gt(tokenInfo.balance)
           ) {
@@ -602,10 +609,10 @@ class AarcSDK {
     try {
       const {
         senderSigner,
-        transferTokenDetails,
         receiverAddress,
         gelatoApiKey,
       } = executeMigrationGaslessDto;
+      let { transferTokenDetails } = executeMigrationGaslessDto;
       const owner = await senderSigner.getAddress();
       const tokenAddresses = transferTokenDetails?.map(
         (token) => token.tokenAddress,
@@ -642,10 +649,15 @@ class AarcSDK {
             message: 'Supplied token does not exist',
           });
         }
+        tandA.tokenAddress = tandA.tokenAddress.toLowerCase();
       });
 
       if (transferTokenDetails) {
         const updatedTokens: TokenData[] = [];
+
+        const removeDuplicatesResult = removeDuplicateTokens(transferTokenDetails, response);
+        transferTokenDetails = removeDuplicatesResult.transferTokenDetails;
+
         for (const tokenInfo of balancesList.data) {
           const matchingToken = transferTokenDetails?.find(
             (token) =>
@@ -656,6 +668,7 @@ class AarcSDK {
           if (
             matchingToken &&
             matchingToken.amount !== undefined &&
+            matchingToken.tokenIds == undefined &&
             BigNumber.from(matchingToken.amount).gt(0) &&
             BigNumber.from(matchingToken.amount).gt(tokenInfo.balance)
           ) {

src/helpers/helper.ts

@@ -1,3 +1,4 @@
+import { MigrationResponse, TransferTokenDetails } from '../utils/AarcTypes';
 import { Logger } from '../utils/Logger';
 
 export const delay = (ms: number) => {
@@ -15,3 +16,29 @@ export const logError = (tokenInfo: any, error: any) => {
     },
   });
 };
+
+export const removeDuplicateTokens = (transferTokenDetails: TransferTokenDetails[], response: MigrationResponse[]): {transferTokenDetails: TransferTokenDetails[], response: MigrationResponse[]} => {
+  const transferTokenUniqueValues: TransferTokenDetails[] = transferTokenDetails.reduce((result: TransferTokenDetails[], current) => {
+    const matchingToken = result.find(item => item.tokenAddress === current.tokenAddress);
+    if (!matchingToken) {
+      result.push(current);
+    } else if (matchingToken && matchingToken.amount !== undefined && current.amount !== undefined){
+      response.push({
+        tokenAddress: current.tokenAddress,
+        amount: current?.amount,
+        message: 'Duplicate token address',
+      });
+    } else if (matchingToken && matchingToken.tokenIds !== undefined && current.tokenIds !== undefined){
+      for (const tokenId of current.tokenIds) {
+        response.push({
+          tokenAddress: current.tokenAddress,
+          tokenId: tokenId,
+          message: 'Duplicate token address',
+        });
+      }
+    }
+    return result;
+  }, []);
+
+  return {transferTokenDetails: transferTokenUniqueValues, response: response};
+};