Feat/config creation fee fix (#153)

* fix and refactor

* update changelog

Author: andrewsource147

CHANGELOG.md

@@ -28,13 +28,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add new endpoint `claim_protocol_pool_creation_fee` to allow protocol to withdraw the pool creation fee.
 
 ### Changed
-- Add new field `creation_fee` in config account state and pool account state
-- Allowed partners to configure the `creation_fee` when creating a config.
-- Charged pool creation fee according to the `creation_fee` specified in the config account (endpoints: `initialize_virtual_pool_with_token2022` and `initialize_virtual_pool_with_spl_token`)
+- Allowed partners to configure the `pool_creation_fee` when creating a config. The value is in SOL lamport, so when token creator create pool (throught endpoint `initialize_virtual_pool_with_spl_token` and `initialize_virtual_pool_with_token2022`), they would need to pay `pool_creation_fee` in SOL lamport. Later partner would be able to claim that fee (Meteora would take 10% from that fee)
+- Update field `creation_fee_bits` to field `legacy_creation_fee_bits` in pool account state
 - Removed the legacy pool creation fee logic from the `initialize_virtual_pool_with_token2022` endpoint.
 
-### Removed
+### Breaking Changes 
+All breaking changes are related to admin/operator functions
 - Remove endpoint `withdraw_lamports_from_pool_authority`
+- Change endpoint `claim_pool_creation_fee` to new endpoint `claim_legacy_pool_creation_fee`
+- Add new `payer` account in admin endpoint `create_claim_fee_operator`, that allow to payer to pay rent fee, instead of admin
+- Add new accounts `signer` and `claim_fee_operator` in endpoint `protocol_withdraw_surplus`, move the endpoint to permissioned
+
 
 ## dynamic_bonding_curve [0.1.7] [PR #129](https://github.com/MeteoraAg/dynamic-bonding-curve/pull/129)
 

programs/dynamic-bonding-curve/src/access_control.rs

@@ -0,0 +1,39 @@
+use crate::assert_eq_admin;
+use crate::state::{ClaimFeeOperator, PoolConfig, VirtualPool};
+use crate::PoolError;
+use anchor_lang::prelude::*;
+// check whether the signer is in admin list
+pub fn is_admin(signer: &Pubkey) -> Result<()> {
+    require!(assert_eq_admin(signer.key()), PoolError::InvalidAdmin);
+    Ok(())
+}
+
+pub fn is_claim_fee_operator<'info>(
+    claim_fee_operator: &AccountLoader<'info, ClaimFeeOperator>,
+    signer: &Pubkey,
+) -> Result<()> {
+    let claim_fee_operator = claim_fee_operator.load()?;
+    require!(
+        claim_fee_operator.operator.eq(signer),
+        PoolError::Unauthorized
+    );
+    Ok(())
+}
+
+pub fn is_partner_fee_claimer<'info>(
+    config: &AccountLoader<'info, PoolConfig>,
+    fee_claimer: &Pubkey,
+) -> Result<()> {
+    let config = config.load()?;
+    require!(config.fee_claimer.eq(fee_claimer), PoolError::Unauthorized);
+    Ok(())
+}
+
+pub fn is_pool_creator<'info>(
+    pool: &AccountLoader<'info, VirtualPool>,
+    creator: &Pubkey,
+) -> Result<()> {
+    let pool = pool.load()?;
+    require!(pool.creator.eq(creator), PoolError::Unauthorized);
+    Ok(())
+}

programs/dynamic-bonding-curve/src/constants.rs

@@ -90,9 +90,6 @@ pub mod fee {
     /// Protocol's share percentage of the pool creation fee. The remainder goes to the partner.
     pub const PROTOCOL_POOL_CREATION_FEE_PERCENT: u8 = 10; // 10%
 
-    // 0.01
-    pub const TOKEN_2022_POOL_WITH_OUTPUT_FEE_COLLECTION_CREATION_FEE: u64 = 10_000_000;
-
     // min pool creation fee: 0.001 SOL
     pub const MIN_POOL_CREATION_FEE: u64 = 1_000_000;
     // max pool creation fee: 100 SOL

programs/dynamic-bonding-curve/src/error.rs

@@ -163,4 +163,10 @@ pub enum PoolError {
 
     #[msg("Pool creation fee has been claimed")]
     PoolCreationFeeHasBeenClaimed,
+
+    #[msg("Not permit to do this action")]
+    Unauthorized,
+
+    #[msg("Pool creation fee is zero")]
+    ZeroPoolCreationFee,
 }

programs/dynamic-bonding-curve/src/event.rs

@@ -193,3 +193,10 @@ pub struct EvtClaimPoolCreationFee {
     pub receiver: Pubkey,
     pub creation_fee: u64,
 }
+
+#[event]
+pub struct EvtPartnerClaimPoolCreationFee {
+    pub pool: Pubkey,
+    pub partner: Pubkey,
+    pub creation_fee: u64,
+}

programs/dynamic-bonding-curve/src/instructions/admin/ix_claim_pool_creation_fee.rs

@@ -1,6 +1,6 @@
 use anchor_lang::prelude::*;
 
-use crate::{assert_eq_admin, state::ClaimFeeOperator, EvtCloseClaimFeeOperator, PoolError};
+use crate::{state::ClaimFeeOperator, EvtCloseClaimFeeOperator};
 
 #[event_cpi]
 #[derive(Accounts)]
@@ -15,10 +15,7 @@ pub struct CloseClaimFeeOperatorCtx<'info> {
     #[account(mut)]
     pub rent_receiver: UncheckedAccount<'info>,
 
-    #[account(
-        constraint = assert_eq_admin(admin.key()) @ PoolError::InvalidAdmin,
-    )]
-    pub admin: Signer<'info>,
+    pub signer: Signer<'info>,
 }
 
 pub fn handle_close_claim_fee_operator(ctx: Context<CloseClaimFeeOperatorCtx>) -> Result<()> {

programs/dynamic-bonding-curve/src/instructions/admin/ix_claim_protocol_pool_creation_fee.rs

@@ -1,16 +1,15 @@
 use anchor_lang::prelude::*;
 
 use crate::{
-    assert_eq_admin, constants::seeds::CLAIM_FEE_OPERATOR_PREFIX, state::ClaimFeeOperator,
-    EvtCreateClaimFeeOperator, PoolError,
+    constants::seeds::CLAIM_FEE_OPERATOR_PREFIX, state::ClaimFeeOperator, EvtCreateClaimFeeOperator,
 };
 
 #[event_cpi]
 #[derive(Accounts)]
 pub struct CreateClaimFeeOperatorCtx<'info> {
     #[account(
         init,
-        payer = admin,
+        payer = payer,
         seeds = [
             CLAIM_FEE_OPERATOR_PREFIX.as_ref(),
             operator.key().as_ref(),
@@ -23,11 +22,10 @@ pub struct CreateClaimFeeOperatorCtx<'info> {
     /// CHECK: operator
     pub operator: UncheckedAccount<'info>,
 
-    #[account(
-        mut,
-        constraint = assert_eq_admin(admin.key()) @ PoolError::InvalidAdmin,
-    )]
-    pub admin: Signer<'info>,
+    pub signer: Signer<'info>,
+
+    #[account(mut)]
+    pub payer: Signer<'info>,
 
     pub system_program: Program<'info, System>,
 }

programs/dynamic-bonding-curve/src/instructions/admin/ix_close_claim_protocol_fee_operator.rs

@@ -1,14 +1,6 @@
 pub mod auth;
 pub use auth::*;
-pub mod ix_claim_protocol_fee;
-pub use ix_claim_protocol_fee::*;
 pub mod ix_create_claim_protocol_fee_operator;
 pub use ix_create_claim_protocol_fee_operator::*;
 pub mod ix_close_claim_protocol_fee_operator;
 pub use ix_close_claim_protocol_fee_operator::*;
-pub mod ix_withdraw_protocol_surplus;
-pub use ix_withdraw_protocol_surplus::*;
-pub mod ix_claim_protocol_pool_creation_fee;
-pub use ix_claim_protocol_pool_creation_fee::*;
-pub mod ix_claim_pool_creation_fee;
-pub use ix_claim_pool_creation_fee::*;