@debridge-finance/solana-utils 4.5.3 → 4.5.5

package/dist/browser/index.js

@@ -6943,16 +6943,42 @@ function hashExternalCallBytes(data) {
     }
     return hexToBuffer(solidityKeccak256(["bytes"], [data ? data : buffer.Buffer.from([])]), 32);
 }
+function isSendHashedFlagSet(packedFlags) {
+    const SEND_HASHED_DATA_FLAG_BIT_NUMBER = BigInt(3);
+    const result = (packedFlags >> SEND_HASHED_DATA_FLAG_BIT_NUMBER) & BigInt(1);
+    return result === BigInt(1);
+}
+function getShortcutFromAutoParams(params) {
+    var _a, _b, _c;
+    const shortcut = (_a = params.autoParams) === null || _a === void 0 ? void 0 : _a.shortcut;
+    if (shortcut) {
+        return isBuffer(shortcut) ? shortcut : hexToBuffer(shortcut);
+    }
+    else {
+        const flags = BigInt(new BN(((_b = params.autoParams) === null || _b === void 0 ? void 0 : _b.flags) || 0).toNumber());
+        const data = (_c = params.autoParams) === null || _c === void 0 ? void 0 : _c.data;
+        if (!data)
+            return hashExternalCallBytes(data);
+        if (isSendHashedFlagSet(flags)) {
+            const result = isBuffer(data) ? data : hexToBuffer(data);
+            if (result.length !== 32) {
+                throw new Error(`Incorrect autoParams.data length for SEND_HASHED_DATA_FLAG`);
+            }
+            return result;
+        }
+        return hashExternalCallBytes(data);
+    }
+}
 /**
  * Hashes submission for provided data
  * @param params data to hash
  * @returns submissionId from provided params
  */
 function hashSubmissionIdRaw(params) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     let packParams = [
         "uint256", // submission prefix
-        "uint256", // bridge_id
+        "bytes32", // bridge_id
         "uint256", // source_chain_id
         "uint256", // target_chain_id
         "uint256", // amount
@@ -6964,7 +6990,7 @@ function hashSubmissionIdRaw(params) {
         : typeof params.receiver === "string"
             ? params.receiver.startsWith("0x")
                 ? hexToBuffer(params.receiver)
-                : new PublicKey(params.receiver)
+                : new PublicKey(params.receiver).toBuffer()
             : new PublicKey(params.receiver).toBuffer();
     let packData = [
         SUBMISSION_PREFIX,
@@ -6979,21 +7005,17 @@ function hashSubmissionIdRaw(params) {
         packParams = packParams.concat([
             "uint256", // execution fee
             "uint256", // flag
-            "uint256", // fallback hash
+            "bytes32", // fallback hash
             "uint256", // ext call data hash
             "uint256", // native sender hash
         ]);
-        const shortcut = ((_a = params.autoParams) === null || _a === void 0 ? void 0 : _a.shortcut)
-            ? isBuffer(params.autoParams.shortcut)
-                ? params.autoParams.shortcut
-                : hexToBuffer(params.autoParams.shortcut)
-            : hashExternalCallBytes((_b = params === null || params === void 0 ? void 0 : params.autoParams) === null || _b === void 0 ? void 0 : _b.data);
+        const shortcut = getShortcutFromAutoParams(params);
         const fallback = params.autoParams.fallbackAddress.startsWith("0x")
             ? hexToBuffer(params.autoParams.fallbackAddress)
             : new PublicKey(params.autoParams.fallbackAddress).toBuffer();
         packData = packData.concat([
-            new BN(((_c = params === null || params === void 0 ? void 0 : params.autoParams) === null || _c === void 0 ? void 0 : _c.executionFee) || 0).toArray("be", 32),
-            new BN(((_d = params.autoParams) === null || _d === void 0 ? void 0 : _d.flags) || 0).toArray("be", 32),
+            new BN(((_a = params === null || params === void 0 ? void 0 : params.autoParams) === null || _a === void 0 ? void 0 : _a.executionFee) || 0).toArray("be", 32),
+            new BN(((_b = params.autoParams) === null || _b === void 0 ? void 0 : _b.flags) || 0).toArray("be", 32),
             hashExternalCallBytes(fallback),
             shortcut,
             hashExternalCallBytes(params.autoParams.nativeSender),