@sudobility/contracts 0.14.0 → 1.9.0

package/dist/solana/solana/mailer-client.js

@@ -35,23 +35,6 @@ function encodeSend(to, subject, body, revenueShareToReceiver, resolveSenderToNa
     data.writeUInt8(resolveSenderToName ? 1 : 0, offset);
     return data;
 }
-function encodeSendPrepared(to, mailId, revenueShareToReceiver, resolveSenderToName = false) {
-    const mailIdBytes = Buffer.from(mailId, 'utf8');
-    const data = Buffer.alloc(1 + 32 + 4 + mailIdBytes.length + 1 + 1);
-    let offset = 0;
-    data.writeUInt8(InstructionType.SendPrepared, offset);
-    offset += 1;
-    to.toBuffer().copy(data, offset);
-    offset += 32;
-    data.writeUInt32LE(mailIdBytes.length, offset);
-    offset += 4;
-    mailIdBytes.copy(data, offset);
-    offset += mailIdBytes.length;
-    data.writeUInt8(revenueShareToReceiver ? 1 : 0, offset);
-    offset += 1;
-    data.writeUInt8(resolveSenderToName ? 1 : 0, offset);
-    return data;
-}
 function encodeSendToEmail(toEmail, subject, body) {
     const emailBytes = Buffer.from(toEmail, 'utf8');
     const subjectBytes = Buffer.from(subject, 'utf8');
@@ -89,23 +72,6 @@ function encodeSendPreparedToEmail(toEmail, mailId) {
     mailIdBytes.copy(data, offset);
     return data;
 }
-function encodeSendThroughWebhook(to, webhookId, revenueShareToReceiver, resolveSenderToName = false) {
-    const webhookBytes = Buffer.from(webhookId, 'utf8');
-    const data = Buffer.alloc(1 + 32 + 4 + webhookBytes.length + 1 + 1);
-    let offset = 0;
-    data.writeUInt8(InstructionType.SendThroughWebhook, offset);
-    offset += 1;
-    to.toBuffer().copy(data, offset);
-    offset += 32;
-    data.writeUInt32LE(webhookBytes.length, offset);
-    offset += 4;
-    webhookBytes.copy(data, offset);
-    offset += webhookBytes.length;
-    data.writeUInt8(revenueShareToReceiver ? 1 : 0, offset);
-    offset += 1;
-    data.writeUInt8(resolveSenderToName ? 1 : 0, offset);
-    return data;
-}
 function encodeSimpleInstruction(instructionType) {
     const data = Buffer.alloc(1);
     data.writeUInt8(instructionType, 0);
@@ -123,19 +89,6 @@ function encodeSetDelegationFee(newFee) {
     data.writeBigUInt64LE(newFee, 1);
     return data;
 }
-function encodeSetCustomFeePercentage(account, percentage) {
-    const data = Buffer.alloc(1 + 32 + 1);
-    data.writeUInt8(InstructionType.SetCustomFeePercentage, 0);
-    account.toBuffer().copy(data, 1);
-    data.writeUInt8(percentage, 33);
-    return data;
-}
-function encodeClearCustomFeePercentage(account) {
-    const data = Buffer.alloc(1 + 32);
-    data.writeUInt8(InstructionType.ClearCustomFeePercentage, 0);
-    account.toBuffer().copy(data, 1);
-    return data;
-}
 function encodeDelegateTo(delegate) {
     if (!delegate) {
         // Clear delegation - just send the instruction type and a null option
@@ -153,12 +106,6 @@ function encodeDelegateTo(delegate) {
         return data;
     }
 }
-function encodeClaimExpiredShares(recipient) {
-    const data = Buffer.alloc(1 + 32);
-    data.writeUInt8(InstructionType.ClaimExpiredShares, 0);
-    recipient.toBuffer().copy(data, 1);
-    return data;
-}
 // Account data parsing functions
 function parseMailerState(data) {
     let offset = 0;
@@ -219,40 +166,25 @@ function parseDelegation(data) {
         bump,
     };
 }
-function parseFeeDiscount(data) {
-    let offset = 0;
-    const account = new web3_js_1.PublicKey(data.slice(offset, offset + 32));
-    offset += 32;
-    const discount = data.readUInt8(offset);
-    offset += 1;
-    const bump = data.readUInt8(offset);
-    return {
-        account,
-        discount,
-        bump,
-    };
-}
+/**
+ * Instruction types for the native Solana program
+ */
 var InstructionType;
 (function (InstructionType) {
     InstructionType[InstructionType["Initialize"] = 0] = "Initialize";
     InstructionType[InstructionType["Send"] = 1] = "Send";
-    InstructionType[InstructionType["SendPrepared"] = 2] = "SendPrepared";
-    InstructionType[InstructionType["SendToEmail"] = 3] = "SendToEmail";
-    InstructionType[InstructionType["SendPreparedToEmail"] = 4] = "SendPreparedToEmail";
-    InstructionType[InstructionType["SendThroughWebhook"] = 5] = "SendThroughWebhook";
-    InstructionType[InstructionType["ClaimRecipientShare"] = 6] = "ClaimRecipientShare";
-    InstructionType[InstructionType["ClaimOwnerShare"] = 7] = "ClaimOwnerShare";
-    InstructionType[InstructionType["SetFee"] = 8] = "SetFee";
-    InstructionType[InstructionType["DelegateTo"] = 9] = "DelegateTo";
-    InstructionType[InstructionType["RejectDelegation"] = 10] = "RejectDelegation";
-    InstructionType[InstructionType["SetDelegationFee"] = 11] = "SetDelegationFee";
-    InstructionType[InstructionType["SetCustomFeePercentage"] = 12] = "SetCustomFeePercentage";
-    InstructionType[InstructionType["ClearCustomFeePercentage"] = 13] = "ClearCustomFeePercentage";
-    InstructionType[InstructionType["Pause"] = 14] = "Pause";
-    InstructionType[InstructionType["Unpause"] = 15] = "Unpause";
-    InstructionType[InstructionType["DistributeClaimableFunds"] = 16] = "DistributeClaimableFunds";
-    InstructionType[InstructionType["ClaimExpiredShares"] = 17] = "ClaimExpiredShares";
-    InstructionType[InstructionType["EmergencyUnpause"] = 18] = "EmergencyUnpause";
+    InstructionType[InstructionType["SendToEmail"] = 2] = "SendToEmail";
+    InstructionType[InstructionType["SendPreparedToEmail"] = 3] = "SendPreparedToEmail";
+    InstructionType[InstructionType["ClaimRecipientShare"] = 4] = "ClaimRecipientShare";
+    InstructionType[InstructionType["ClaimOwnerShare"] = 5] = "ClaimOwnerShare";
+    InstructionType[InstructionType["SetFee"] = 6] = "SetFee";
+    InstructionType[InstructionType["DelegateTo"] = 7] = "DelegateTo";
+    InstructionType[InstructionType["RejectDelegation"] = 8] = "RejectDelegation";
+    InstructionType[InstructionType["SetDelegationFee"] = 9] = "SetDelegationFee";
+    InstructionType[InstructionType["Pause"] = 10] = "Pause";
+    InstructionType[InstructionType["Unpause"] = 11] = "Unpause";
+    InstructionType[InstructionType["DistributeClaimableFunds"] = 12] = "DistributeClaimableFunds";
+    InstructionType[InstructionType["EmergencyUnpause"] = 13] = "EmergencyUnpause";
 })(InstructionType || (InstructionType = {}));
 /**
  * @class MailerClient
@@ -290,7 +222,6 @@ var InstructionType;
  */
 class MailerClient {
     constructor(connection, wallet, programId, usdcMint) {
-        this.defaultComputeUnitMultiplier = 1.2; // 20% buffer by default
         this.connection = connection;
         this.wallet = wallet;
         this.programId = programId;
@@ -300,69 +231,10 @@ class MailerClient {
         this.mailerStatePda = mailerPda;
         this.mailerBump = bump;
     }
-    /**
-     * Optimize compute units for a transaction
-     * @param transaction Transaction to optimize
-     * @param options Compute unit options
-     * @returns Optimized transaction with compute budget instructions
-     */
-    async optimizeComputeUnits(transaction, options) {
-        // Skip if explicitly disabled
-        if (options?.skipComputeUnits) {
-            return { transaction };
-        }
-        let simulatedUnits;
-        let computeUnitLimit = options?.computeUnitLimit;
-        // Auto-optimize by simulating transaction
-        if (options?.autoOptimize && !computeUnitLimit) {
-            try {
-                // Set a high limit for simulation
-                const simTransaction = new web3_js_1.Transaction().add(...transaction.instructions);
-                simTransaction.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
-                    units: 1400000, // Max for simulation
-                }));
-                simTransaction.recentBlockhash = (await this.connection.getLatestBlockhash()).blockhash;
-                simTransaction.feePayer = this.wallet.publicKey;
-                const simulation = await this.connection.simulateTransaction(simTransaction);
-                if (simulation.value.err === null && simulation.value.unitsConsumed) {
-                    simulatedUnits = simulation.value.unitsConsumed;
-                    const multiplier = options.computeUnitMultiplier ?? this.defaultComputeUnitMultiplier;
-                    computeUnitLimit = Math.min(Math.ceil(simulatedUnits * multiplier), 1400000 // Max compute units
-                    );
-                }
-            }
-            catch (error) {
-                console.warn('Failed to simulate transaction for compute unit optimization:', error);
-                // Fall back to default or specified limit
-                computeUnitLimit = computeUnitLimit ?? 200000;
-            }
-        }
-        // Create new transaction with compute budget instructions prepended
-        const optimizedTx = new web3_js_1.Transaction();
-        // Add compute unit limit if specified or auto-optimized
-        if (computeUnitLimit) {
-            optimizedTx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
-                units: computeUnitLimit,
-            }));
-        }
-        // Add priority fee if specified
-        if (options?.computeUnitPrice) {
-            optimizedTx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                microLamports: options.computeUnitPrice,
-            }));
-        }
-        // Add original instructions
-        optimizedTx.add(...transaction.instructions);
-        return {
-            transaction: optimizedTx,
-            simulatedUnits,
-        };
-    }
     /**
      * Initialize the mailer program (owner only)
-     * @param computeOptions Compute unit optimization options
      */
-    async initialize(computeOptions) {
+    async initialize() {
         const instruction = new web3_js_1.TransactionInstruction({
             keys: [
                 { pubkey: this.wallet.publicKey, isSigner: true, isWritable: false },
@@ -373,7 +245,7 @@ class MailerClient {
             data: encodeInitialize(this.usdcMint),
         });
         const transaction = new web3_js_1.Transaction().add(instruction);
-        return await this.sendTransaction(transaction, undefined, computeOptions);
+        return await this.sendTransaction(transaction);
     }
     /**
      * Send a message with optional revenue sharing
@@ -382,10 +254,9 @@ class MailerClient {
      * @param body Message body
      * @param revenueShareToReceiver If true, recipient gets 90% revenue share; if false, no revenue share
      * @param resolveSenderToName If true, resolve sender address to name via off-chain service
-     * @param computeOptions Compute unit optimization options
-     * @returns Transaction result with signature and compute details
+     * @returns Transaction signature
      */
-    async send(to, subject, body, revenueShareToReceiver = false, resolveSenderToName = false, computeOptions) {
+    async send(to, subject, body, revenueShareToReceiver = false, resolveSenderToName = false) {
         const recipientKey = typeof to === 'string' ? new web3_js_1.PublicKey(to) : to;
         // Derive recipient claim PDA
         const [recipientClaimPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('claim'), recipientKey.toBuffer()], this.programId);
@@ -415,13 +286,13 @@ class MailerClient {
         });
         instructions.push(sendInstruction);
         const transaction = new web3_js_1.Transaction().add(...instructions);
-        return await this.sendTransaction(transaction, undefined, computeOptions);
+        return await this.sendTransaction(transaction);
     }
     /**
      * Claim recipient share of revenue
-     * @returns Transaction result
+     * @returns Transaction signature
      */
-    async claimRecipientShare(computeOptions) {
+    async claimRecipientShare() {
         const [recipientClaimPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('claim'), this.wallet.publicKey.toBuffer()], this.programId);
         const recipientTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(this.usdcMint, this.wallet.publicKey);
         const mailerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(this.usdcMint, this.mailerStatePda, true);
@@ -438,13 +309,13 @@ class MailerClient {
             data: encodeSimpleInstruction(InstructionType.ClaimRecipientShare),
         });
         const transaction = new web3_js_1.Transaction().add(instruction);
-        return await this.sendTransaction(transaction, undefined, computeOptions);
+        return await this.sendTransaction(transaction);
     }
     /**
      * Claim owner share of fees (owner only)
-     * @returns Transaction result
+     * @returns Transaction signature
      */
-    async claimOwnerShare(computeOptions) {
+    async claimOwnerShare() {
         const ownerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(this.usdcMint, this.wallet.publicKey);
         const mailerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(this.usdcMint, this.mailerStatePda, true);
         const instruction = new web3_js_1.TransactionInstruction({
@@ -459,35 +330,14 @@ class MailerClient {
             data: encodeSimpleInstruction(InstructionType.ClaimOwnerShare),
         });
         const transaction = new web3_js_1.Transaction().add(instruction);
-        return await this.sendTransaction(transaction, undefined, computeOptions);
-    }
-    /**
-     * Claim expired recipient shares and move them under owner control
-     * @param recipient Recipient whose expired shares to reclaim
-     * @param options Transaction confirm options
-     * @returns Transaction signature
-     */
-    async claimExpiredShares(recipient, options, computeOptions) {
-        const recipientKey = typeof recipient === 'string' ? new web3_js_1.PublicKey(recipient) : recipient;
-        const [recipientClaimPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('claim'), recipientKey.toBuffer()], this.programId);
-        const instruction = new web3_js_1.TransactionInstruction({
-            keys: [
-                { pubkey: this.wallet.publicKey, isSigner: true, isWritable: false },
-                { pubkey: this.mailerStatePda, isSigner: false, isWritable: true },
-                { pubkey: recipientClaimPda, isSigner: false, isWritable: true },
-            ],
-            programId: this.programId,
-            data: encodeClaimExpiredShares(recipientKey),
-        });
-        const transaction = new web3_js_1.Transaction().add(instruction);
-        return await this.sendTransaction(transaction, options, computeOptions);
+        return await this.sendTransaction(transaction);
     }
     /**
      * Delegate message handling to another address
      * @param delegate Address to delegate to, or null to clear delegation
      * @returns Transaction signature
      */
-    async delegateTo(delegate, computeOptions) {
+    async delegateTo(delegate) {
         const delegateKey = delegate
             ? typeof delegate === 'string'
                 ? new web3_js_1.PublicKey(delegate)
@@ -510,35 +360,33 @@ class MailerClient {
             data: encodeDelegateTo(delegateKey),
         });
         const transaction = new web3_js_1.Transaction().add(instruction);
-        return await this.sendTransaction(transaction, undefined, computeOptions);
+        return await this.sendTransaction(transaction);
     }
     /**
      * Reject a delegation made to you
      * @param delegator Address that delegated to you
      * @returns Transaction signature
      */
-    async rejectDelegation(delegator, computeOptions) {
+    async rejectDelegation(delegator) {
         const delegatorKey = typeof delegator === 'string' ? new web3_js_1.PublicKey(delegator) : delegator;
         const [delegationPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('delegation'), delegatorKey.toBuffer()], this.programId);
         const instruction = new web3_js_1.TransactionInstruction({
             keys: [
                 { pubkey: this.wallet.publicKey, isSigner: true, isWritable: false },
                 { pubkey: delegationPda, isSigner: false, isWritable: true },
-                { pubkey: this.mailerStatePda, isSigner: false, isWritable: false },
             ],
             programId: this.programId,
             data: encodeSimpleInstruction(InstructionType.RejectDelegation),
         });
         const transaction = new web3_js_1.Transaction().add(instruction);
-        return await this.sendTransaction(transaction, undefined, computeOptions);
+        return await this.sendTransaction(transaction);
     }
     /**
      * Set the send fee (owner only)
      * @param newFee New fee in USDC micro-units (6 decimals)
-     * @param computeOptions Compute unit optimization options
-     * @returns Transaction result
+     * @returns Transaction signature
      */
-    async setFee(newFee, computeOptions) {
+    async setFee(newFee) {
         const instruction = new web3_js_1.TransactionInstruction({
             keys: [
                 { pubkey: this.wallet.publicKey, isSigner: true, isWritable: false },
@@ -548,14 +396,14 @@ class MailerClient {
             data: encodeSetFee(typeof newFee === 'bigint' ? newFee : BigInt(newFee)),
         });
         const transaction = new web3_js_1.Transaction().add(instruction);
-        return await this.sendTransaction(transaction, undefined, computeOptions);
+        return await this.sendTransaction(transaction);
     }
     /**
      * Set the delegation fee (owner only)
      * @param newFee New delegation fee in USDC micro-units (6 decimals)
      * @returns Transaction signature
      */
-    async setDelegationFee(newFee, computeOptions) {
+    async setDelegationFee(newFee) {
         const instruction = new web3_js_1.TransactionInstruction({
             keys: [
                 { pubkey: this.wallet.publicKey, isSigner: true, isWritable: false },
@@ -565,59 +413,7 @@ class MailerClient {
             data: encodeSetDelegationFee(typeof newFee === 'bigint' ? newFee : BigInt(newFee)),
         });
         const transaction = new web3_js_1.Transaction().add(instruction);
-        return await this.sendTransaction(transaction, undefined, computeOptions);
-    }
-    async setCustomFeePercentage(account, percentage, payer, computeOptions) {
-        const normalizedPercentage = Math.trunc(percentage);
-        if (normalizedPercentage < 0 || normalizedPercentage > 100) {
-            throw new Error('Percentage must be between 0 and 100');
-        }
-        const accountKey = typeof account === 'string' ? new web3_js_1.PublicKey(account) : account;
-        const payerKey = payer
-            ? typeof payer === 'string'
-                ? new web3_js_1.PublicKey(payer)
-                : payer
-            : this.wallet.publicKey;
-        const [discountPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('discount'), accountKey.toBuffer()], this.programId);
-        const instruction = new web3_js_1.TransactionInstruction({
-            keys: [
-                { pubkey: this.wallet.publicKey, isSigner: true, isWritable: false },
-                { pubkey: this.mailerStatePda, isSigner: false, isWritable: false },
-                { pubkey: discountPda, isSigner: false, isWritable: true },
-                { pubkey: accountKey, isSigner: false, isWritable: false },
-                { pubkey: payerKey, isSigner: true, isWritable: true },
-                { pubkey: web3_js_1.SystemProgram.programId, isSigner: false, isWritable: false },
-            ],
-            programId: this.programId,
-            data: encodeSetCustomFeePercentage(accountKey, normalizedPercentage),
-        });
-        const transaction = new web3_js_1.Transaction().add(instruction);
-        return this.sendTransaction(transaction, undefined, computeOptions);
-    }
-    async clearCustomFeePercentage(account, computeOptions) {
-        const accountKey = typeof account === 'string' ? new web3_js_1.PublicKey(account) : account;
-        const [discountPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('discount'), accountKey.toBuffer()], this.programId);
-        const instruction = new web3_js_1.TransactionInstruction({
-            keys: [
-                { pubkey: this.wallet.publicKey, isSigner: true, isWritable: false },
-                { pubkey: this.mailerStatePda, isSigner: false, isWritable: false },
-                { pubkey: discountPda, isSigner: false, isWritable: true },
-            ],
-            programId: this.programId,
-            data: encodeClearCustomFeePercentage(accountKey),
-        });
-        const transaction = new web3_js_1.Transaction().add(instruction);
-        return this.sendTransaction(transaction, undefined, computeOptions);
-    }
-    async getCustomFeePercentage(account) {
-        const accountKey = typeof account === 'string' ? new web3_js_1.PublicKey(account) : account;
-        const [discountPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('discount'), accountKey.toBuffer()], this.programId);
-        const accountInfo = await this.connection.getAccountInfo(discountPda);
-        if (!accountInfo) {
-            return 100;
-        }
-        const discountState = parseFeeDiscount(accountInfo.data);
-        return 100 - discountState.discount;
+        return await this.sendTransaction(transaction);
     }
     /**
      * Get current fees from the mailer state
@@ -705,7 +501,7 @@ class MailerClient {
      * @param options Transaction confirm options
      * @returns Transaction signature
      */
-    async sendToEmail(toEmail, subject, body, options, computeOptions) {
+    async sendToEmail(toEmail, subject, body, options) {
         // Get associated token accounts
         const senderTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(this.usdcMint, this.wallet.publicKey);
         const mailerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(this.usdcMint, this.mailerStatePda, true);
@@ -731,7 +527,7 @@ class MailerClient {
             data: instructionData,
         }));
         const transaction = new web3_js_1.Transaction().add(...instructions);
-        return this.sendTransaction(transaction, options, computeOptions);
+        return this.sendTransaction(transaction, options);
     }
     /**
      * Send a prepared message to an email address (no wallet known)
@@ -741,7 +537,7 @@ class MailerClient {
      * @param options Transaction confirm options
      * @returns Transaction signature
      */
-    async sendPreparedToEmail(toEmail, mailId, options, computeOptions) {
+    async sendPreparedToEmail(toEmail, mailId, options) {
         // Get associated token accounts
         const senderTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(this.usdcMint, this.wallet.publicKey);
         const mailerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(this.usdcMint, this.mailerStatePda, true);
@@ -767,7 +563,7 @@ class MailerClient {
             data: instructionData,
         }));
         const transaction = new web3_js_1.Transaction().add(...instructions);
-        return this.sendTransaction(transaction, options, computeOptions);
+        return this.sendTransaction(transaction, options);
     }
     /**
      * Send a prepared message using a mailId (to match EVM behavior)
@@ -777,66 +573,16 @@ class MailerClient {
      * @param resolveSenderToName If true, resolve sender address to name
      * @returns Transaction signature
      */
-    async sendPrepared(to, mailId, revenueShareToReceiver = false, resolveSenderToName = false, computeOptions) {
-        const recipientKey = typeof to === 'string' ? new web3_js_1.PublicKey(to) : to;
-        const [recipientClaimPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('claim'), recipientKey.toBuffer()], this.programId);
-        const senderTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(this.usdcMint, this.wallet.publicKey);
-        const mailerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(this.usdcMint, this.mailerStatePda, true);
-        const instructions = [];
-        const mailerTokenInfo = await this.connection.getAccountInfo(mailerTokenAccount);
-        if (!mailerTokenInfo) {
-            instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(this.wallet.publicKey, mailerTokenAccount, this.mailerStatePda, this.usdcMint));
-        }
-        const sendInstruction = new web3_js_1.TransactionInstruction({
-            keys: [
-                { pubkey: this.wallet.publicKey, isSigner: true, isWritable: false },
-                { pubkey: recipientClaimPda, isSigner: false, isWritable: true },
-                { pubkey: this.mailerStatePda, isSigner: false, isWritable: false },
-                { pubkey: senderTokenAccount, isSigner: false, isWritable: true },
-                { pubkey: mailerTokenAccount, isSigner: false, isWritable: true },
-                { pubkey: spl_token_1.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
-                { pubkey: web3_js_1.SystemProgram.programId, isSigner: false, isWritable: false },
-            ],
-            programId: this.programId,
-            data: encodeSendPrepared(recipientKey, mailId, revenueShareToReceiver, resolveSenderToName),
-        });
-        instructions.push(sendInstruction);
-        const transaction = new web3_js_1.Transaction().add(...instructions);
-        return this.sendTransaction(transaction, undefined, computeOptions);
-    }
-    async sendThroughWebhook(to, webhookId, revenueShareToReceiver = false, resolveSenderToName = false, computeOptions) {
-        const recipientKey = typeof to === 'string' ? new web3_js_1.PublicKey(to) : to;
-        const [recipientClaimPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('claim'), recipientKey.toBuffer()], this.programId);
-        const senderTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(this.usdcMint, this.wallet.publicKey);
-        const mailerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(this.usdcMint, this.mailerStatePda, true);
-        const instructions = [];
-        const mailerTokenInfo = await this.connection.getAccountInfo(mailerTokenAccount);
-        if (!mailerTokenInfo) {
-            instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(this.wallet.publicKey, mailerTokenAccount, this.mailerStatePda, this.usdcMint));
-        }
-        const sendInstruction = new web3_js_1.TransactionInstruction({
-            keys: [
-                { pubkey: this.wallet.publicKey, isSigner: true, isWritable: false },
-                { pubkey: recipientClaimPda, isSigner: false, isWritable: true },
-                { pubkey: this.mailerStatePda, isSigner: false, isWritable: false },
-                { pubkey: senderTokenAccount, isSigner: false, isWritable: true },
-                { pubkey: mailerTokenAccount, isSigner: false, isWritable: true },
-                { pubkey: spl_token_1.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
-                { pubkey: web3_js_1.SystemProgram.programId, isSigner: false, isWritable: false },
-            ],
-            programId: this.programId,
-            data: encodeSendThroughWebhook(recipientKey, webhookId, revenueShareToReceiver, resolveSenderToName),
-        });
-        instructions.push(sendInstruction);
-        const transaction = new web3_js_1.Transaction().add(...instructions);
-        return this.sendTransaction(transaction, undefined, computeOptions);
+    async sendPrepared(to, mailId, revenueShareToReceiver = false, resolveSenderToName = false) {
+        // For Solana, we send the mailId as both subject and body to indicate it's a prepared message
+        return this.send(to, mailId, '', revenueShareToReceiver, resolveSenderToName);
     }
     /**
      * Pause the contract and distribute owner claimable funds (owner only)
      * @param options Transaction confirm options
      * @returns Transaction signature
      */
-    async pause(options, computeOptions) {
+    async pause(options) {
         const ownerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(this.usdcMint, this.wallet.publicKey);
         const mailerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(this.usdcMint, this.mailerStatePda, true);
         const instruction = new web3_js_1.TransactionInstruction({
@@ -851,14 +597,14 @@ class MailerClient {
             data: encodeSimpleInstruction(InstructionType.Pause),
         });
         const transaction = new web3_js_1.Transaction().add(instruction);
-        return await this.sendTransaction(transaction, options, computeOptions);
+        return await this.sendTransaction(transaction, options);
     }
     /**
      * Unpause the contract (owner only)
      * @param options Transaction confirm options
      * @returns Transaction signature
      */
-    async unpause(options, computeOptions) {
+    async unpause(options) {
         const instruction = new web3_js_1.TransactionInstruction({
             keys: [
                 { pubkey: this.wallet.publicKey, isSigner: true, isWritable: false },
@@ -868,14 +614,14 @@ class MailerClient {
             data: encodeSimpleInstruction(InstructionType.Unpause),
         });
         const transaction = new web3_js_1.Transaction().add(instruction);
-        return await this.sendTransaction(transaction, options, computeOptions);
+        return await this.sendTransaction(transaction, options);
     }
     /**
      * Emergency unpause without fund distribution (owner only)
      * @param options Transaction confirm options
      * @returns Transaction signature
      */
-    async emergencyUnpause(options, computeOptions) {
+    async emergencyUnpause(options) {
         const instruction = new web3_js_1.TransactionInstruction({
             keys: [
                 { pubkey: this.wallet.publicKey, isSigner: true, isWritable: false },
@@ -885,7 +631,7 @@ class MailerClient {
             data: encodeSimpleInstruction(InstructionType.EmergencyUnpause),
         });
         const transaction = new web3_js_1.Transaction().add(instruction);
-        return await this.sendTransaction(transaction, options, computeOptions);
+        return await this.sendTransaction(transaction, options);
     }
     /**
      * Distribute claimable funds to a recipient when contract is paused
@@ -893,7 +639,7 @@ class MailerClient {
      * @param options Transaction confirm options
      * @returns Transaction signature
      */
-    async distributeClaimableFunds(recipient, options, computeOptions) {
+    async distributeClaimableFunds(recipient, options) {
         const recipientKey = typeof recipient === 'string' ? new web3_js_1.PublicKey(recipient) : recipient;
         const [recipientClaimPda] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('claim'), recipientKey.toBuffer()], this.programId);
         const recipientTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(this.usdcMint, recipientKey);
@@ -915,7 +661,7 @@ class MailerClient {
             data,
         });
         const transaction = new web3_js_1.Transaction().add(instruction);
-        return await this.sendTransaction(transaction, options, computeOptions);
+        return await this.sendTransaction(transaction, options);
     }
     /**
      * Get the current send fee
@@ -944,24 +690,17 @@ class MailerClient {
      * @param options Confirm options
      * @returns Transaction signature
      */
-    async sendTransaction(transaction, options, computeOptions) {
-        // Optimize compute units if requested
-        const { transaction: optimizedTx, simulatedUnits } = await this.optimizeComputeUnits(transaction, computeOptions);
+    async sendTransaction(transaction, options) {
         // Get recent blockhash
         const { blockhash } = await this.connection.getLatestBlockhash();
-        optimizedTx.recentBlockhash = blockhash;
-        optimizedTx.feePayer = this.wallet.publicKey;
+        transaction.recentBlockhash = blockhash;
+        transaction.feePayer = this.wallet.publicKey;
         // Sign transaction
-        const signedTx = await this.wallet.signTransaction(optimizedTx);
+        const signedTx = await this.wallet.signTransaction(transaction);
         // Send and confirm
         const signature = await this.connection.sendRawTransaction(signedTx.serialize());
         await this.connection.confirmTransaction(signature, options?.commitment || 'confirmed');
-        return {
-            signature,
-            simulatedUnits,
-            computeUnitLimit: computeOptions?.computeUnitLimit,
-            computeUnitPrice: computeOptions?.computeUnitPrice,
-        };
+        return signature;
     }
     /**
      * Create a simple wallet from a keypair for testing