@sudobility/contracts 1.14.1 → 1.14.2

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

@@ -8,22 +8,27 @@ var InstructionType;
     InstructionType[InstructionType["Initialize"] = 0] = "Initialize";
     InstructionType[InstructionType["Send"] = 1] = "Send";
     InstructionType[InstructionType["SendPrepared"] = 2] = "SendPrepared";
-    InstructionType[InstructionType["SendThroughWebhook"] = 3] = "SendThroughWebhook";
-    InstructionType[InstructionType["SendToEmail"] = 4] = "SendToEmail";
-    InstructionType[InstructionType["SendPreparedToEmail"] = 5] = "SendPreparedToEmail";
+    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["ClaimExpiredShares"] = 8] = "ClaimExpiredShares";
-    InstructionType[InstructionType["SetFees"] = 9] = "SetFees";
-    InstructionType[InstructionType["DelegateTo"] = 10] = "DelegateTo";
-    InstructionType[InstructionType["RejectDelegation"] = 11] = "RejectDelegation";
+    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["EmergencyUnpause"] = 16] = "EmergencyUnpause";
-    InstructionType[InstructionType["DistributeClaimableFunds"] = 17] = "DistributeClaimableFunds";
+    InstructionType[InstructionType["DistributeClaimableFunds"] = 16] = "DistributeClaimableFunds";
+    InstructionType[InstructionType["ClaimExpiredShares"] = 17] = "ClaimExpiredShares";
+    InstructionType[InstructionType["EmergencyUnpause"] = 18] = "EmergencyUnpause";
 })(InstructionType || (InstructionType = {}));
+const CLAIM_PDA_SEED = Buffer.from('claim');
+const DELEGATION_PDA_SEED = Buffer.from('delegation');
+const DISCOUNT_PDA_SEED = Buffer.from('discount');
+const CLAIM_PERIOD_SECONDS = 60 * 24 * 60 * 60;
 // Instruction data encoding functions
 function encodeInitialize(usdcMint) {
     const data = Buffer.alloc(1 + 32);
@@ -70,43 +75,35 @@ function encodeSendPrepared(to, mailId, revenueShareToReceiver, resolveSenderToN
     data.writeUInt8(resolveSenderToName ? 1 : 0, offset);
     return data;
 }
-function encodeSendThroughWebhook(to, subject, body, webhookId, revenueShareToReceiver) {
-    const subjectBytes = Buffer.from(subject, 'utf8');
-    const bodyBytes = Buffer.from(body, 'utf8');
+function encodeSendThroughWebhook(to, webhookId, revenueShareToReceiver, resolveSenderToName = false) {
     const webhookIdBytes = Buffer.from(webhookId, 'utf8');
-    const data = Buffer.alloc(1 + 32 + 4 + subjectBytes.length + 4 + bodyBytes.length + 4 + webhookIdBytes.length + 1);
+    const data = Buffer.alloc(1 + 32 + 4 + webhookIdBytes.length + 1 + 1);
     let offset = 0;
     data.writeUInt8(InstructionType.SendThroughWebhook, offset);
     offset += 1;
     to.toBuffer().copy(data, offset);
     offset += 32;
-    data.writeUInt32LE(subjectBytes.length, offset);
-    offset += 4;
-    subjectBytes.copy(data, offset);
-    offset += subjectBytes.length;
-    data.writeUInt32LE(bodyBytes.length, offset);
-    offset += 4;
-    bodyBytes.copy(data, offset);
-    offset += bodyBytes.length;
     data.writeUInt32LE(webhookIdBytes.length, offset);
     offset += 4;
     webhookIdBytes.copy(data, offset);
     offset += webhookIdBytes.length;
     data.writeUInt8(revenueShareToReceiver ? 1 : 0, offset);
+    offset += 1;
+    data.writeUInt8(resolveSenderToName ? 1 : 0, offset);
     return data;
 }
-function encodeSendToEmail(emailHash, subject, body, payer, revenueShareToReceiver) {
-    const emailHashBytes = Buffer.from(emailHash, 'utf8');
+function encodeSendToEmail(toEmail, subject, body) {
+    const emailBytes = Buffer.from(toEmail, 'utf8');
     const subjectBytes = Buffer.from(subject, 'utf8');
     const bodyBytes = Buffer.from(body, 'utf8');
-    const data = Buffer.alloc(1 + 4 + emailHashBytes.length + 4 + subjectBytes.length + 4 + bodyBytes.length + 32 + 1);
+    const data = Buffer.alloc(1 + 4 + emailBytes.length + 4 + subjectBytes.length + 4 + bodyBytes.length);
     let offset = 0;
     data.writeUInt8(InstructionType.SendToEmail, offset);
     offset += 1;
-    data.writeUInt32LE(emailHashBytes.length, offset);
+    data.writeUInt32LE(emailBytes.length, offset);
     offset += 4;
-    emailHashBytes.copy(data, offset);
-    offset += emailHashBytes.length;
+    emailBytes.copy(data, offset);
+    offset += emailBytes.length;
     data.writeUInt32LE(subjectBytes.length, offset);
     offset += 4;
     subjectBytes.copy(data, offset);
@@ -115,36 +112,35 @@ function encodeSendToEmail(emailHash, subject, body, payer, revenueShareToReceiv
     offset += 4;
     bodyBytes.copy(data, offset);
     offset += bodyBytes.length;
-    payer.toBuffer().copy(data, offset);
-    offset += 32;
-    data.writeUInt8(revenueShareToReceiver ? 1 : 0, offset);
     return data;
 }
-function encodeSendPreparedToEmail(emailHash, mailId, payer, revenueShareToReceiver) {
-    const emailHashBytes = Buffer.from(emailHash, 'utf8');
+function encodeSendPreparedToEmail(toEmail, mailId) {
+    const emailBytes = Buffer.from(toEmail, 'utf8');
     const mailIdBytes = Buffer.from(mailId, 'utf8');
-    const data = Buffer.alloc(1 + 4 + emailHashBytes.length + 4 + mailIdBytes.length + 32 + 1);
+    const data = Buffer.alloc(1 + 4 + emailBytes.length + 4 + mailIdBytes.length);
     let offset = 0;
     data.writeUInt8(InstructionType.SendPreparedToEmail, offset);
     offset += 1;
-    data.writeUInt32LE(emailHashBytes.length, offset);
+    data.writeUInt32LE(emailBytes.length, offset);
     offset += 4;
-    emailHashBytes.copy(data, offset);
-    offset += emailHashBytes.length;
+    emailBytes.copy(data, offset);
+    offset += emailBytes.length;
     data.writeUInt32LE(mailIdBytes.length, offset);
     offset += 4;
     mailIdBytes.copy(data, offset);
     offset += mailIdBytes.length;
-    payer.toBuffer().copy(data, offset);
-    offset += 32;
-    data.writeUInt8(revenueShareToReceiver ? 1 : 0, offset);
     return data;
 }
-function encodeSetFees(sendFee, delegationFee) {
-    const data = Buffer.alloc(1 + 8 + 8);
-    data.writeUInt8(InstructionType.SetFees, 0);
+function encodeSetFee(sendFee) {
+    const data = Buffer.alloc(1 + 8);
+    data.writeUInt8(InstructionType.SetFee, 0);
     data.writeBigUInt64LE(sendFee, 1);
-    data.writeBigUInt64LE(delegationFee, 9);
+    return data;
+}
+function encodeSetDelegationFee(delegationFee) {
+    const data = Buffer.alloc(1 + 8);
+    data.writeUInt8(InstructionType.SetDelegationFee, 0);
+    data.writeBigUInt64LE(delegationFee, 1);
     return data;
 }
 function encodeDelegateTo(delegate) {
@@ -156,10 +152,9 @@ function encodeDelegateTo(delegate) {
     }
     return data;
 }
-function encodeRejectDelegation(delegatingAddress) {
-    const data = Buffer.alloc(1 + 32);
+function encodeRejectDelegation() {
+    const data = Buffer.alloc(1);
     data.writeUInt8(InstructionType.RejectDelegation, 0);
-    delegatingAddress.toBuffer().copy(data, 1);
     return data;
 }
 function encodeSetCustomFeePercentage(account, percentage) {
@@ -184,18 +179,10 @@ function encodeClaimExpiredShares(recipient) {
     recipient.toBuffer().copy(data, 1);
     return data;
 }
-function encodeDistributeClaimableFunds(recipients) {
-    const recipientCount = recipients.length;
-    const data = Buffer.alloc(1 + 4 + recipientCount * 32);
-    let offset = 0;
-    data.writeUInt8(InstructionType.DistributeClaimableFunds, offset);
-    offset += 1;
-    data.writeUInt32LE(recipientCount, offset);
-    offset += 4;
-    for (const recipient of recipients) {
-        recipient.toBuffer().copy(data, offset);
-        offset += 32;
-    }
+function encodeDistributeClaimableFunds(recipient) {
+    const data = Buffer.alloc(1 + 32);
+    data.writeUInt8(InstructionType.DistributeClaimableFunds, 0);
+    recipient.toBuffer().copy(data, 1);
     return data;
 }
 /**
@@ -394,7 +381,7 @@ export class SolanaMailerClient {
     /**
      * Send a message with optional revenue sharing
      */
-    async send(connectedWallet, chainInfo, to, subject, body, revenueShareToReceiver, computeOptions) {
+    async send(connectedWallet, chainInfo, to, subject, body, revenueShareToReceiver, resolveSenderToName = false, computeOptions) {
         const connection = await this.getOrCreateConnection(chainInfo, connectedWallet.connection);
         const { programId, mailerStatePda } = this.getProgramAddresses(chainInfo);
         if (!chainInfo.usdcAddress) {
@@ -402,24 +389,22 @@ export class SolanaMailerClient {
         }
         const usdcMint = new PublicKey(chainInfo.usdcAddress);
         const toPubkey = typeof to === 'string' ? new PublicKey(to) : to;
-        // Get token accounts
         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 [recipientClaimPda] = PublicKey.findProgramAddressSync([CLAIM_PDA_SEED, toPubkey.toBuffer()], programId);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: true },
-            { pubkey: toPubkey, isSigner: false, isWritable: false },
+            { pubkey: recipientClaimPda, isSigner: false, isWritable: true },
             { pubkey: mailerStatePda, isSigner: false, isWritable: true },
             { pubkey: senderTokenAccount, isSigner: false, isWritable: true },
             { pubkey: mailerTokenAccount, isSigner: false, isWritable: true },
-            { pubkey: recipientInfo, isSigner: false, isWritable: true },
             { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
             { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         ];
         const instruction = new TransactionInstruction({
             programId,
             keys,
-            data: encodeSend(toPubkey, subject, body, revenueShareToReceiver),
+            data: encodeSend(toPubkey, subject, body, revenueShareToReceiver, resolveSenderToName),
         });
         const transaction = new Transaction().add(instruction);
         // Check if mailer token account exists, create if not
@@ -432,7 +417,7 @@ export class SolanaMailerClient {
     /**
      * Send a prepared message
      */
-    async sendPrepared(connectedWallet, chainInfo, to, mailId, revenueShareToReceiver, computeOptions) {
+    async sendPrepared(connectedWallet, chainInfo, to, mailId, revenueShareToReceiver, resolveSenderToName = false, computeOptions) {
         const connection = await this.getOrCreateConnection(chainInfo, connectedWallet.connection);
         const { programId, mailerStatePda } = this.getProgramAddresses(chainInfo);
         if (!chainInfo.usdcAddress) {
@@ -442,21 +427,20 @@ export class SolanaMailerClient {
         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 [recipientClaimPda] = PublicKey.findProgramAddressSync([CLAIM_PDA_SEED, toPubkey.toBuffer()], programId);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: true },
-            { pubkey: toPubkey, isSigner: false, isWritable: false },
+            { pubkey: recipientClaimPda, isSigner: false, isWritable: true },
             { pubkey: mailerStatePda, isSigner: false, isWritable: true },
             { pubkey: senderTokenAccount, isSigner: false, isWritable: true },
             { pubkey: mailerTokenAccount, isSigner: false, isWritable: true },
-            { pubkey: recipientInfo, isSigner: false, isWritable: true },
             { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
             { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         ];
         const instruction = new TransactionInstruction({
             programId,
             keys,
-            data: encodeSendPrepared(toPubkey, mailId, revenueShareToReceiver),
+            data: encodeSendPrepared(toPubkey, mailId, revenueShareToReceiver, resolveSenderToName),
         });
         const transaction = new Transaction().add(instruction);
         // Check if mailer token account exists, create if not
@@ -469,7 +453,7 @@ export class SolanaMailerClient {
     /**
      * Send through webhook
      */
-    async sendThroughWebhook(connectedWallet, chainInfo, to, subject, body, webhookId, revenueShareToReceiver, computeOptions) {
+    async sendThroughWebhook(connectedWallet, chainInfo, to, webhookId, revenueShareToReceiver, resolveSenderToName = false, computeOptions) {
         const connection = await this.getOrCreateConnection(chainInfo, connectedWallet.connection);
         const { programId, mailerStatePda } = this.getProgramAddresses(chainInfo);
         if (!chainInfo.usdcAddress) {
@@ -479,21 +463,20 @@ export class SolanaMailerClient {
         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 [recipientClaimPda] = PublicKey.findProgramAddressSync([CLAIM_PDA_SEED, toPubkey.toBuffer()], programId);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: true },
-            { pubkey: toPubkey, isSigner: false, isWritable: false },
+            { pubkey: recipientClaimPda, isSigner: false, isWritable: true },
             { pubkey: mailerStatePda, isSigner: false, isWritable: true },
             { pubkey: senderTokenAccount, isSigner: false, isWritable: true },
             { pubkey: mailerTokenAccount, isSigner: false, isWritable: true },
-            { pubkey: recipientInfo, isSigner: false, isWritable: true },
             { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
             { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         ];
         const instruction = new TransactionInstruction({
             programId,
             keys,
-            data: encodeSendThroughWebhook(toPubkey, subject, body, webhookId, revenueShareToReceiver),
+            data: encodeSendThroughWebhook(toPubkey, webhookId, revenueShareToReceiver, resolveSenderToName),
         });
         const transaction = new Transaction().add(instruction);
         const accountInfo = await connection.getAccountInfo(mailerTokenAccount);
@@ -505,14 +488,13 @@ export class SolanaMailerClient {
     /**
      * Send to email address
      */
-    async sendToEmail(emailHash, subject, body, payer, revenueShareToReceiver, connectedWallet, chainInfo, computeOptions) {
+    async sendToEmail(emailHash, subject, body, _payer, _revenueShareToReceiver, connectedWallet, chainInfo, computeOptions) {
         const connection = await this.getOrCreateConnection(chainInfo, connectedWallet.connection);
         const { programId, mailerStatePda } = this.getProgramAddresses(chainInfo);
         if (!chainInfo.usdcAddress) {
             throw new Error(`No USDC mint configured for ${chainInfo.name}`);
         }
         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 = [
@@ -521,12 +503,11 @@ export class SolanaMailerClient {
             { pubkey: senderTokenAccount, isSigner: false, isWritable: true },
             { pubkey: mailerTokenAccount, isSigner: false, isWritable: true },
             { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
-            { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         ];
         const instruction = new TransactionInstruction({
             programId,
             keys,
-            data: encodeSendToEmail(emailHash, subject, body, payerPubkey, revenueShareToReceiver),
+            data: encodeSendToEmail(emailHash, subject, body),
         });
         const transaction = new Transaction().add(instruction);
         const accountInfo = await connection.getAccountInfo(mailerTokenAccount);
@@ -538,14 +519,13 @@ export class SolanaMailerClient {
     /**
      * Send prepared to email address
      */
-    async sendPreparedToEmail(emailHash, mailId, payer, revenueShareToReceiver, connectedWallet, chainInfo, computeOptions) {
+    async sendPreparedToEmail(emailHash, mailId, _payer, _revenueShareToReceiver, connectedWallet, chainInfo, computeOptions) {
         const connection = await this.getOrCreateConnection(chainInfo, connectedWallet.connection);
         const { programId, mailerStatePda } = this.getProgramAddresses(chainInfo);
         if (!chainInfo.usdcAddress) {
             throw new Error(`No USDC mint configured for ${chainInfo.name}`);
         }
         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 = [
@@ -554,12 +534,11 @@ export class SolanaMailerClient {
             { pubkey: senderTokenAccount, isSigner: false, isWritable: true },
             { pubkey: mailerTokenAccount, isSigner: false, isWritable: true },
             { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
-            { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         ];
         const instruction = new TransactionInstruction({
             programId,
             keys,
-            data: encodeSendPreparedToEmail(emailHash, mailId, payerPubkey, revenueShareToReceiver),
+            data: encodeSendPreparedToEmail(emailHash, mailId),
         });
         const transaction = new Transaction().add(instruction);
         const accountInfo = await connection.getAccountInfo(mailerTokenAccount);
@@ -580,13 +559,13 @@ export class SolanaMailerClient {
         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 [recipientClaimPda] = PublicKey.findProgramAddressSync([CLAIM_PDA_SEED, connectedWallet.wallet.publicKey.toBuffer()], programId);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: true },
+            { pubkey: recipientClaimPda, isSigner: false, 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: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
         ];
         const instruction = new TransactionInstruction({
@@ -631,11 +610,11 @@ export class SolanaMailerClient {
         const connection = await this.getOrCreateConnection(chainInfo, connectedWallet.connection);
         const { programId, mailerStatePda } = this.getProgramAddresses(chainInfo);
         const recipientPubkey = typeof recipient === 'string' ? new PublicKey(recipient) : recipient;
-        const [recipientInfo] = PublicKey.findProgramAddressSync([Buffer.from('recipient_info'), recipientPubkey.toBuffer()], programId);
+        const [recipientClaimPda] = PublicKey.findProgramAddressSync([CLAIM_PDA_SEED, 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 },
+            { pubkey: recipientClaimPda, isSigner: false, isWritable: true },
         ];
         const instruction = new TransactionInstruction({
             programId,
@@ -660,13 +639,13 @@ export class SolanaMailerClient {
             : null;
         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 [delegationPda] = PublicKey.findProgramAddressSync([DELEGATION_PDA_SEED, connectedWallet.wallet.publicKey.toBuffer()], programId);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: true },
+            { pubkey: delegationPda, isSigner: false, 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: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
             { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         ];
@@ -687,17 +666,18 @@ export class SolanaMailerClient {
      */
     async rejectDelegation(connectedWallet, chainInfo, delegatingAddress, computeOptions) {
         const connection = await this.getOrCreateConnection(chainInfo, connectedWallet.connection);
-        const { programId } = this.getProgramAddresses(chainInfo);
+        const { programId, mailerStatePda } = this.getProgramAddresses(chainInfo);
         const delegatorPubkey = typeof delegatingAddress === 'string' ? new PublicKey(delegatingAddress) : delegatingAddress;
-        const [delegatorInfo] = PublicKey.findProgramAddressSync([Buffer.from('delegator_info'), delegatorPubkey.toBuffer()], programId);
+        const [delegationPda] = PublicKey.findProgramAddressSync([DELEGATION_PDA_SEED, delegatorPubkey.toBuffer()], programId);
         const keys = [
             { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: false },
-            { pubkey: delegatorInfo, isSigner: false, isWritable: true },
+            { pubkey: delegationPda, isSigner: false, isWritable: true },
+            { pubkey: mailerStatePda, isSigner: false, isWritable: false },
         ];
         const instruction = new TransactionInstruction({
             programId,
             keys,
-            data: encodeRejectDelegation(delegatorPubkey),
+            data: encodeRejectDelegation(),
         });
         const transaction = new Transaction().add(instruction);
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
@@ -708,16 +688,24 @@ export class SolanaMailerClient {
     async setFees(connectedWallet, chainInfo, sendFee, delegationFee, computeOptions) {
         const connection = await this.getOrCreateConnection(chainInfo, connectedWallet.connection);
         const { programId, mailerStatePda } = this.getProgramAddresses(chainInfo);
-        const keys = [
-            { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: false },
-            { pubkey: mailerStatePda, isSigner: false, isWritable: true },
-        ];
-        const instruction = new TransactionInstruction({
+        const ownerKey = connectedWallet.wallet.publicKey;
+        const setSendFeeIx = new TransactionInstruction({
             programId,
-            keys,
-            data: encodeSetFees(BigInt(sendFee), BigInt(delegationFee)),
+            keys: [
+                { pubkey: ownerKey, isSigner: true, isWritable: false },
+                { pubkey: mailerStatePda, isSigner: false, isWritable: true },
+            ],
+            data: encodeSetFee(BigInt(sendFee)),
         });
-        const transaction = new Transaction().add(instruction);
+        const setDelegationFeeIx = new TransactionInstruction({
+            programId,
+            keys: [
+                { pubkey: ownerKey, isSigner: true, isWritable: false },
+                { pubkey: mailerStatePda, isSigner: false, isWritable: true },
+            ],
+            data: encodeSetDelegationFee(BigInt(delegationFee)),
+        });
+        const transaction = new Transaction().add(setSendFeeIx, setDelegationFeeIx);
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
     /**
@@ -727,11 +715,14 @@ export class SolanaMailerClient {
         const connection = await this.getOrCreateConnection(chainInfo, connectedWallet.connection);
         const { programId, mailerStatePda } = this.getProgramAddresses(chainInfo);
         const accountPubkey = typeof account === 'string' ? new PublicKey(account) : account;
-        const [customFeeInfo] = PublicKey.findProgramAddressSync([Buffer.from('custom_fee'), accountPubkey.toBuffer()], programId);
+        const [discountPda] = PublicKey.findProgramAddressSync([DISCOUNT_PDA_SEED, accountPubkey.toBuffer()], programId);
+        const ownerKey = connectedWallet.wallet.publicKey;
         const keys = [
-            { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: true },
+            { pubkey: ownerKey, isSigner: true, isWritable: false },
             { pubkey: mailerStatePda, isSigner: false, isWritable: false },
-            { pubkey: customFeeInfo, isSigner: false, isWritable: true },
+            { pubkey: discountPda, isSigner: false, isWritable: true },
+            { pubkey: accountPubkey, isSigner: false, isWritable: false },
+            { pubkey: ownerKey, isSigner: true, isWritable: true },
             { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         ];
         const instruction = new TransactionInstruction({
@@ -749,11 +740,11 @@ export class SolanaMailerClient {
         const connection = await this.getOrCreateConnection(chainInfo, connectedWallet.connection);
         const { programId, mailerStatePda } = this.getProgramAddresses(chainInfo);
         const accountPubkey = typeof account === 'string' ? new PublicKey(account) : account;
-        const [customFeeInfo] = PublicKey.findProgramAddressSync([Buffer.from('custom_fee'), accountPubkey.toBuffer()], programId);
+        const [discountPda] = PublicKey.findProgramAddressSync([DISCOUNT_PDA_SEED, 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 },
+            { pubkey: discountPda, isSigner: false, isWritable: true },
         ];
         const instruction = new TransactionInstruction({
             programId,
@@ -829,26 +820,31 @@ export class SolanaMailerClient {
         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: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
-        ];
-        // Add recipient info and token accounts
+        const transaction = new Transaction();
+        const mailerTokenInfo = await connection.getAccountInfo(mailerTokenAccount);
+        if (!mailerTokenInfo) {
+            transaction.add(createAssociatedTokenAccountInstruction(connectedWallet.wallet.publicKey, mailerTokenAccount, mailerStatePda, usdcMint));
+        }
         for (const recipient of recipientPubkeys) {
-            const [recipientInfo] = PublicKey.findProgramAddressSync([Buffer.from('recipient_info'), recipient.toBuffer()], programId);
+            const [recipientClaimPda] = PublicKey.findProgramAddressSync([CLAIM_PDA_SEED, 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 recipientTokenInfo = await connection.getAccountInfo(recipientTokenAccount);
+            if (!recipientTokenInfo) {
+                transaction.add(createAssociatedTokenAccountInstruction(connectedWallet.wallet.publicKey, recipientTokenAccount, recipient, usdcMint));
+            }
+            transaction.add(new TransactionInstruction({
+                programId,
+                keys: [
+                    { pubkey: connectedWallet.wallet.publicKey, isSigner: true, isWritable: false },
+                    { pubkey: mailerStatePda, isSigner: false, isWritable: true },
+                    { pubkey: recipientClaimPda, isSigner: false, isWritable: true },
+                    { pubkey: recipientTokenAccount, isSigner: false, isWritable: true },
+                    { pubkey: mailerTokenAccount, isSigner: false, isWritable: true },
+                    { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+                ],
+                data: encodeDistributeClaimableFunds(recipient),
+            }));
         }
-        const instruction = new TransactionInstruction({
-            programId,
-            keys,
-            data: encodeDistributeClaimableFunds(recipientPubkeys),
-        });
-        const transaction = new Transaction().add(instruction);
         return await this.sendTransaction(transaction, connectedWallet.wallet, connection, undefined, computeOptions);
     }
     // ============= Read Methods =============
@@ -864,8 +860,8 @@ export class SolanaMailerClient {
         }
         // Parse the state data
         const data = accountInfo.data;
-        const sendFee = data.readBigUInt64LE(41); // After discriminator(8) + owner(32) + paused(1)
-        const delegationFee = data.readBigUInt64LE(49);
+        const sendFee = data.readBigUInt64LE(8 + 32 + 32); // After discriminator + owner + mint
+        const delegationFee = data.readBigUInt64LE(8 + 32 + 32 + 8);
         return {
             sendFee,
             delegationFee,
@@ -892,22 +888,22 @@ export class SolanaMailerClient {
         const conn = await this.getOrCreateConnection(chainInfo, connection);
         const { programId } = this.getProgramAddresses(chainInfo);
         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);
+        const [recipientClaimPda] = PublicKey.findProgramAddressSync([CLAIM_PDA_SEED, recipientPubkey.toBuffer()], programId);
+        const accountInfo = await conn.getAccountInfo(recipientClaimPda);
         if (!accountInfo || !accountInfo.data) {
             return null;
         }
         // Parse the recipient info data
         const data = accountInfo.data;
-        const amount = data.readBigUInt64LE(8); // After discriminator
-        const expiresAt = data.readBigInt64LE(16);
-        // Check if expired
+        const amount = data.readBigUInt64LE(8 + 32); // discriminator + recipient
+        const timestamp = Number(data.readBigInt64LE(8 + 32 + 8)); // after amount
+        const expiresAt = timestamp + CLAIM_PERIOD_SECONDS;
         const now = Math.floor(Date.now() / 1000);
-        const isExpired = Number(expiresAt) > 0 && Number(expiresAt) < now;
+        const isExpired = timestamp > 0 && now > expiresAt;
         return {
             amount: Number(amount),
-            timestamp: Number(expiresAt), // Using expiresAt as timestamp
-            expiresAt: Number(expiresAt),
+            timestamp,
+            expiresAt,
             recipient: recipient instanceof PublicKey ? recipient.toBase58() : recipient,
             isExpired,
         };
@@ -924,7 +920,7 @@ export class SolanaMailerClient {
         }
         // Parse the state data
         const data = accountInfo.data;
-        const ownerClaimable = data.readBigUInt64LE(57); // After discriminator(8) + owner(32) + paused(1) + sendFee(8) + delegationFee(8)
+        const ownerClaimable = data.readBigUInt64LE(8 + 32 + 32 + 8 + 8); // After discriminator + owner + mint + sendFee + delegationFee
         return Number(ownerClaimable);
     }
     /**
@@ -934,19 +930,19 @@ export class SolanaMailerClient {
         const conn = await this.getOrCreateConnection(chainInfo, connection);
         const { programId } = this.getProgramAddresses(chainInfo);
         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);
+        const [delegationPda] = PublicKey.findProgramAddressSync([DELEGATION_PDA_SEED, addressPubkey.toBuffer()], programId);
+        const accountInfo = await conn.getAccountInfo(delegationPda);
         if (!accountInfo || !accountInfo.data) {
             return null;
         }
         // Parse the delegatingAddress info data
         const data = accountInfo.data;
-        const hasDelegate = data.readUInt8(8) === 1; // After discriminator
+        const hasDelegate = data.readUInt8(8 + 32) === 1; // After discriminator + delegator
         if (!hasDelegate) {
             return null;
         }
         // Read delegate pubkey
-        const delegateBytes = data.slice(9, 41); // 32 bytes for pubkey
+        const delegateBytes = data.slice(8 + 32 + 1, 8 + 32 + 1 + 32); // 32 bytes for pubkey
         return new PublicKey(delegateBytes);
     }
     /**
@@ -956,15 +952,15 @@ export class SolanaMailerClient {
         const conn = await this.getOrCreateConnection(chainInfo, connection);
         const { programId } = this.getProgramAddresses(chainInfo);
         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);
+        const [discountPda] = PublicKey.findProgramAddressSync([DISCOUNT_PDA_SEED, accountPubkey.toBuffer()], programId);
+        const accountInfo = await conn.getAccountInfo(discountPda);
         if (!accountInfo || !accountInfo.data) {
             return 100; // Default to 100% if no custom fee set
         }
         // Parse the custom fee data
         const data = accountInfo.data;
-        const percentage = data.readUInt8(8); // After discriminator
-        return percentage;
+        const discount = data.readUInt8(8 + 32); // After discriminator + account pubkey
+        return 100 - discount;
     }
     /**
      * Check if the program is paused
@@ -978,7 +974,7 @@ export class SolanaMailerClient {
         }
         // Parse the state data
         const data = accountInfo.data;
-        const paused = data.readUInt8(40); // After discriminator(8) + owner(32)
+        const paused = data.readUInt8(8 + 32 + 32 + 8 + 8 + 8); // After all state fields up to owner_claimable
         return paused === 1;
     }
     /**