@omegax/protocol-sdk 0.4.4 → 0.6.0

package/dist/transactions.js

@@ -1,5 +1,5 @@
 import bs58 from 'bs58';
-import { Transaction, VersionedTransaction, } from '@solana/web3.js';
+import { Transaction, VersionedTransaction } from '@solana/web3.js';
 function decodeShortVecLength(bytes, offset = 0) {
     let length = 0;
     let size = 0;
@@ -27,7 +27,9 @@ function signatureIsPresent(signature) {
     return signature.some((value) => value !== 0);
 }
 export function decodeSolanaTransaction(input) {
-    const bytes = typeof input === 'string' ? Buffer.from(input, 'base64') : Buffer.from(input);
+    const bytes = typeof input === 'string'
+        ? Buffer.from(input, 'base64')
+        : Buffer.from(input);
     const { length: signatureCount, bytesRead } = decodeShortVecLength(bytes);
     const messageOffset = bytesRead + signatureCount * 64;
     if (messageOffset >= bytes.length) {
@@ -57,8 +59,27 @@ export function solanaTransactionMessageBytes(transaction) {
     }
     return transaction.message.serialize();
 }
+function normalizeSolanaMessageBytesIgnoringRecentBlockhash(messageBytes) {
+    const normalized = Uint8Array.from(messageBytes);
+    const messagePrefix = normalized[0] ?? 0;
+    const isVersioned = (messagePrefix & 0x80) !== 0;
+    let cursor = isVersioned ? 1 : 0;
+    cursor += 3;
+    const { length: accountKeyCount, bytesRead } = decodeShortVecLength(normalized, cursor);
+    cursor += bytesRead + accountKeyCount * 32;
+    if (cursor + 32 > normalized.length) {
+        throw new Error('invalid serialized transaction message');
+    }
+    normalized.fill(0, cursor, cursor + 32);
+    return normalized;
+}
+export function solanaTransactionIntentMessageBytes(transaction) {
+    return normalizeSolanaMessageBytesIgnoringRecentBlockhash(solanaTransactionMessageBytes(transaction));
+}
 export function solanaTransactionMessageBase64(input) {
-    const transaction = typeof input === 'string' || input instanceof Uint8Array || Buffer.isBuffer(input)
+    const transaction = typeof input === 'string' ||
+        input instanceof Uint8Array ||
+        Buffer.isBuffer(input)
         ? decodeSolanaTransaction(input)
         : input;
     return Buffer.from(solanaTransactionMessageBytes(transaction)).toString('base64');
@@ -87,14 +108,15 @@ export function solanaTransactionFirstSignature(transaction) {
 export function solanaTransactionSignerSignature(transaction, signer) {
     if (transaction instanceof Transaction) {
         const entry = transaction.signatures.find((candidate) => candidate.publicKey.toBase58() === signer);
-        return signatureIsPresent(entry?.signature) ? entry?.signature : null;
+        return signatureIsPresent(entry?.signature)
+            ? entry?.signature
+            : null;
     }
     const accountKeys = versionedStaticAccountKeys(transaction);
     const signerIndex = accountKeys.findIndex((candidate) => candidate.toBase58() === signer);
     if (signerIndex < 0)
         return null;
-    const header = transaction.message
-        .header;
+    const header = transaction.message.header;
     const requiredSignerCount = header?.numRequiredSignatures ?? 0;
     if (signerIndex >= requiredSignerCount) {
         return null;