feat: operator reclaims rent from user_unclaimed_fee

Author: bangyro

programs/dynamic-fee-sharing/src/instructions/ix_claim_unclaimed_fee.rs

@@ -9,7 +9,7 @@ use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
 #[event_cpi]
 #[derive(Accounts)]
 pub struct ClaimUnclaimedFeeCtx<'info> {
-    #[account(has_one = token_mint, has_one = owner, has_one = token_vault)]
+    #[account(has_one = token_mint, has_one = operator, has_one = token_vault)]
     pub fee_vault: AccountLoader<'info, FeeVault>,
 
     /// CHECK: fee vault authority
@@ -23,7 +23,7 @@ pub struct ClaimUnclaimedFeeCtx<'info> {
 
     #[account(
         mut,
-        close = owner,
+        close = operator,
         seeds = [
             USER_UNCLAIMED_FEE_PREFIX,
             fee_vault.key().as_ref(),
@@ -37,9 +37,9 @@ pub struct ClaimUnclaimedFeeCtx<'info> {
     #[account(mut)]
     pub user_token_vault: Box<InterfaceAccount<'info, TokenAccount>>,
 
-    /// CHECK: fee vault owner, receives rent from closed account
+    /// CHECK: fee vault operator, receives rent from closed account
     #[account(mut)]
-    pub owner: UncheckedAccount<'info>,
+    pub operator: UncheckedAccount<'info>,
 
     pub user: Signer<'info>,
 

tests/common/index.ts

@@ -454,9 +454,9 @@ export async function claimUnclaimedFee(params: {
   feeVault: PublicKey;
   tokenMint: PublicKey;
   user: Keypair;
-  owner: PublicKey;
+  operator: PublicKey;
 }) {
-  const { svm, program, feeVault, tokenMint, user, owner } = params;
+  const { svm, program, feeVault, tokenMint, user, operator } = params;
 
   const feeVaultAuthority = deriveFeeVaultAuthorityAddress();
   const tokenVault = deriveTokenVaultAddress(feeVault);
@@ -475,7 +475,7 @@ export async function claimUnclaimedFee(params: {
       tokenVault,
       userUnclaimedFee,
       userTokenVault,
-      owner,
+      operator,
       user: user.publicKey,
       tokenProgram: TOKEN_PROGRAM_ID,
     })

tests/fee_sharing.test.ts

@@ -641,7 +641,7 @@ async function fullFlow(
 
   console.log("claim unclaimed fee");
   svm.expireBlockhash();
-  const ownerBalanceBefore = svm.getBalance(vaultOwner.publicKey);
+  const operatorBalanceBefore = svm.getBalance(operator.publicKey);
   const userTokenBefore = getTokenBalance(
     svm,
     getOrCreateAtA(svm, users[0], tokenMint, users[0].publicKey),
@@ -653,7 +653,7 @@ async function fullFlow(
     feeVault: feeVault.publicKey,
     tokenMint,
     user: users[0],
-    owner: vaultOwner.publicKey,
+    operator: operator.publicKey,
   });
   expect(claimRes instanceof TransactionMetadata).to.be.true;
 
@@ -668,9 +668,9 @@ async function fullFlow(
   const closedUserUnclaimedFee = svm.getAccount(userUnclaimedFee);
   expect(closedUserUnclaimedFee.lamports).eq(0);
 
-  // owner should have received rent back from removed user token vault
-  const ownerBalanceAfter = svm.getBalance(vaultOwner.publicKey);
-  expect(ownerBalanceAfter > ownerBalanceBefore).to.be.true;
+  // operator should have received rent back from removed user token vault
+  const operatorBalanceAfter = svm.getBalance(operator.publicKey);
+  expect(operatorBalanceAfter > operatorBalanceBefore).to.be.true;
 
   console.log("add new user after removing user[0]");
   svm.expireBlockhash();

tests/fee_sharing_pda.test.ts

@@ -654,7 +654,7 @@ async function fullFlow(
 
   console.log("claim unclaimed fee");
   svm.expireBlockhash();
-  const ownerBalanceBefore = svm.getBalance(vaultOwner.publicKey);
+  const operatorBalanceBefore = svm.getBalance(operator.publicKey);
   const userTokenBefore = getTokenBalance(
     svm,
     getOrCreateAtA(svm, users[0], tokenMint, users[0].publicKey),
@@ -666,7 +666,7 @@ async function fullFlow(
     feeVault,
     tokenMint,
     user: users[0],
-    owner: vaultOwner.publicKey,
+    operator: operator.publicKey,
   });
   expect(claimRes instanceof TransactionMetadata).to.be.true;
 
@@ -680,9 +680,9 @@ async function fullFlow(
   const closedUserUnclaimedFee = svm.getAccount(userUnclaimedFee);
   expect(closedUserUnclaimedFee.lamports).eq(0);
 
-  // owner should have received rent back from removed user token vault
-  const ownerBalanceAfter = svm.getBalance(vaultOwner.publicKey);
-  expect(ownerBalanceAfter > ownerBalanceBefore).to.be.true;
+  // operator should have received rent back from removed user token vault
+  const operatorBalanceAfter = svm.getBalance(operator.publicKey);
+  expect(operatorBalanceAfter > operatorBalanceBefore).to.be.true;
 
   console.log("add new user after removing user[0]");
   svm.expireBlockhash();