Merge pull request #31 from ArslanKibria98/develop

Salt modification for chain process
ferrumnet · Jan 9, 2024 · 0efc42f · 0efc42f
2 parents 1f35b38 + a9cc16a
commit 0efc42f
Showing 1 changed file with 30 additions and 3 deletions.
diff --git a/src/services/signature.service.ts b/src/services/signature.service.ts
@@ -340,16 +340,43 @@ export const isRecoverAddressValid = (
 export const getDataForSalt = (
   isForValidation: boolean,
   txData: any,
-  generatorHash: string
+  generatorHash: string,
+  decodedData: any
 ): string => {
   try {
     if (isForValidation) {
-      return txData.transactionHash.toLocaleLowerCase();
+      return (
+        txData.transactionHash.toLocaleLowerCase() +
+        getDecodedLogsDataIntoString(decodedData)
+      );
     } else {
-      return txData.transactionHash.toLocaleLowerCase() + generatorHash;
+      return (
+        txData.transactionHash.toLocaleLowerCase() +
+        getDecodedLogsDataIntoString(decodedData) +
+        generatorHash
+      );
     }
   } catch (e) {
     console.log(e);
   }
   return "";
 };
+
+const getDecodedLogsDataIntoString = (decodedData: any): string => {
+  try {
+    return (
+      decodedData?.sourceToken +
+      decodedData?.targetToken +
+      decodedData?.sourceChainId +
+      decodedData?.targetChainId +
+      decodedData?.sourceAmount +
+      decodedData?.sourceAddress +
+      decodedData?.targetAddress +
+      decodedData?.settledAmount +
+      decodedData?.withdrawalData
+    );
+  } catch (e) {
+    console.log(e);
+  }
+  return "";
+};