Skip to content

feat/add common protocol fee #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bangyro wants to merge 24 commits into
base: release_0.2.2
Choose a base branch
from
Open

feat/add common protocol fee #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
afedda7
feat: rename jup_v6.json -> jupiter.json and update IDl
bangyro Jan 19, 2026
501f69d
feat: add jupiter as idl dep
bangyro Jan 19, 2026
c091c4c
feat: add shared library and use shared library in zap-program
bangyro Jan 19, 2026
68c6fef
feat: require platform_fee_bps 0 to ensure no stealingn through platf…
bangyro Jan 20, 2026
f68848a
feat: ensure all jup inputs token are fully consumed and converge on …
bangyro Jan 20, 2026
9b5fb35
fix: clean up unused error codes and safe_math impl
bangyro Jan 20, 2026
f2dc0e8
feat: add test
bangyro Jan 20, 2026
ed5f649
fix: don't use BTreeMap, BTreeSet
bangyro Jan 20, 2026
876e11d
fix: move tests to separate file
bangyro Jan 21, 2026
61d72ba
feat: remove anchor as dep
bangyro Jan 21, 2026
60353d8
feat: remove treasury address
bangyro Jan 21, 2026
4703104
refactor: rename to zap-sdk
bangyro Jan 21, 2026
aaafea8
refactor: rename protocol zap usage
bangyro Jan 21, 2026
f936cfc
fix: logic
bangyro Jan 21, 2026
b6f49d2
feat: bump anchor version in CI
bangyro Jan 21, 2026
4fc1a17
feat: map errors
bangyro Jan 21, 2026
20042a9
feat: remove unecessary name impl
bangyro Jan 22, 2026
fb4f24d
refactor: change to use pinocchio
bangyro Jan 26, 2026
758fd76
refactor: split into protocol-zap and zap-sdk
bangyro Jan 26, 2026
949a874
chore: readd accidentally removed newline
bangyro Jan 26, 2026
9dffa10
feat: add protocol-zap and zap-sdk to changed files trigger
bangyro Jan 27, 2026
39925de
feat: run rust unit tests on CI
bangyro Jan 27, 2026
591066b
feat: standardize test command
bangyro Jan 27, 2026
e59eb87
fix: remove doctests for cargo test to pass
bangyro Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup-anchor/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: "Setup node js and anchor cli"
runs:
using: "composite"
steps:
- uses: actions/setup-node@v2
- uses: actions/setup-node@v6
with:
node-version: ${{ env.NODE_VERSION }}
- run: cargo install --git https://github.com/coral-xyz/anchor --tag v${{ env.ANCHOR_CLI_VERSION }} anchor-cli --locked
Expand Down
34 changes: 27 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ on:
env:
SOLANA_CLI_VERSION: 2.1.0
NODE_VERSION: 22.15.0
ANCHOR_CLI_VERSION: 0.31.0
TOOLCHAIN: 1.76.0
ANCHOR_CLI_VERSION: 0.31.1
TOOLCHAIN: 1.85.0

jobs:
program_changed_files:
Expand All @@ -27,6 +27,8 @@ jobs:
with:
files: |
programs/zap
protocol-zap
zap-sdk

anchor_build:
runs-on: ubuntu-latest
Expand All @@ -51,26 +53,44 @@ jobs:
- run: anchor build
shell: bash

program_test:
unit_test:
Copy link
Collaborator Author

@bangyro bangyro Jan 27, 2026

Choose a reason for hiding this comment

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

previously we are not running cargo test on CI

runs-on: ubuntu-latest
needs: program_changed_files
if: needs.program_changed_files.outputs.program == 'true'
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ env.TOOLCHAIN }}
components: clippy
- uses: Swatinem/rust-cache@v2
- run: cargo test --package zap
shell: bash
- run: cargo test --package protocol-zap
shell: bash

integration_test:
runs-on: ubuntu-latest
needs: program_changed_files
if: needs.program_changed_files.outputs.program == 'true'
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: ./.github/actions/setup-solana
- uses: ./.github/actions/setup-dep
- uses: ./.github/actions/setup-anchor
# Install pnpm
- uses: pnpm/action-setup@v3 # docs https://pnpm.io/continuous-integration#github-actions
with:
version: 9.5.0 # Optional: specify a pnpm version
- uses: pnpm/action-setup@v4 # docs https://pnpm.io/continuous-integration#github-actions
# Install rust + toolchain
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ env.TOOLCHAIN }}
components: clippy
# Cache rust, cargo
- uses: Swatinem/rust-cache@v1
- uses: Swatinem/rust-cache@v2
# Cache node_modules
- uses: actions/cache@v4
id: cache-node-modules
Expand Down
6 changes: 4 additions & 2 deletions Anchor.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
[toolchain]
package_manager = "yarn"
anchor_version = "0.31.1"
solana_version = "2.1.0"
package_manager = "pnpm"

[features]
resolution = true
Expand All @@ -16,4 +18,4 @@ cluster = "localnet"
wallet = "~/.config/solana/id.json"

[scripts]
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
test = "pnpm ts-mocha --no-experimental-strip-types -p ./tsconfig.json -t 1000000 tests/**/*.ts"
58 changes: 52 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[workspace]
members = [
"programs/*"
]
members = ["programs/*", "libs/*", "zap-sdk", "protocol-zap"]
resolver = "2"

[profile.release]
Expand All @@ -16,4 +14,5 @@ codegen-units = 1
[workspace.dependencies]
anchor-lang = "0.31.1"
anchor-spl = "0.31.1"
bytemuck = "1.20.0"
bytemuck = "1.20.0"
ruint = "1.3.0"
Loading
Loading