feat: update utility functions to accomodate permissionless and permi…

…ssioned handlers (#132)

* update function to format messages for permisionless generic handler

* converting createGenericDepositDataV1 into createPermissionedGenericDepositData

* adding public method for permissioned generic deposit data

packages/sdk/src/Sygma.ts

@@ -39,7 +39,11 @@ import {
 import { EvmBridge } from './chains';
 import { calculateBasicfee, calculateFeeData } from './fee';
 import Connector from './connectors/Connectors';
-import { createGenericDepositDataV1, toHex } from './utils/helpers';
+import {
+  createPermissionedGenericDepositData,
+  createPermissionlessGenericDepositData,
+  toHex,
+} from './utils/helpers';
 
 /**
  * @description Sygma is the main class that allows you to have bridging capabilities
@@ -729,15 +733,15 @@ export class Sygma implements SygmaSDK {
     return await listTokensOfOwner({ token, account, signer });
   }
 
-  public createGenericDepositDataV1(
+  public formatPermissionlessGenericDepositData(
     executeFunctionSignature: string,
     executeContractAddress: string,
     maxFee: string,
     depositor: string,
     executionData: string,
-    depositorCheck = true,
+    depositorCheck: boolean = true,
   ): string {
-    const depositData = createGenericDepositDataV1(
+    const depositData = createPermissionlessGenericDepositData(
       executeFunctionSignature,
       executeContractAddress,
       maxFee,
@@ -749,6 +753,12 @@ export class Sygma implements SygmaSDK {
     return depositData;
   }
 
+  public formatPermissionedGenericDepositData(hexMetaData: string): string {
+    const depositData = createPermissionedGenericDepositData(hexMetaData);
+
+    return depositData;
+  }
+
   public toHex(toConvert: string, padding: number): string {
     return toHex(toConvert, padding);
   }

packages/sdk/src/utils/helpers.ts

@@ -25,29 +25,36 @@ export const createERCDepositData = (
   ); // recipientAddress               (?? bytes)
 };
 
-export const createGenericDepositDataV1 = (
+export const createPermissionedGenericDepositData = (hexMetaData: string): string => {
+  if (hexMetaData === null) {
+    return '0x' + toHex(0, 32).substr(2); // len(metaData) (32 bytes)
+  }
+  const hexMetaDataLength = hexMetaData.substr(2).length / 2;
+  return '0x' + toHex(hexMetaDataLength, 32).substr(2) + hexMetaData.substr(2);
+};
+
+export const createPermissionlessGenericDepositData = (
   executeFunctionSignature: string,
   executeContractAddress: string,
   maxFee: string,
   depositor: string,
   executionData: string,
-  depositorCheck = true,
+  depositorCheck: boolean = true,
 ): string => {
-  let metaData = toHex(depositor, 32).substr(2) + executionData.substr(2);
-
   if (depositorCheck) {
     // if "depositorCheck" is true -> append depositor address for destination chain check
-    metaData = metaData.concat(toHex(depositor, 32).substr(2));
+    executionData = executionData.concat(toHex(depositor, 32).substr(2));
   }
-
-  const metaDataLength = metaData.length / 2;
-
   return (
     '0x' +
-    toHex(metaDataLength, 32).substr(2) + // len(metaData) (32 bytes)
-    toHex(executeFunctionSignature, 32).substr(2) + // bytes4        (padded to 32 bytes)
-    toHex(executeContractAddress, 32).substr(2) + // address       (padded to 32 bytes)
     toHex(maxFee, 32).substr(2) + // uint256
-    metaData
-  ); // bytes
+    toHex(executeFunctionSignature.substr(2).length / 2, 2).substr(2) + // uint16
+    executeFunctionSignature.substr(2) + // bytes
+    toHex(executeContractAddress.substr(2).length / 2, 1).substr(2) + // uint8
+    executeContractAddress.substr(2) + // bytes
+    toHex(32, 1).substr(2) + // uint8
+    toHex(depositor, 32).substr(2) + // bytes32
+    executionData.substr(2)
+  ) // bytes
+    .toLowerCase();
 };

packages/sdk/tsconfig.json

@@ -26,6 +26,6 @@
 	},
 	"include": [
 		"src",
-		"integration"
+		// "integration"
 	],
 }