@zauthx402/sdk 0.1.7 → 0.1.9

package/dist/middleware/index.js

@@ -4554,25 +4554,54 @@ function decodePaymentHeader(paymentHeader) {
     return null;
   }
 }
+var SPL_TOKEN_PROGRAM = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
+var SPL_TOKEN_2022_PROGRAM = "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb";
 function extractSolanaFeePayer(base64Transaction) {
   try {
     const txBytes = typeof Buffer !== "undefined" ? Buffer.from(base64Transaction, "base64") : Uint8Array.from(atob(base64Transaction), (c) => c.charCodeAt(0));
     let offset = 0;
     const numSignatures = txBytes[offset];
-    offset += 1;
-    offset += numSignatures * 64;
-    const firstByte = txBytes[offset];
-    if ((firstByte & 128) !== 0) {
+    offset += 1 + numSignatures * 64;
+    if ((txBytes[offset] & 128) !== 0) {
       offset += 1;
     }
     offset += 3;
     const numAccounts = txBytes[offset];
     offset += 1;
-    if (numAccounts > 0 && offset + 32 <= txBytes.length) {
-      const feePayerBytes = txBytes.slice(offset, offset + 32);
-      return base58Encode(feePayerBytes);
+    const accountKeys = [];
+    for (let i = 0; i < numAccounts; i++) {
+      accountKeys.push(txBytes.slice(offset, offset + 32));
+      offset += 32;
+    }
+    if (accountKeys.length === 0) return null;
+    offset += 32;
+    const numInstructions = txBytes[offset];
+    offset += 1;
+    for (let i = 0; i < numInstructions; i++) {
+      const programIdIndex = txBytes[offset];
+      offset += 1;
+      const numIxAccounts = txBytes[offset];
+      offset += 1;
+      const ixAccountIndices = [];
+      for (let j = 0; j < numIxAccounts; j++) {
+        ixAccountIndices.push(txBytes[offset]);
+        offset += 1;
+      }
+      const dataLen = txBytes[offset];
+      offset += 1 + dataLen;
+      const programAddr = base58Encode(accountKeys[programIdIndex]);
+      if (programAddr === SPL_TOKEN_PROGRAM || programAddr === SPL_TOKEN_2022_PROGRAM) {
+        if (ixAccountIndices.length >= 4) {
+          const authorityIndex = ixAccountIndices[3];
+          return base58Encode(accountKeys[authorityIndex]);
+        }
+        if (ixAccountIndices.length >= 3) {
+          const authorityIndex = ixAccountIndices[2];
+          return base58Encode(accountKeys[authorityIndex]);
+        }
+      }
     }
-    return null;
+    return base58Encode(accountKeys[0]);
   } catch {
     return null;
   }