@omegax/protocol-sdk 0.4.2 → 0.4.4

package/dist/claims.js

@@ -1,7 +1,7 @@
-import bs58 from 'bs58';
 import nacl from 'tweetnacl';
 import { PublicKey, SystemProgram, Transaction, TransactionInstruction, } from '@solana/web3.js';
 import { anchorDiscriminator, encodeU64Le, fromHex, hashStringTo32, } from './utils.js';
+import { decodeSolanaTransaction, solanaTransactionFirstSignature, solanaTransactionMessageBytes, solanaTransactionRequiredSigner, solanaTransactionSignerSignature, } from './transactions.js';
 import { deriveClaimDelegatePda, deriveClaimPda, deriveClaimV2Pda, deriveConfigV2Pda, deriveOutcomeAggregatePda, derivePoolOraclePolicyPda, derivePoolTermsPda, deriveCycleWindowPda, deriveCycleOutcomePda, deriveMembershipPda, } from './protocol_seeds.js';
 const SUBMIT_CLAIM_DISCRIMINATOR = anchorDiscriminator('global', 'submit_claim');
 const SUBMIT_REWARD_CLAIM_DISCRIMINATOR = anchorDiscriminator('global', 'submit_reward_claim');
@@ -207,18 +207,10 @@ export function buildUnsignedRewardClaimTx(params) {
         requiredSigner: claimant.toBase58(),
     };
 }
-function firstSignatureBase58(tx) {
-    if (tx.signatures.length === 0)
-        return null;
-    const first = tx.signatures[0];
-    if (!first?.signature)
-        return null;
-    return bs58.encode(first.signature);
-}
 export function validateSignedClaimTx(params) {
     let tx;
     try {
-        tx = Transaction.from(Buffer.from(params.signedTxBase64, 'base64'));
+        tx = decodeSolanaTransaction(params.signedTxBase64);
     }
     catch {
         return {
@@ -230,30 +222,30 @@ export function validateSignedClaimTx(params) {
     }
     if (typeof params.expectedUnsignedTxBase64 === 'string' && params.expectedUnsignedTxBase64.length > 0) {
         try {
-            const expectedUnsignedTx = Transaction.from(Buffer.from(params.expectedUnsignedTxBase64, 'base64'));
-            const signedMessageBytes = tx.serializeMessage();
-            const expectedMessageBytes = expectedUnsignedTx.serializeMessage();
+            const expectedUnsignedTx = decodeSolanaTransaction(params.expectedUnsignedTxBase64);
+            const signedMessageBytes = solanaTransactionMessageBytes(tx);
+            const expectedMessageBytes = solanaTransactionMessageBytes(expectedUnsignedTx);
             if (signedMessageBytes.length !== expectedMessageBytes.length
                 || !signedMessageBytes.every((value, index) => value === expectedMessageBytes[index])) {
                 return {
                     valid: false,
-                    txSignature: firstSignatureBase58(tx),
+                    txSignature: solanaTransactionFirstSignature(tx),
                     reason: 'intent_message_mismatch',
-                    signer: tx.feePayer?.toBase58() ?? null,
+                    signer: solanaTransactionRequiredSigner(tx),
                 };
             }
         }
         catch {
             return {
                 valid: false,
-                txSignature: firstSignatureBase58(tx),
+                txSignature: solanaTransactionFirstSignature(tx),
                 reason: 'intent_message_mismatch',
-                signer: tx.feePayer?.toBase58() ?? null,
+                signer: solanaTransactionRequiredSigner(tx),
             };
         }
     }
     const expectedSigner = params.requiredSigner.trim();
-    const signer = tx.feePayer?.toBase58() ?? null;
+    const signer = solanaTransactionRequiredSigner(tx);
     if (!signer) {
         return {
             valid: false,
@@ -265,32 +257,32 @@ export function validateSignedClaimTx(params) {
     if (signer !== expectedSigner) {
         return {
             valid: false,
-            txSignature: firstSignatureBase58(tx),
+            txSignature: solanaTransactionFirstSignature(tx),
             reason: 'required_signer_mismatch',
             signer,
         };
     }
-    const expectedPubkey = tx.signatures.find((s) => s.publicKey.toBase58() === expectedSigner);
-    if (!expectedPubkey || !expectedPubkey.signature) {
+    const requiredSignature = solanaTransactionSignerSignature(tx, expectedSigner);
+    if (!requiredSignature) {
         return {
             valid: false,
-            txSignature: firstSignatureBase58(tx),
+            txSignature: solanaTransactionFirstSignature(tx),
             reason: 'missing_required_signature',
             signer,
         };
     }
-    const ok = nacl.sign.detached.verify(tx.serializeMessage(), expectedPubkey.signature, new PublicKey(expectedSigner).toBytes());
+    const ok = nacl.sign.detached.verify(solanaTransactionMessageBytes(tx), requiredSignature, new PublicKey(expectedSigner).toBytes());
     if (!ok) {
         return {
             valid: false,
-            txSignature: firstSignatureBase58(tx),
+            txSignature: solanaTransactionFirstSignature(tx),
             reason: 'invalid_required_signature',
             signer,
         };
     }
     return {
         valid: true,
-        txSignature: firstSignatureBase58(tx),
+        txSignature: solanaTransactionFirstSignature(tx),
         reason: null,
         signer,
     };

package/dist/index.d.ts

@@ -3,5 +3,6 @@ export * from './utils.js';
 export * from './oracle.js';
 export * from './claims.js';
 export * from './rpc.js';
+export * from './transactions.js';
 export * from './protocol_seeds.js';
 export * from './protocol.js';

package/dist/index.js

@@ -3,5 +3,6 @@ export * from './utils.js';
 export * from './oracle.js';
 export * from './claims.js';
 export * from './rpc.js';
+export * from './transactions.js';
 export * from './protocol_seeds.js';
 export * from './protocol.js';

package/dist/protocol.d.ts

@@ -1,6 +1,10 @@
-import { Connection } from '@solana/web3.js';
-import type { ProtocolClient } from './types.js';
+import { AddressLookupTableAccount, Connection, Transaction, VersionedTransaction } from '@solana/web3.js';
+import type { ProtocolClient, ProtocolCycleQuoteFields } from './types.js';
 export declare const PROTOCOL_PROGRAM_ID = "Bn6eixac1QEEVErGBvBjxAd6pgB9e2q4XHvAkinQ5y1B";
+export declare function buildCycleQuoteMessage(fields: ProtocolCycleQuoteFields): Buffer;
+export declare function buildCycleQuoteHash(input: ProtocolCycleQuoteFields | Uint8Array): Buffer;
+export declare function buildCycleQuoteSignatureMessage(input: ProtocolCycleQuoteFields | Uint8Array): Buffer;
+export declare function compileTransactionToV0(transaction: Transaction, lookupTableAccounts: AddressLookupTableAccount[]): VersionedTransaction;
 export declare function createProtocolClient(connection: Connection, programIdInput: string): ProtocolClient;
 export declare function derivePoolAddress(params: {
     programId: string;