@sudobility/contracts 1.13.0 → 1.13.2

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

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaMailerClient = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const spl_token_1 = require("@solana/spl-token");
+import { Connection, PublicKey, Transaction, TransactionInstruction, SystemProgram, ComputeBudgetProgram, } from '@solana/web3.js';
+import { TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync, createAssociatedTokenAccountInstruction, } from '@solana/spl-token';
 /**
  * Native Solana Program instruction types
  */
@@ -206,7 +203,7 @@ function encodeDistributeClaimableFunds(recipients) {
  * All methods take wallet and chainInfo as parameters.
  * No state is stored in the instance.
  */
-class SolanaMailerClient {
+export class SolanaMailerClient {
     constructor() {
         this.defaultComputeUnitMultiplier = 1.2; // 20% buffer by default
         // Default compute unit limits for common operations
@@ -248,11 +245,11 @@ class SolanaMailerClient {
         }
         else {
             // Default Solana endpoints
-            rpcUrl = chainInfo.isDev
+            rpcUrl = chainInfo.isTestNet
                 ? 'https://api.devnet.solana.com'
                 : 'https://api.mainnet-beta.solana.com';
         }
-        return new web3_js_1.Connection(rpcUrl, 'confirmed');
+        return new Connection(rpcUrl, 'confirmed');
     }
     /**
      * Get program and state PDAs from chainInfo
@@ -261,8 +258,8 @@ class SolanaMailerClient {
         if (!chainInfo.mailerAddress) {
             throw new Error(`No mailer program deployed on ${chainInfo.name}`);
         }
-        const programId = new web3_js_1.PublicKey(chainInfo.mailerAddress);
-        const [mailerPda, bump] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('mailer')], programId);
+        const programId = new PublicKey(chainInfo.mailerAddress);
+        const [mailerPda, bump] = PublicKey.findProgramAddressSync([Buffer.from('mailer')], programId);
         return {
             programId,
             mailerStatePda: mailerPda,
@@ -286,8 +283,8 @@ class SolanaMailerClient {
             while (retryCount <= maxRetries) {
                 try {
                     // Set a high limit for simulation
-                    const simTransaction = new web3_js_1.Transaction().add(...transaction.instructions);
-                    simTransaction.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+                    const simTransaction = new Transaction().add(...transaction.instructions);
+                    simTransaction.add(ComputeBudgetProgram.setComputeUnitLimit({
                         units: 1400000, // Max for simulation
                     }));
                     simTransaction.recentBlockhash = (await connection.getLatestBlockhash()).blockhash;
@@ -324,10 +321,10 @@ class SolanaMailerClient {
             computeUnitLimit = defaultComputeUnits;
         }
         // Apply compute budget instructions
-        const optimizedTx = new web3_js_1.Transaction();
+        const optimizedTx = new Transaction();
         // Add compute unit limit if specified
         if (computeUnitLimit) {
-            optimizedTx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+            optimizedTx.add(ComputeBudgetProgram.setComputeUnitLimit({
                 units: computeUnitLimit,
             }));
         }
@@ -335,7 +332,7 @@ class SolanaMailerClient {
         const priorityFee = options?.computeUnitPrice ??
             (options?.autoOptimize ? this.priorityFeeRecommendations.normal : undefined);
         if (priorityFee) {
-            optimizedTx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+            optimizedTx.add(ComputeBudgetProgram.setComputeUnitPrice({
                 microLamports: priorityFee,
             }));
         }
@@ -381,17 +378,17 @@ class SolanaMailerClient {
         if (!chainInfo.usdcAddress) {
             throw new Error(`No USDC mint configured for ${chainInfo.name}`);
         }
-        const usdcMint = new web3_js_1.PublicKey(chainInfo.usdcAddress);
-        const instruction = new web3_js_1.TransactionInstruction({
+        const usdcMint = new PublicKey(chainInfo.usdcAddress);
+        const instruction = new TransactionInstruction({
             programId,
             keys: [
                 { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: true },
                 { pubkey: mailerStatePda, isSigner: false, isWritable: true },
-                { pubkey: web3_js_1.SystemProgram.programId, isSigner: false, isWritable: false },
+                { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
             ],
             data: encodeInitialize(usdcMint),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
     /**
@@ -403,12 +400,12 @@ class SolanaMailerClient {
         if (!chainInfo.usdcAddress) {
             throw new Error(`No USDC mint configured for ${chainInfo.name}`);
         }
-        const usdcMint = new web3_js_1.PublicKey(chainInfo.usdcAddress);
-        const toPubkey = typeof to === 'string' ? new web3_js_1.PublicKey(to) : to;
+        const usdcMint = new PublicKey(chainInfo.usdcAddress);
+        const toPubkey = typeof to === 'string' ? new PublicKey(to) : to;
         // Get token accounts
-        const senderTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, connectedWallet.wallet.publicKey, false, spl_token_1.TOKEN_PROGRAM_ID);
-        const mailerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, mailerStatePda, true, spl_token_1.TOKEN_PROGRAM_ID);
-        const [recipientInfo] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('recipient_info'), toPubkey.toBuffer()], programId);
+        const senderTokenAccount = getAssociatedTokenAddressSync(usdcMint, connectedWallet.wallet.publicKey, false, TOKEN_PROGRAM_ID);
+        const mailerTokenAccount = getAssociatedTokenAddressSync(usdcMint, mailerStatePda, true, TOKEN_PROGRAM_ID);
+        const [recipientInfo] = PublicKey.findProgramAddressSync([Buffer.from('recipient_info'), toPubkey.toBuffer()], programId);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: true },
             { pubkey: toPubkey, isSigner: false, isWritable: false },
@@ -416,19 +413,19 @@ class SolanaMailerClient {
             { pubkey: senderTokenAccount, isSigner: false, isWritable: true },
             { pubkey: mailerTokenAccount, isSigner: false, isWritable: true },
             { pubkey: recipientInfo, 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 },
+            { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+            { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         ];
-        const instruction = new web3_js_1.TransactionInstruction({
+        const instruction = new TransactionInstruction({
             programId,
             keys,
             data: encodeSend(toPubkey, subject, body, revenueShareToReceiver),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         // Check if mailer token account exists, create if not
         const accountInfo = await connection.getAccountInfo(mailerTokenAccount);
         if (!accountInfo) {
-            transaction.add((0, spl_token_1.createAssociatedTokenAccountInstruction)(connectedWallet.wallet.publicKey, mailerTokenAccount, mailerStatePda, usdcMint));
+            transaction.add(createAssociatedTokenAccountInstruction(connectedWallet.wallet.publicKey, mailerTokenAccount, mailerStatePda, usdcMint));
         }
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
@@ -441,11 +438,11 @@ class SolanaMailerClient {
         if (!chainInfo.usdcAddress) {
             throw new Error(`No USDC mint configured for ${chainInfo.name}`);
         }
-        const usdcMint = new web3_js_1.PublicKey(chainInfo.usdcAddress);
-        const toPubkey = typeof to === 'string' ? new web3_js_1.PublicKey(to) : to;
-        const senderTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, connectedWallet.wallet.publicKey, false, spl_token_1.TOKEN_PROGRAM_ID);
-        const mailerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, mailerStatePda, true, spl_token_1.TOKEN_PROGRAM_ID);
-        const [recipientInfo] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('recipient_info'), toPubkey.toBuffer()], programId);
+        const usdcMint = new PublicKey(chainInfo.usdcAddress);
+        const toPubkey = typeof to === 'string' ? new PublicKey(to) : to;
+        const senderTokenAccount = getAssociatedTokenAddressSync(usdcMint, connectedWallet.wallet.publicKey, false, TOKEN_PROGRAM_ID);
+        const mailerTokenAccount = getAssociatedTokenAddressSync(usdcMint, mailerStatePda, true, TOKEN_PROGRAM_ID);
+        const [recipientInfo] = PublicKey.findProgramAddressSync([Buffer.from('recipient_info'), toPubkey.toBuffer()], programId);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: true },
             { pubkey: toPubkey, isSigner: false, isWritable: false },
@@ -453,19 +450,19 @@ class SolanaMailerClient {
             { pubkey: senderTokenAccount, isSigner: false, isWritable: true },
             { pubkey: mailerTokenAccount, isSigner: false, isWritable: true },
             { pubkey: recipientInfo, 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 },
+            { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+            { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         ];
-        const instruction = new web3_js_1.TransactionInstruction({
+        const instruction = new TransactionInstruction({
             programId,
             keys,
             data: encodeSendPrepared(toPubkey, mailId, revenueShareToReceiver),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         // Check if mailer token account exists, create if not
         const accountInfo = await connection.getAccountInfo(mailerTokenAccount);
         if (!accountInfo) {
-            transaction.add((0, spl_token_1.createAssociatedTokenAccountInstruction)(connectedWallet.wallet.publicKey, mailerTokenAccount, mailerStatePda, usdcMint));
+            transaction.add(createAssociatedTokenAccountInstruction(connectedWallet.wallet.publicKey, mailerTokenAccount, mailerStatePda, usdcMint));
         }
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
@@ -478,11 +475,11 @@ class SolanaMailerClient {
         if (!chainInfo.usdcAddress) {
             throw new Error(`No USDC mint configured for ${chainInfo.name}`);
         }
-        const usdcMint = new web3_js_1.PublicKey(chainInfo.usdcAddress);
-        const toPubkey = typeof to === 'string' ? new web3_js_1.PublicKey(to) : to;
-        const senderTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, connectedWallet.wallet.publicKey, false, spl_token_1.TOKEN_PROGRAM_ID);
-        const mailerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, mailerStatePda, true, spl_token_1.TOKEN_PROGRAM_ID);
-        const [recipientInfo] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('recipient_info'), toPubkey.toBuffer()], programId);
+        const usdcMint = new PublicKey(chainInfo.usdcAddress);
+        const toPubkey = typeof to === 'string' ? new PublicKey(to) : to;
+        const senderTokenAccount = getAssociatedTokenAddressSync(usdcMint, connectedWallet.wallet.publicKey, false, TOKEN_PROGRAM_ID);
+        const mailerTokenAccount = getAssociatedTokenAddressSync(usdcMint, mailerStatePda, true, TOKEN_PROGRAM_ID);
+        const [recipientInfo] = PublicKey.findProgramAddressSync([Buffer.from('recipient_info'), toPubkey.toBuffer()], programId);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: true },
             { pubkey: toPubkey, isSigner: false, isWritable: false },
@@ -490,18 +487,18 @@ class SolanaMailerClient {
             { pubkey: senderTokenAccount, isSigner: false, isWritable: true },
             { pubkey: mailerTokenAccount, isSigner: false, isWritable: true },
             { pubkey: recipientInfo, 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 },
+            { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+            { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         ];
-        const instruction = new web3_js_1.TransactionInstruction({
+        const instruction = new TransactionInstruction({
             programId,
             keys,
             data: encodeSendThroughWebhook(toPubkey, subject, body, webhookId, revenueShareToReceiver),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         const accountInfo = await connection.getAccountInfo(mailerTokenAccount);
         if (!accountInfo) {
-            transaction.add((0, spl_token_1.createAssociatedTokenAccountInstruction)(connectedWallet.wallet.publicKey, mailerTokenAccount, mailerStatePda, usdcMint));
+            transaction.add(createAssociatedTokenAccountInstruction(connectedWallet.wallet.publicKey, mailerTokenAccount, mailerStatePda, usdcMint));
         }
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
@@ -514,27 +511,27 @@ class SolanaMailerClient {
         if (!chainInfo.usdcAddress) {
             throw new Error(`No USDC mint configured for ${chainInfo.name}`);
         }
-        const usdcMint = new web3_js_1.PublicKey(chainInfo.usdcAddress);
-        const payerPubkey = typeof payer === 'string' ? new web3_js_1.PublicKey(payer) : payer;
-        const senderTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, connectedWallet.wallet.publicKey, false, spl_token_1.TOKEN_PROGRAM_ID);
-        const mailerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, mailerStatePda, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const usdcMint = new PublicKey(chainInfo.usdcAddress);
+        const payerPubkey = typeof payer === 'string' ? new PublicKey(payer) : payer;
+        const senderTokenAccount = getAssociatedTokenAddressSync(usdcMint, connectedWallet.wallet.publicKey, false, TOKEN_PROGRAM_ID);
+        const mailerTokenAccount = getAssociatedTokenAddressSync(usdcMint, mailerStatePda, true, TOKEN_PROGRAM_ID);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: true },
             { pubkey: mailerStatePda, isSigner: false, isWritable: true },
             { 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 },
+            { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+            { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         ];
-        const instruction = new web3_js_1.TransactionInstruction({
+        const instruction = new TransactionInstruction({
             programId,
             keys,
             data: encodeSendToEmail(emailHash, subject, body, payerPubkey, revenueShareToReceiver),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         const accountInfo = await connection.getAccountInfo(mailerTokenAccount);
         if (!accountInfo) {
-            transaction.add((0, spl_token_1.createAssociatedTokenAccountInstruction)(connectedWallet.wallet.publicKey, mailerTokenAccount, mailerStatePda, usdcMint));
+            transaction.add(createAssociatedTokenAccountInstruction(connectedWallet.wallet.publicKey, mailerTokenAccount, mailerStatePda, usdcMint));
         }
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
@@ -547,27 +544,27 @@ class SolanaMailerClient {
         if (!chainInfo.usdcAddress) {
             throw new Error(`No USDC mint configured for ${chainInfo.name}`);
         }
-        const usdcMint = new web3_js_1.PublicKey(chainInfo.usdcAddress);
-        const payerPubkey = typeof payer === 'string' ? new web3_js_1.PublicKey(payer) : payer;
-        const senderTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, connectedWallet.wallet.publicKey, false, spl_token_1.TOKEN_PROGRAM_ID);
-        const mailerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, mailerStatePda, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const usdcMint = new PublicKey(chainInfo.usdcAddress);
+        const payerPubkey = typeof payer === 'string' ? new PublicKey(payer) : payer;
+        const senderTokenAccount = getAssociatedTokenAddressSync(usdcMint, connectedWallet.wallet.publicKey, false, TOKEN_PROGRAM_ID);
+        const mailerTokenAccount = getAssociatedTokenAddressSync(usdcMint, mailerStatePda, true, TOKEN_PROGRAM_ID);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: true },
             { pubkey: mailerStatePda, isSigner: false, isWritable: true },
             { 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 },
+            { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+            { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         ];
-        const instruction = new web3_js_1.TransactionInstruction({
+        const instruction = new TransactionInstruction({
             programId,
             keys,
             data: encodeSendPreparedToEmail(emailHash, mailId, payerPubkey, revenueShareToReceiver),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         const accountInfo = await connection.getAccountInfo(mailerTokenAccount);
         if (!accountInfo) {
-            transaction.add((0, spl_token_1.createAssociatedTokenAccountInstruction)(connectedWallet.wallet.publicKey, mailerTokenAccount, mailerStatePda, usdcMint));
+            transaction.add(createAssociatedTokenAccountInstruction(connectedWallet.wallet.publicKey, mailerTokenAccount, mailerStatePda, usdcMint));
         }
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
@@ -580,24 +577,24 @@ class SolanaMailerClient {
         if (!chainInfo.usdcAddress) {
             throw new Error(`No USDC mint configured for ${chainInfo.name}`);
         }
-        const usdcMint = new web3_js_1.PublicKey(chainInfo.usdcAddress);
-        const recipientTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, connectedWallet.wallet.publicKey, false, spl_token_1.TOKEN_PROGRAM_ID);
-        const mailerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, mailerStatePda, true, spl_token_1.TOKEN_PROGRAM_ID);
-        const [recipientInfo] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('recipient_info'), connectedWallet.wallet.publicKey.toBuffer()], programId);
+        const usdcMint = new PublicKey(chainInfo.usdcAddress);
+        const recipientTokenAccount = getAssociatedTokenAddressSync(usdcMint, connectedWallet.wallet.publicKey, false, TOKEN_PROGRAM_ID);
+        const mailerTokenAccount = getAssociatedTokenAddressSync(usdcMint, mailerStatePda, true, TOKEN_PROGRAM_ID);
+        const [recipientInfo] = PublicKey.findProgramAddressSync([Buffer.from('recipient_info'), connectedWallet.wallet.publicKey.toBuffer()], programId);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: true },
             { pubkey: mailerStatePda, isSigner: false, isWritable: true },
             { pubkey: recipientTokenAccount, isSigner: false, isWritable: true },
             { pubkey: mailerTokenAccount, isSigner: false, isWritable: true },
             { pubkey: recipientInfo, isSigner: false, isWritable: true },
-            { pubkey: spl_token_1.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+            { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         ];
-        const instruction = new web3_js_1.TransactionInstruction({
+        const instruction = new TransactionInstruction({
             programId,
             keys,
             data: Buffer.from([InstructionType.ClaimRecipientShare]),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
     /**
@@ -609,22 +606,22 @@ class SolanaMailerClient {
         if (!chainInfo.usdcAddress) {
             throw new Error(`No USDC mint configured for ${chainInfo.name}`);
         }
-        const usdcMint = new web3_js_1.PublicKey(chainInfo.usdcAddress);
-        const ownerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, connectedWallet.wallet.publicKey, false, spl_token_1.TOKEN_PROGRAM_ID);
-        const mailerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, mailerStatePda, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const usdcMint = new PublicKey(chainInfo.usdcAddress);
+        const ownerTokenAccount = getAssociatedTokenAddressSync(usdcMint, connectedWallet.wallet.publicKey, false, TOKEN_PROGRAM_ID);
+        const mailerTokenAccount = getAssociatedTokenAddressSync(usdcMint, mailerStatePda, true, TOKEN_PROGRAM_ID);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: true },
             { pubkey: mailerStatePda, isSigner: false, isWritable: true },
             { pubkey: ownerTokenAccount, isSigner: false, isWritable: true },
             { pubkey: mailerTokenAccount, isSigner: false, isWritable: true },
-            { pubkey: spl_token_1.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+            { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         ];
-        const instruction = new web3_js_1.TransactionInstruction({
+        const instruction = new TransactionInstruction({
             programId,
             keys,
             data: Buffer.from([InstructionType.ClaimOwnerShare]),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
     /**
@@ -633,19 +630,19 @@ class SolanaMailerClient {
     async claimExpiredShares(connectedWallet, chainInfo, recipient, computeOptions) {
         const connection = await this.getOrCreateConnection(chainInfo, connectedWallet.connection);
         const { programId, mailerStatePda } = this.getProgramAddresses(chainInfo);
-        const recipientPubkey = typeof recipient === 'string' ? new web3_js_1.PublicKey(recipient) : recipient;
-        const [recipientInfo] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('recipient_info'), recipientPubkey.toBuffer()], programId);
+        const recipientPubkey = typeof recipient === 'string' ? new PublicKey(recipient) : recipient;
+        const [recipientInfo] = PublicKey.findProgramAddressSync([Buffer.from('recipient_info'), recipientPubkey.toBuffer()], programId);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: true },
             { pubkey: mailerStatePda, isSigner: false, isWritable: true },
             { pubkey: recipientInfo, isSigner: false, isWritable: true },
         ];
-        const instruction = new web3_js_1.TransactionInstruction({
+        const instruction = new TransactionInstruction({
             programId,
             keys,
             data: encodeClaimExpiredShares(recipientPubkey),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
     /**
@@ -657,31 +654,31 @@ class SolanaMailerClient {
         if (!chainInfo.usdcAddress) {
             throw new Error(`No USDC mint configured for ${chainInfo.name}`);
         }
-        const usdcMint = new web3_js_1.PublicKey(chainInfo.usdcAddress);
+        const usdcMint = new PublicKey(chainInfo.usdcAddress);
         const delegatePubkey = delegate
-            ? (typeof delegate === 'string' ? new web3_js_1.PublicKey(delegate) : delegate)
+            ? (typeof delegate === 'string' ? new PublicKey(delegate) : delegate)
             : null;
-        const senderTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, connectedWallet.wallet.publicKey, false, spl_token_1.TOKEN_PROGRAM_ID);
-        const mailerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, mailerStatePda, true, spl_token_1.TOKEN_PROGRAM_ID);
-        const [delegatorInfo] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('delegator_info'), connectedWallet.wallet.publicKey.toBuffer()], programId);
+        const senderTokenAccount = getAssociatedTokenAddressSync(usdcMint, connectedWallet.wallet.publicKey, false, TOKEN_PROGRAM_ID);
+        const mailerTokenAccount = getAssociatedTokenAddressSync(usdcMint, mailerStatePda, true, TOKEN_PROGRAM_ID);
+        const [delegatorInfo] = PublicKey.findProgramAddressSync([Buffer.from('delegator_info'), connectedWallet.wallet.publicKey.toBuffer()], programId);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: true },
             { pubkey: mailerStatePda, isSigner: false, isWritable: true },
             { pubkey: senderTokenAccount, isSigner: false, isWritable: true },
             { pubkey: mailerTokenAccount, isSigner: false, isWritable: true },
             { pubkey: delegatorInfo, 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 },
+            { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+            { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         ];
-        const instruction = new web3_js_1.TransactionInstruction({
+        const instruction = new TransactionInstruction({
             programId,
             keys,
             data: encodeDelegateTo(delegatePubkey),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         const accountInfo = await connection.getAccountInfo(mailerTokenAccount);
         if (!accountInfo) {
-            transaction.add((0, spl_token_1.createAssociatedTokenAccountInstruction)(connectedWallet.wallet.publicKey, mailerTokenAccount, mailerStatePda, usdcMint));
+            transaction.add(createAssociatedTokenAccountInstruction(connectedWallet.wallet.publicKey, mailerTokenAccount, mailerStatePda, usdcMint));
         }
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
@@ -691,18 +688,18 @@ class SolanaMailerClient {
     async rejectDelegation(connectedWallet, chainInfo, delegatingAddress, computeOptions) {
         const connection = await this.getOrCreateConnection(chainInfo, connectedWallet.connection);
         const { programId } = this.getProgramAddresses(chainInfo);
-        const delegatorPubkey = typeof delegatingAddress === 'string' ? new web3_js_1.PublicKey(delegatingAddress) : delegatingAddress;
-        const [delegatorInfo] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('delegator_info'), delegatorPubkey.toBuffer()], programId);
+        const delegatorPubkey = typeof delegatingAddress === 'string' ? new PublicKey(delegatingAddress) : delegatingAddress;
+        const [delegatorInfo] = PublicKey.findProgramAddressSync([Buffer.from('delegator_info'), delegatorPubkey.toBuffer()], programId);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: false },
             { pubkey: delegatorInfo, isSigner: false, isWritable: true },
         ];
-        const instruction = new web3_js_1.TransactionInstruction({
+        const instruction = new TransactionInstruction({
             programId,
             keys,
             data: encodeRejectDelegation(delegatorPubkey),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
     /**
@@ -715,12 +712,12 @@ class SolanaMailerClient {
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: false },
             { pubkey: mailerStatePda, isSigner: false, isWritable: true },
         ];
-        const instruction = new web3_js_1.TransactionInstruction({
+        const instruction = new TransactionInstruction({
             programId,
             keys,
             data: encodeSetFees(BigInt(sendFee), BigInt(delegationFee)),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
     /**
@@ -729,20 +726,20 @@ class SolanaMailerClient {
     async setCustomFeePercentage(account, percentage, connectedWallet, chainInfo, computeOptions) {
         const connection = await this.getOrCreateConnection(chainInfo, connectedWallet.connection);
         const { programId, mailerStatePda } = this.getProgramAddresses(chainInfo);
-        const accountPubkey = typeof account === 'string' ? new web3_js_1.PublicKey(account) : account;
-        const [customFeeInfo] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('custom_fee'), accountPubkey.toBuffer()], programId);
+        const accountPubkey = typeof account === 'string' ? new PublicKey(account) : account;
+        const [customFeeInfo] = PublicKey.findProgramAddressSync([Buffer.from('custom_fee'), accountPubkey.toBuffer()], programId);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: true },
             { pubkey: mailerStatePda, isSigner: false, isWritable: false },
             { pubkey: customFeeInfo, isSigner: false, isWritable: true },
-            { pubkey: web3_js_1.SystemProgram.programId, isSigner: false, isWritable: false },
+            { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         ];
-        const instruction = new web3_js_1.TransactionInstruction({
+        const instruction = new TransactionInstruction({
             programId,
             keys,
             data: encodeSetCustomFeePercentage(accountPubkey, percentage),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
     /**
@@ -751,19 +748,19 @@ class SolanaMailerClient {
     async clearCustomFeePercentage(account, connectedWallet, chainInfo, computeOptions) {
         const connection = await this.getOrCreateConnection(chainInfo, connectedWallet.connection);
         const { programId, mailerStatePda } = this.getProgramAddresses(chainInfo);
-        const accountPubkey = typeof account === 'string' ? new web3_js_1.PublicKey(account) : account;
-        const [customFeeInfo] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('custom_fee'), accountPubkey.toBuffer()], programId);
+        const accountPubkey = typeof account === 'string' ? new PublicKey(account) : account;
+        const [customFeeInfo] = PublicKey.findProgramAddressSync([Buffer.from('custom_fee'), accountPubkey.toBuffer()], programId);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: false },
             { pubkey: mailerStatePda, isSigner: false, isWritable: false },
             { pubkey: customFeeInfo, isSigner: false, isWritable: true },
         ];
-        const instruction = new web3_js_1.TransactionInstruction({
+        const instruction = new TransactionInstruction({
             programId,
             keys,
             data: encodeClearCustomFeePercentage(accountPubkey),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
     /**
@@ -776,12 +773,12 @@ class SolanaMailerClient {
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: false },
             { pubkey: mailerStatePda, isSigner: false, isWritable: true },
         ];
-        const instruction = new web3_js_1.TransactionInstruction({
+        const instruction = new TransactionInstruction({
             programId,
             keys,
             data: Buffer.from([InstructionType.Pause]),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
     /**
@@ -794,12 +791,12 @@ class SolanaMailerClient {
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: false },
             { pubkey: mailerStatePda, isSigner: false, isWritable: true },
         ];
-        const instruction = new web3_js_1.TransactionInstruction({
+        const instruction = new TransactionInstruction({
             programId,
             keys,
             data: Buffer.from([InstructionType.Unpause]),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
     /**
@@ -812,12 +809,12 @@ class SolanaMailerClient {
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: false },
             { pubkey: mailerStatePda, isSigner: false, isWritable: true },
         ];
-        const instruction = new web3_js_1.TransactionInstruction({
+        const instruction = new TransactionInstruction({
             programId,
             keys,
             data: Buffer.from([InstructionType.EmergencyUnpause]),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
     /**
@@ -829,29 +826,29 @@ class SolanaMailerClient {
         if (!chainInfo.usdcAddress) {
             throw new Error(`No USDC mint configured for ${chainInfo.name}`);
         }
-        const usdcMint = new web3_js_1.PublicKey(chainInfo.usdcAddress);
-        const recipientPubkeys = recipients.map(r => typeof r === 'string' ? new web3_js_1.PublicKey(r) : r);
-        const mailerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, mailerStatePda, true, spl_token_1.TOKEN_PROGRAM_ID);
+        const usdcMint = new PublicKey(chainInfo.usdcAddress);
+        const recipientPubkeys = recipients.map(r => typeof r === 'string' ? new PublicKey(r) : r);
+        const mailerTokenAccount = getAssociatedTokenAddressSync(usdcMint, mailerStatePda, true, TOKEN_PROGRAM_ID);
         // Build keys array
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: false },
             { pubkey: mailerStatePda, isSigner: false, isWritable: true },
             { pubkey: mailerTokenAccount, isSigner: false, isWritable: true },
-            { pubkey: spl_token_1.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+            { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         ];
         // Add recipient info and token accounts
         for (const recipient of recipientPubkeys) {
-            const [recipientInfo] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('recipient_info'), recipient.toBuffer()], programId);
-            const recipientTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(usdcMint, recipient, false, spl_token_1.TOKEN_PROGRAM_ID);
+            const [recipientInfo] = PublicKey.findProgramAddressSync([Buffer.from('recipient_info'), recipient.toBuffer()], programId);
+            const recipientTokenAccount = getAssociatedTokenAddressSync(usdcMint, recipient, false, TOKEN_PROGRAM_ID);
             keys.push({ pubkey: recipientInfo, isSigner: false, isWritable: true });
             keys.push({ pubkey: recipientTokenAccount, isSigner: false, isWritable: true });
         }
-        const instruction = new web3_js_1.TransactionInstruction({
+        const instruction = new TransactionInstruction({
             programId,
             keys,
             data: encodeDistributeClaimableFunds(recipientPubkeys),
         });
-        const transaction = new web3_js_1.Transaction().add(instruction);
+        const transaction = new Transaction().add(instruction);
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
     // ============= Read Methods =============
@@ -894,8 +891,8 @@ class SolanaMailerClient {
     async getRecipientClaimable(recipient, chainInfo, connection) {
         const conn = await this.getOrCreateConnection(chainInfo, connection);
         const { programId } = this.getProgramAddresses(chainInfo);
-        const recipientPubkey = typeof recipient === 'string' ? new web3_js_1.PublicKey(recipient) : recipient;
-        const [recipientInfo] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('recipient_info'), recipientPubkey.toBuffer()], programId);
+        const recipientPubkey = typeof recipient === 'string' ? new PublicKey(recipient) : recipient;
+        const [recipientInfo] = PublicKey.findProgramAddressSync([Buffer.from('recipient_info'), recipientPubkey.toBuffer()], programId);
         const accountInfo = await conn.getAccountInfo(recipientInfo);
         if (!accountInfo || !accountInfo.data) {
             return null;
@@ -911,7 +908,7 @@ class SolanaMailerClient {
             amount: Number(amount),
             timestamp: Number(expiresAt), // Using expiresAt as timestamp
             expiresAt: Number(expiresAt),
-            recipient: recipient instanceof web3_js_1.PublicKey ? recipient.toBase58() : recipient,
+            recipient: recipient instanceof PublicKey ? recipient.toBase58() : recipient,
             isExpired,
         };
     }
@@ -936,8 +933,8 @@ class SolanaMailerClient {
     async getDelegation(address, chainInfo, connection) {
         const conn = await this.getOrCreateConnection(chainInfo, connection);
         const { programId } = this.getProgramAddresses(chainInfo);
-        const addressPubkey = typeof address === 'string' ? new web3_js_1.PublicKey(address) : address;
-        const [delegatorInfo] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('delegator_info'), addressPubkey.toBuffer()], programId);
+        const addressPubkey = typeof address === 'string' ? new PublicKey(address) : address;
+        const [delegatorInfo] = PublicKey.findProgramAddressSync([Buffer.from('delegator_info'), addressPubkey.toBuffer()], programId);
         const accountInfo = await conn.getAccountInfo(delegatorInfo);
         if (!accountInfo || !accountInfo.data) {
             return null;
@@ -950,7 +947,7 @@ class SolanaMailerClient {
         }
         // Read delegate pubkey
         const delegateBytes = data.slice(9, 41); // 32 bytes for pubkey
-        return new web3_js_1.PublicKey(delegateBytes);
+        return new PublicKey(delegateBytes);
     }
     /**
      * Get custom fee percentage for an account
@@ -958,8 +955,8 @@ class SolanaMailerClient {
     async getCustomFeePercentage(account, chainInfo, connection) {
         const conn = await this.getOrCreateConnection(chainInfo, connection);
         const { programId } = this.getProgramAddresses(chainInfo);
-        const accountPubkey = typeof account === 'string' ? new web3_js_1.PublicKey(account) : account;
-        const [customFeeInfo] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('custom_fee'), accountPubkey.toBuffer()], programId);
+        const accountPubkey = typeof account === 'string' ? new PublicKey(account) : account;
+        const [customFeeInfo] = PublicKey.findProgramAddressSync([Buffer.from('custom_fee'), accountPubkey.toBuffer()], programId);
         const accountInfo = await conn.getAccountInfo(customFeeInfo);
         if (!accountInfo || !accountInfo.data) {
             return 100; // Default to 100% if no custom fee set
@@ -997,8 +994,7 @@ class SolanaMailerClient {
         // Parse the state data
         const data = accountInfo.data;
         const ownerBytes = data.slice(8, 40); // After discriminator(8)
-        return new web3_js_1.PublicKey(ownerBytes);
+        return new PublicKey(ownerBytes);
     }
 }
-exports.SolanaMailerClient = SolanaMailerClient;
 //# sourceMappingURL=solana-mailer-client.js.map