feat/add common protocol fee #45

bangyro · 2026-01-19T09:18:35Z

No description provided.

…orm_fee_account

…one output

bangyro · 2026-01-20T08:41:50Z

programs/zap/src/constants.rs

-// https://github.com/MeteoraAg/zap-program/blob/main/idls/dlmm.json#L3413-L3422
-#[constant]
-pub const DLMM_SWAP2_DISC: [u8; 8] = [65, 75, 63, 76, 235, 91, 91, 136];
+use protocol_zap::constants::{


zap program depends on protocol_zap for these constants

lets rename it to zap-sdk

programs/zap/src/instructions/ix_zap_out.rs

bangyro · 2026-01-20T08:45:03Z

idls/jupiter.json

Renamed and updated to the IDL found on solscan

bangyro · 2026-01-20T10:24:03Z

protocol-zap/src/jup_v6_zap.rs

+fn ensure_route_plan_fully_converges(route_plan_steps: &[RoutePlanStep]) -> Result<()> {
+    // Verify each unique input_index sums to exactly 100%
+    for (i, step) in route_plan_steps.iter().enumerate() {
+        // Only process first occurrence of each input_index
+        let seen = route_plan_steps[..i]
+            .iter()
+            .any(|s| s.input_index == step.input_index);
+        if seen {
+            continue;
+        }
+
+        let percent_sum = route_plan_steps
+            .iter()
+            .filter(|s| s.input_index == step.input_index)
+            .try_fold(0u8, |acc, s| acc.checked_add(s.percent))
+            .ok_or(ProtocolZapError::MathOverflow)?;
+
+        require!(
+            percent_sum == 100,
+            ProtocolZapError::InvalidZapOutParameters
+        );
+    }
+
+    // Count terminal outputs: unique outputs never used as inputs
+    let terminal_count = route_plan_steps
+        .iter()
+        .enumerate()
+        .filter(|(i, step)| {
+            let is_first = !route_plan_steps[..*i]
+                .iter()
+                .any(|s| s.output_index == step.output_index);
+            let is_terminal = !route_plan_steps
+                .iter()
+                .any(|s| s.input_index == step.output_index);
+            is_first && is_terminal
+        })
+        .count();
+
+    require!(
+        terminal_count == 1,
+        ProtocolZapError::InvalidZapOutParameters
+    );
+
+    Ok(())
+}


Implementation looks weird because I'm trying to avoid using Map and Set to avoid additional heap allocation

I don't think we need zap_out2 since all the additional verification is only done in zap_protocol_fee ix rather than the zap_out ix that comes right after it in the tx.

andrewsource147 · 2026-01-21T01:26:38Z

protocol-zap/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "protocol-zap"


lets rename it to zap-sdk

and separate the code:

To be used in zap-program

To be used in protocol-zap

Let me know if this is what you have in mind. So there will be zap-sdk, which zap-program and protocol-zap depends on?

zap-sdk -> common code used by zap-program/protocol-zap
protocol-zap -> common code used by other programs to zap protocol fee

andrewsource147 · 2026-01-21T01:27:24Z

protocol-zap/src/constants.rs

+
+pub const MINTS_DISALLOWED_TO_ZAP_OUT: [Pubkey; 2] = [USDC_ADDRESS, SOL_ADDRESS];
+
+pub const TREASURY: Pubkey = pubkey!("6aYhxiNGmG8AyU25rh2R7iFu4pBrqnQHpNUGhmsEXRcm");


shouldn't push treasury wallet in the sdk, it should be re-used by other programs, not only Meteora

andrewsource147 · 2026-01-21T01:27:52Z

protocol-zap/src/constants.rs

+
+pub const TREASURY: Pubkey = pubkey!("6aYhxiNGmG8AyU25rh2R7iFu4pBrqnQHpNUGhmsEXRcm");
+
+pub const TREASURY_USDC_ADDRESS: Pubkey = Pubkey::new_from_array(


Ditto^, we dont fix treasury wallet, so those addresses will be dynamic

andrewsource147 · 2026-01-21T01:27:59Z

protocol-zap/src/constants.rs

+    .0,
+);
+
+pub const TREASURY_SOL_ADDRESS: Pubkey = Pubkey::new_from_array(


andrewsource147 · 2026-01-21T01:30:36Z

protocol-zap/Cargo.toml

+
+[dependencies]
+anchor-lang = { workspace = true }
+anchor-spl = { workspace = true }


not sure if we can make it no anchor dependencies, so it is easier to being imported from other projects?

andrewsource147 · 2026-01-21T01:31:26Z

protocol-zap/src/jup_v6_zap.rs

+
+fn ensure_whitelisted_swap_leg(route_plan_steps: &[RoutePlanStep]) -> Result<()> {
+    for step in route_plan_steps {
+        match step.swap {


could we make it constants? whitelisted_swap_leg

andrewsource147 · 2026-01-21T01:38:28Z

protocol-zap/src/error.rs

+use anchor_lang::prelude::*;
+
+// Anchor custom user error codes start at 6000. Adding 1000 to avoid conflict with calling program error codes
+#[error_code(offset = 7000)]


That is breaking change for zap-program
Lets avoid to use Anchor custom error code here, instead return pure ErrorCode
If other program want to import it, they must map the error back their program (Impl From trait)

andrewsource147 · 2026-01-21T01:45:01Z

protocol-zap/src/safe_math.rs

+try_into_impl!(usize, u16);
+
+#[cfg(test)]
+mod tests {


lets try to avoid to push test in same file with program code

andrewsource147 · 2026-01-21T01:45:15Z

protocol-zap/src/jup_v6_zap.rs

+}
+
+#[cfg(test)]
+mod tests {


lets try to avoid to push test in same file with program code

bangyro added 5 commits January 20, 2026 16:03

feat: rename jup_v6.json -> jupiter.json and update IDl

afedda7

feat: add jupiter as idl dep

501f69d

feat: add shared library and use shared library in zap-program

c091c4c

feat: require platform_fee_bps 0 to ensure no stealingn through platf…

68c6fef

…orm_fee_account

feat: ensure all jup inputs token are fully consumed and converge on …

f68848a

…one output

bangyro force-pushed the feat/add-common-protocol-fee branch from 2132c76 to f68848a Compare January 20, 2026 08:03

bangyro changed the base branch from main to release_0.2.2 January 20, 2026 08:03

bangyro commented Jan 20, 2026

View reviewed changes

programs/zap/src/instructions/ix_zap_out.rs Show resolved Hide resolved

bangyro commented Jan 20, 2026

View reviewed changes

idls/jupiter.json

Copy link

Collaborator Author

bangyro Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renamed and updated to the IDL found on solscan

bangyro added 3 commits January 20, 2026 17:15

fix: clean up unused error codes and safe_math impl

9b5fb35

feat: add test

f2dc0e8

fix: don't use BTreeMap, BTreeSet

ed5f649

bangyro commented Jan 20, 2026

View reviewed changes

bangyro marked this pull request as ready for review January 20, 2026 10:26

andrewsource147 reviewed Jan 21, 2026

View reviewed changes

protocol-zap/src/constants.rs

.0,

);

pub const TREASURY_SOL_ADDRESS: Pubkey = Pubkey::new_from_array(

Copy link

Contributor

andrewsource147 Jan 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto^

andrewsource147 reviewed Jan 21, 2026

View reviewed changes

protocol-zap/src/jup_v6_zap.rs

}

#[cfg(test)]

mod tests {

Copy link

Contributor

andrewsource147 Jan 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lets try to avoid to push test in same file with program code


		pub const MINTS_DISALLOWED_TO_ZAP_OUT: [Pubkey; 2] = [USDC_ADDRESS, SOL_ADDRESS];

		pub const TREASURY: Pubkey = pubkey!("6aYhxiNGmG8AyU25rh2R7iFu4pBrqnQHpNUGhmsEXRcm");


		pub const TREASURY: Pubkey = pubkey!("6aYhxiNGmG8AyU25rh2R7iFu4pBrqnQHpNUGhmsEXRcm");

		pub const TREASURY_USDC_ADDRESS: Pubkey = Pubkey::new_from_array(

feat/add common protocol fee #45

Are you sure you want to change the base?

feat/add common protocol fee #45

Uh oh!

Conversation

bangyro commented Jan 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bangyro Jan 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bangyro Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

andrewsource147 Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

bangyro commented Jan 19, 2026 •

edited

Loading

bangyro Jan 20, 2026 •

edited

Loading

bangyro Jan 21, 2026 •

edited

Loading

andrewsource147 Jan 21, 2026 •

edited

Loading